From 587e3768f17302a0f7ed35eabfb4d3e7b607a0e6 Mon Sep 17 00:00:00 2001 From: Gabriel Barreto Date: Thu, 21 Dec 2023 13:03:47 -0300 Subject: [PATCH] fixed eval/proof iterations --- src/lem/tests/eval_tests.rs | 62 +++++++++++++++---------------- src/proof/tests/nova_tests_lem.rs | 10 ++--- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/lem/tests/eval_tests.rs b/src/lem/tests/eval_tests.rs index 83e752eb6f..5549315795 100644 --- a/src/lem/tests/eval_tests.rs +++ b/src/lem/tests/eval_tests.rs @@ -278,7 +278,7 @@ fn evaluate_lambda2() { None, Some(terminal), None, - &expect!["8"], + &expect!["7"], &None, ); } @@ -339,7 +339,7 @@ fn evaluate_lambda5() { None, Some(terminal), None, - &expect!["11"], + &expect!["10"], &None, ); } @@ -481,7 +481,7 @@ fn evaluate_adder1() { None, Some(terminal), None, - &expect!["10"], + &expect!["9"], &None, ); } @@ -502,7 +502,7 @@ fn evaluate_adder2() { None, Some(terminal), None, - &expect!["12"], + &expect!["11"], &None, ); } @@ -561,7 +561,7 @@ fn evaluate_let() { None, Some(terminal), None, - &expect!["8"], + &expect!["7"], &None, ); } @@ -658,7 +658,7 @@ fn evaluate_arithmetic_let() { Some(new_env), Some(terminal), None, - &expect!["15"], + &expect!["12"], &None, ); } @@ -689,7 +689,7 @@ fn evaluate_fundamental_conditional() { None, Some(terminal), None, - &expect!["28"], + &expect!["22"], &None, ); } @@ -716,7 +716,7 @@ fn evaluate_fundamental_conditional() { None, Some(terminal), None, - &expect!["26"], + &expect!["22"], &None, ); } @@ -800,7 +800,7 @@ fn evaluate_recursion1() { None, Some(terminal), None, - &expect!["76"], + &expect!["64"], &None, ); } @@ -825,7 +825,7 @@ fn evaluate_recursion2() { None, Some(terminal), None, - &expect!["163"], + &expect!["122"], &None, ); } @@ -848,7 +848,7 @@ fn evaluate_recursion_multiarg() { None, Some(terminal), None, - &expect!["68"], + &expect!["56"], &None, ); } @@ -874,7 +874,7 @@ fn evaluate_recursion_optimized() { None, Some(terminal), None, - &expect!["66"], + &expect!["57"], &None, ); } @@ -899,7 +899,7 @@ fn evaluate_tail_recursion() { None, Some(terminal), None, - &expect!["105"], + &expect!["80"], &None, ); } @@ -927,7 +927,7 @@ fn evaluate_tail_recursion_somewhat_optimized() { None, Some(terminal), None, - &expect!["92"], + &expect!["73"], &None, ); } @@ -948,7 +948,7 @@ fn evaluate_multiple_letrec_bindings() { None, Some(terminal), None, - &expect!["20"], + &expect!["19"], &None, ); } @@ -969,7 +969,7 @@ fn evaluate_multiple_letrec_bindings_referencing() { None, Some(terminal), None, - &expect!["28"], + &expect!["25"], &None, ); } @@ -1001,7 +1001,7 @@ fn evaluate_multiple_letrec_bindings_recursive() { None, Some(terminal), None, - &expect!["175"], + &expect!["144"], &None, ); } @@ -1025,7 +1025,7 @@ fn nested_let_closure_regression() { None, Some(terminal), None, - &expect!["11"], + &expect!["9"], &None, ); } @@ -1042,7 +1042,7 @@ fn nested_let_closure_regression() { None, Some(terminal), None, - &expect!["11"], + &expect!["9"], &None, ); } @@ -1172,7 +1172,7 @@ fn evaluate_zero_arg_lambda() { None, Some(terminal), None, - &expect!["10"], + &expect!["9"], &None, ); } @@ -1235,7 +1235,7 @@ fn evaluate_make_tree() { None, Some(terminal), None, - &expect!["445"], + &expect!["397"], &None, ); } @@ -1281,7 +1281,7 @@ fn evaluate_map_tree_bug() { None, Some(terminal), None, - &expect!["125"], + &expect!["103"], &None, ); } @@ -1308,7 +1308,7 @@ fn evaluate_map_tree_numequal_bug() { None, Some(error), None, - &expect!["125"], + &expect!["103"], &None, ); } @@ -1343,7 +1343,7 @@ fn env_lost_bug() { None, Some(terminal), None, - &expect!["22"], + &expect!["18"], &None, ); } @@ -1368,7 +1368,7 @@ fn dont_discard_rest_env() { None, Some(terminal), None, - &expect!["20"], + &expect!["15"], &None, ); } @@ -1674,7 +1674,7 @@ fn go_translate() { None, None, None, - &expect!["840"], + &expect!["509"], &None, ); } @@ -2388,7 +2388,7 @@ fn test_relational_edge_case_identity() { None, Some(terminal), None, - &expect!["17"], + &expect!["16"], &None, ); } @@ -2407,7 +2407,7 @@ fn test_relational_edge_case_identity() { None, Some(terminal), None, - &expect!["22"], + &expect!["21"], &None, ); } @@ -2431,7 +2431,7 @@ fn test_num_syntax_implications() { None, Some(terminal), None, - &expect!["8"], + &expect!["7"], &None, ); } @@ -2564,7 +2564,7 @@ fn test_quoted_symbols() { None, Some(terminal), None, - &expect!["11"], + &expect!["10"], &None, ); } @@ -3337,7 +3337,7 @@ fn test_fold_cons_regression() { None, Some(terminal), None, - &expect!["92"], + &expect!["67"], &None, ); } diff --git a/src/proof/tests/nova_tests_lem.rs b/src/proof/tests/nova_tests_lem.rs index 8867f589fd..efad8b9364 100644 --- a/src/proof/tests/nova_tests_lem.rs +++ b/src/proof/tests/nova_tests_lem.rs @@ -1629,7 +1629,7 @@ fn test_prove_nested_let_closure_regression() { None, Some(terminal), None, - &expect!["11"], + &expect!["9"], &None, ); } @@ -3000,7 +3000,7 @@ fn test_relational_edge_case_identity() { None, Some(terminal), None, - &expect!["17"], + &expect!["16"], &None, ); } @@ -3101,7 +3101,7 @@ fn test_prove_functional_commitment() { None, Some(terminal), None, - &expect!["21"], + &expect!["19"], &None, ); } @@ -3154,7 +3154,7 @@ fn test_prove_test_fold_cons_regression() { None, Some(terminal), None, - &expect!["92"], + &expect!["67"], &None, ); } @@ -3239,7 +3239,7 @@ fn test_prove_test_env_not_nil_and_binding_nil() { let expr = "(let ((a 1) (b 2)) c)"; let error = s.cont_error(); - test_aux::<_, _, M1<'_, _>>(s, expr, None, None, Some(error), None, &expect!["7"], &None); + test_aux::<_, _, M1<'_, _>>(s, expr, None, None, Some(error), None, &expect!["5"], &None); } #[test]