update parser tests

noir-lang · Jan 23, 2024 · f2fca62 · f2fca62
1 parent c0355e4
commit f2fca62
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 31 deletions.
diff --git a/acvm-repo/acir/src/circuit/mod.rs b/acvm-repo/acir/src/circuit/mod.rs
@@ -39,7 +39,7 @@ pub struct Circuit {
     // c++ code at the moment when it is, due to OpcodeLocation needing a comparison
     // implementation which is never generated.
     //
-    // TODO: These are only used for constrains that are generating during compilation.
+    // TODO: These are only used for constrain statements that are generated during codegen.
     // TODO: We should move towards having all the checks being evaluated in the same manner
     // TODO: as runtime assert messages specified by the user.
     pub assert_messages: Vec<(OpcodeLocation, String)>,

diff --git a/compiler/noirc_evaluator/src/ssa/opt/defunctionalize.rs b/compiler/noirc_evaluator/src/ssa/opt/defunctionalize.rs
@@ -254,7 +254,7 @@ fn create_apply_functions(
             "ICE: at least one variant should exist for a dynamic call {signature:?}"
         );
         let dispatches_to_multiple_functions = variants.len() > 1;
-        dbg!(variants.clone());
+
         let id = if dispatches_to_multiple_functions {
             create_apply_function(ssa, signature.clone(), variants)
         } else {

diff --git a/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg.rs b/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg.rs
@@ -660,7 +660,7 @@ impl<'f> Context<'f> {
                         Instruction::binary(BinaryOp::Mul, rhs, casted_condition),
                         call_stack,
                     );
-                    dbg!(message.clone());
+
                     Instruction::Constrain(lhs, rhs, message)
                 }
                 Instruction::Store { address, value } => {

diff --git a/compiler/noirc_frontend/src/hir/resolution/resolver.rs b/compiler/noirc_frontend/src/hir/resolution/resolver.rs
@@ -1116,10 +1116,7 @@ impl<'a> Resolver<'a> {
                         Expression::call(
                             Expression {
                                 kind: ExpressionKind::Variable(Path {
-                                    segments: vec![
-                                        // Ident::from("crate"),
-                                        Ident::from("resolve_assert_message"),
-                                    ],
+                                    segments: vec![Ident::from("resolve_assert_message")],
                                     kind: PathKind::Crate,
                                     span,
                                 }),
@@ -1145,22 +1142,6 @@ impl<'a> Resolver<'a> {
                             Span::default(),
                         )
                     };
-                    // dbg!(call_expr.clone());
-                    // let call_expr = Expression::call(
-                    //     Expression {
-                    //         kind: ExpressionKind::Variable(Path {
-                    //             segments: vec![
-                    //                 Ident::from("std"),
-                    //                 Ident::from("resolve_assert_message"),
-                    //             ],
-                    //             kind: PathKind::Dep,
-                    //             span: Span::default(),
-                    //         }),
-                    //         span: Span::default(),
-                    //     },
-                    //     vec![assert_msg_expr.clone()],
-                    //     Span::default(),
-                    // );
                     self.resolve_expression(call_expr)
                 });
                 HirStatement::Constrain(HirConstrainStatement(

diff --git a/compiler/noirc_frontend/src/parser/parser.rs b/compiler/noirc_frontend/src/parser/parser.rs
@@ -2081,10 +2081,15 @@ mod test {
 
         match parse_with(assertion(expression()), "assert(x == y, \"assertion message\")").unwrap()
         {
-            StatementKind::Constrain(ConstrainStatement(_, message, _)) => {
-                // TODO: update this test
-                // assert_eq!(message, Some("assertion message".to_owned()));
-            }
+            StatementKind::Constrain(ConstrainStatement(_, message, _)) => match message {
+                Some(message) => match message.kind {
+                    ExpressionKind::Literal(Literal::Str(message_string)) => {
+                        assert_eq!(message_string, "assertion message".to_owned());
+                    }
+                    _ => unreachable!(),
+                },
+                _ => unreachable!(),
+            },
             _ => unreachable!(),
         }
     }
@@ -2106,10 +2111,15 @@ mod test {
         match parse_with(assertion_eq(expression()), "assert_eq(x, y, \"assertion message\")")
             .unwrap()
         {
-            StatementKind::Constrain(ConstrainStatement(_, message, _)) => {
-                // TODO: update this test
-                // assert_eq!(message, Some("assertion message".to_owned()));
-            }
+            StatementKind::Constrain(ConstrainStatement(_, message, _)) => match message {
+                Some(message) => match message.kind {
+                    ExpressionKind::Literal(Literal::Str(message_string)) => {
+                        assert_eq!(message_string, "assertion message".to_owned());
+                    }
+                    _ => unreachable!(),
+                },
+                _ => unreachable!(),
+            },
             _ => unreachable!(),
         }
     }