Merge pull request #66 from lambdaclass/add-salsa

Add `salsa`.
lambdaclass · Jan 10, 2024 · 538a911 · 538a911
2 parents 5ea7a94 + f3fe7d1
commit 538a911
Show file tree

Hide file tree

Showing 17 changed files with 340 additions and 136 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/concrete_ast/Cargo.toml b/crates/concrete_ast/Cargo.toml
@@ -6,4 +6,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tracing.workspace = true
+tracing = { workspace = true }
diff --git a/crates/concrete_ast/src/constants.rs b/crates/concrete_ast/src/constants.rs
@@ -4,14 +4,14 @@ use crate::{
     types::TypeSpec,
 };
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ConstantDecl {
     pub doc_string: Option<DocString>,
     pub name: Ident,
     pub r#type: TypeSpec,
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ConstantDef {
     pub decl: ConstantDecl,
     pub value: Expression,

diff --git a/crates/concrete_ast/src/expressions.rs b/crates/concrete_ast/src/expressions.rs
@@ -1,6 +1,6 @@
 use crate::{common::Ident, statements::Statement, types::TypeSpec};
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub enum Expression {
     Simple(SimpleExpr),
     FnCall(FnCallOp),
@@ -11,32 +11,32 @@ pub enum Expression {
 }
 
 // needed for match variants and array accesses
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub enum SimpleExpr {
     ConstBool(bool),
     ConstChar(char),
     ConstInt(u64),
-    ConstFloat(f64),
+    ConstFloat(()),
     ConstStr(String),
     Path(PathOp),
 }
 
-#[derive(Clone, Debug, PartialEq, Copy)]
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum UnaryOp {
     ArithNeg,
     LogicalNot,
     BitwiseNot,
 }
 
-#[derive(Clone, Debug, PartialEq, Copy)]
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum BinaryOp {
     Arith(ArithOp),
     Logic(LogicOp),
     Compare(CmpOp),
     Bitwise(BitwiseOp),
 }
 
-#[derive(Clone, Debug, PartialEq, Copy)]
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum ArithOp {
     Add,
     Sub,
@@ -45,13 +45,13 @@ pub enum ArithOp {
     Mod,
 }
 
-#[derive(Clone, Debug, PartialEq, Copy)]
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum LogicOp {
     And,
     Or,
 }
 
-#[derive(Clone, Debug, PartialEq, Copy)]
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum CmpOp {
     Eq,
     NotEq,
@@ -61,51 +61,51 @@ pub enum CmpOp {
     GtEq,
 }
 
-#[derive(Clone, Debug, PartialEq, Copy)]
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum BitwiseOp {
     And,
     Or,
     Xor,
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct MatchExpr {
     pub value: Box<Expression>,
     pub variants: Vec<MatchVariant>,
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct IfExpr {
     pub value: Box<Expression>,
     pub contents: Vec<Statement>,
     pub r#else: Option<Vec<Statement>>,
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct MatchVariant {
     pub case: SimpleExpr,
     pub block: Vec<Statement>,
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub enum PathSegment {
     FieldAccess(Ident),
     ArrayIndex(SimpleExpr),
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct PathOp {
     pub first: Ident,
     pub extra: Vec<PathSegment>,
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct CastOp {
     pub value: Expression,
     pub r#type: TypeSpec,
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct FnCallOp {
     pub target: Ident,
     pub args: Vec<Expression>,