Skip to content

Instantly share code, notes, and snippets.

@huitseeker

huitseeker/gist:6d7561bbc3bb5c008ba70bbb44f2e104

Created December 19, 2023 13:04
Show Gist options
  • Save huitseeker/6d7561bbc3bb5c008ba70bbb44f2e104 to your computer and use it in GitHub Desktop.
Save huitseeker/6d7561bbc3bb5c008ba70bbb44f2e104 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
diff --git a/src/lem/tests/eval_tests.rs b/src/lem/tests/eval_tests.rs
index fbd5d4d9a..924a9e6e2 100644
--- a/src/lem/tests/eval_tests.rs
+++ b/src/lem/tests/eval_tests.rs
@@ -176,11 +176,11 @@ fn self_evaluating() {
]
.into_iter()
.for_each(|(expr, expt)| {
- test_aux::<Coproc<Fr>>(s, expr, Some(expt), None, None, None, 1, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(expt), None, None, None, expect!("1"), &None);
});
let fun = s.intern_fun(s.intern_user_symbol("x"), s.list(vec![expt_nil]), expt_nil);
- do_test_aux::<Coproc<Fr>>(s, &fun, Some(fun), None, None, None, 1, &None);
+ do_test_aux::<Coproc<Fr>>(s, &fun, Some(fun), None, None, None, expect!("1"), &None);
}
#[test]
@@ -423,7 +423,7 @@ fn evaluate_quotient_divide_by_zero() {
let expr = "(/ 21 0)";
let error = s.cont_error();
- test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, 3, &None);
+ test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, expect!("3"), &None);
}
#[test]
@@ -569,7 +569,7 @@ fn evaluate_let_empty_error() {
let expr = "(let)";
let error = s.cont_error();
- test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, 1, &None);
+ test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, expect!("1"), &None);
}
#[test]
@@ -578,7 +578,7 @@ fn evaluate_let_empty_body_error() {
let expr = "(let ((a 1)))";
let error = s.cont_error();
- test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, 1, &None);
+ test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, expect!("1"), &None);
}
#[test]
@@ -587,7 +587,7 @@ fn evaluate_letrec_empty_error() {
let expr = "(letrec)";
let error = s.cont_error();
- test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, 1, &None);
+ test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, expect!("1"), &None);
}
#[test]
@@ -596,7 +596,7 @@ fn evaluate_letrec_empty_body_error() {
let expr = "(letrec ((a 1)))";
let error = s.cont_error();
- test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, 1, &None);
+ test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, expect!("1"), &None);
}
#[test]
@@ -1183,14 +1183,14 @@ fn evaluate_zero_arg_lambda_variants() {
let expr = "((lambda () 123) 1)";
let error = s.cont_error();
- test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, 3, &None);
+ test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, expect!("3"), &None);
}
{
let s = &Store::<Fr>::default();
let expr = "(123)";
let error = s.cont_error();
- test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, 1, &None);
+ test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, expect!("1"), &None);
}
}
@@ -1299,7 +1299,7 @@ fn evaluate_map_tree_numequal_bug() {
(map-tree (lambda (x) (+ 1 x)) '((1 . 2) . (3 . 4))))";
let expected = s.intern_nil();
let error = s.cont_error();
- test_aux::<Coproc<Fr>>(s, expr, Some(expected), None, Some(error), None, 169, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(expected), None, Some(error), None, expect!("169"), &None);
}
}
@@ -1970,9 +1970,9 @@ fn num_invalid_tag() {
let expr1 = "(num \"asdf\")";
let expr2 = "(num '(1))";
let error = s.cont_error();
- test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, 2, &None);
- test_aux::<Coproc<Fr>>(s, expr1, None, None, Some(error), None, 2, &None);
- test_aux::<Coproc<Fr>>(s, expr2, None, None, Some(error), None, 2, &None);
+ test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, expect!("2"), &None);
+ test_aux::<Coproc<Fr>>(s, expr1, None, None, Some(error), None, expect!("2"), &None);
+ test_aux::<Coproc<Fr>>(s, expr2, None, None, Some(error), None, expect!("2"), &None);
}
#[test]
@@ -1982,9 +1982,9 @@ fn comm_invalid_tag() {
let expr1 = "(comm \"asdf\")";
let expr2 = "(comm '(1))";
let error = s.cont_error();
- test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, 2, &None);
- test_aux::<Coproc<Fr>>(s, expr1, None, None, Some(error), None, 2, &None);
- test_aux::<Coproc<Fr>>(s, expr2, None, None, Some(error), None, 2, &None);
+ test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, expect!("2"), &None);
+ test_aux::<Coproc<Fr>>(s, expr1, None, None, Some(error), None, expect!("2"), &None);
+ test_aux::<Coproc<Fr>>(s, expr2, None, None, Some(error), None, expect!("2"), &None);
}
#[test]
@@ -1994,9 +1994,9 @@ fn char_invalid_tag() {
let expr1 = "(char \"asdf\")";
let expr2 = "(char '(1))";
let error = s.cont_error();
- test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, 2, &None);
- test_aux::<Coproc<Fr>>(s, expr1, None, None, Some(error), None, 2, &None);
- test_aux::<Coproc<Fr>>(s, expr2, None, None, Some(error), None, 2, &None);
+ test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, expect!("2"), &None);
+ test_aux::<Coproc<Fr>>(s, expr1, None, None, Some(error), None, expect!("2"), &None);
+ test_aux::<Coproc<Fr>>(s, expr2, None, None, Some(error), None, expect!("2"), &None);
}
#[test]
@@ -2005,7 +2005,7 @@ fn terminal_sym() {
let expr = "(quote x)";
let x = s.intern_user_symbol("x");
let terminal = s.cont_terminal();
- test_aux::<Coproc<Fr>>(s, expr, Some(x), None, Some(terminal), None, 1, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(x), None, Some(terminal), None, expect!("1"), &None);
}
#[test]
@@ -2013,7 +2013,7 @@ fn terminal_sym() {
fn open_opaque_commit() {
let s = &Store::<Fr>::default();
let expr = "(open 123)";
- test_aux::<Coproc<Fr>>(s, expr, None, None, None, None, 2, &None);
+ test_aux::<Coproc<Fr>>(s, expr, None, None, None, None, expect!("2"), &None);
}
#[test]
@@ -2021,7 +2021,7 @@ fn open_wrong_type() {
let s = &Store::<Fr>::default();
let expr = "(open 'asdf)";
let error = s.cont_error();
- test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, 2, &None);
+ test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, expect!("2"), &None);
}
#[test]
@@ -2029,7 +2029,7 @@ fn secret_wrong_type() {
let s = &Store::<Fr>::default();
let expr = "(secret 'asdf)";
let error = s.cont_error();
- test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, 2, &None);
+ test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, expect!("2"), &None);
}
#[test]
@@ -2037,7 +2037,7 @@ fn secret_wrong_type() {
fn secret_invalid_tag() {
let s = &Store::<Fr>::default();
let expr = "(secret 123)";
- test_aux::<Coproc<Fr>>(s, expr, None, None, None, None, 2, &None);
+ test_aux::<Coproc<Fr>>(s, expr, None, None, None, None, expect!("2"), &None);
}
#[test]
@@ -2045,7 +2045,7 @@ fn secret_invalid_tag() {
fn secret_opaque_commit() {
let s = &Store::<Fr>::default();
let expr = "(secret (comm 123))";
- test_aux::<Coproc<Fr>>(s, expr, None, None, None, None, 2, &None);
+ test_aux::<Coproc<Fr>>(s, expr, None, None, None, None, expect!("2"), &None);
}
#[allow(dead_code)]
@@ -2199,7 +2199,7 @@ fn test_relational_edge_case_identity() {
(most-negative (+ 1 most-positive)))
(< most-negative most-positive))";
- test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, 19, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, expect!("19"), &None);
}
// Regression: comparisons with negative numbers should *not* be exceptions.
@@ -2209,7 +2209,7 @@ fn test_relational_edge_case_identity() {
(less-negative (+ 1 most-negative)))
(< most-negative less-negative)) ";
- test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, 24, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, expect!("24"), &None);
}
}
@@ -2224,31 +2224,31 @@ fn test_num_syntax_implications() {
(most-negative 1/2))
(< most-negative most-positive))";
- test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, 10, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, expect!("10"), &None);
}
{
let expr = "(= (* 6 3/2) 9)";
- test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, 6, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, expect!("6"), &None);
}
{
let expr = "(= (* 2/3 3/2) 1)";
- test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, 6, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, expect!("6"), &None);
}
{
let expr = "(= (* -2/3 3/2) -1)";
- test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, 6, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, expect!("6"), &None);
}
{
let expr = "(= (+ 1/3 1/2) 5/6)";
- test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, 6, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, expect!("6"), &None);
}
// Comparisons of field elements produced by fractional notation don't yield the results
@@ -2258,7 +2258,7 @@ fn test_num_syntax_implications() {
// but this violates expectations if you consider 1/2 to behave like a rational.
let expr = "(< 1/2 1/3)";
- test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, 3, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, expect!("3"), &None);
}
{
@@ -2266,13 +2266,13 @@ fn test_num_syntax_implications() {
// expected if fractional notation yielded true rational numbers.
let expr = "(< 3/4 5/8)";
- test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, 3, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, expect!("3"), &None);
}
{
// It's not that they *can't* compare in the naively expected way, though.
let expr = "(< 3/5 3/4)";
- test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, 3, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, expect!("3"), &None);
}
}
@@ -2285,7 +2285,7 @@ fn test_quoted_symbols() {
let res = s.num_u64(81);
let terminal = s.cont_terminal();
- test_aux::<Coproc<Fr>>(s, expr, Some(res), None, Some(terminal), None, 13, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(res), None, Some(terminal), None, expect!("13"), &None);
}
#[test]
@@ -2297,8 +2297,8 @@ fn test_eval() {
let res2 = s.num_u64(20);
let terminal = s.cont_terminal();
- test_aux::<Coproc<Fr>>(s, expr, Some(res), None, Some(terminal), None, 17, &None);
- test_aux::<Coproc<Fr>>(s, expr2, Some(res2), None, Some(terminal), None, 9, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(res), None, Some(terminal), None, expect!("17"), &None);
+ test_aux::<Coproc<Fr>>(s, expr2, Some(res2), None, Some(terminal), None, expect!("9"), &None);
}
#[test]
@@ -2310,8 +2310,8 @@ fn test_eval_env_regression() {
let error = s.cont_error();
let terminal = s.cont_terminal();
- test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, 5, &None);
- test_aux::<Coproc<Fr>>(s, expr2, Some(res), None, Some(terminal), None, 6, &None);
+ test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, expect!("5"), &None);
+ test_aux::<Coproc<Fr>>(s, expr2, Some(res), None, Some(terminal), None, expect!("6"), &None);
}
#[test]
@@ -2324,9 +2324,9 @@ fn test_u64_mul() {
let res = s.u64(18446744073709551614);
let terminal = s.cont_terminal();
- test_aux::<Coproc<Fr>>(s, expr, Some(res), None, Some(terminal), None, 7, &None);
- test_aux::<Coproc<Fr>>(s, expr2, Some(res), None, Some(terminal), None, 3, &None);
- test_aux::<Coproc<Fr>>(s, expr3, Some(res), None, Some(terminal), None, 6, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(res), None, Some(terminal), None, expect!("7"), &None);
+ test_aux::<Coproc<Fr>>(s, expr2, Some(res), None, Some(terminal), None, expect!("3"), &None);
+ test_aux::<Coproc<Fr>>(s, expr3, Some(res), None, Some(terminal), None, expect!("6"), &None);
}
#[test]
@@ -2338,8 +2338,8 @@ fn test_u64_add() {
let res = s.u64(1);
let terminal = s.cont_terminal();
- test_aux::<Coproc<Fr>>(s, expr, Some(res), None, Some(terminal), None, 3, &None);
- test_aux::<Coproc<Fr>>(s, expr2, Some(res), None, Some(terminal), None, 6, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(res), None, Some(terminal), None, expect!("3"), &None);
+ test_aux::<Coproc<Fr>>(s, expr2, Some(res), None, Some(terminal), None, expect!("6"), &None);
}
#[test]
@@ -2354,9 +2354,9 @@ fn test_u64_sub() {
let res3 = s.u64(0);
let terminal = s.cont_terminal();
- test_aux::<Coproc<Fr>>(s, expr, Some(res), None, Some(terminal), None, 3, &None);
- test_aux::<Coproc<Fr>>(s, expr2, Some(res2), None, Some(terminal), None, 3, &None);
- test_aux::<Coproc<Fr>>(s, expr3, Some(res3), None, Some(terminal), None, 6, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(res), None, Some(terminal), None, expect!("3"), &None);
+ test_aux::<Coproc<Fr>>(s, expr2, Some(res2), None, Some(terminal), None, expect!("3"), &None);
+ test_aux::<Coproc<Fr>>(s, expr3, Some(res3), None, Some(terminal), None, expect!("6"), &None);
}
#[test]
@@ -2374,9 +2374,9 @@ fn test_u64_div() {
let terminal = s.cont_terminal();
let error = s.cont_error();
- test_aux::<Coproc<Fr>>(s, expr, Some(res), None, Some(terminal), None, 3, &None);
- test_aux::<Coproc<Fr>>(s, expr2, Some(res2), None, Some(terminal), None, 3, &None);
- test_aux::<Coproc<Fr>>(s, expr3, None, None, Some(error), None, 3, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(res), None, Some(terminal), None, expect!("3"), &None);
+ test_aux::<Coproc<Fr>>(s, expr2, Some(res2), None, Some(terminal), None, expect!("3"), &None);
+ test_aux::<Coproc<Fr>>(s, expr3, None, None, Some(error), None, expect!("3"), &None);
}
#[test]
@@ -2394,9 +2394,9 @@ fn test_u64_mod() {
let terminal = s.cont_terminal();
let error = s.cont_error();
- test_aux::<Coproc<Fr>>(s, expr, Some(res), None, Some(terminal), None, 3, &None);
- test_aux::<Coproc<Fr>>(s, expr2, Some(res2), None, Some(terminal), None, 3, &None);
- test_aux::<Coproc<Fr>>(s, expr3, None, None, Some(error), None, 3, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(res), None, Some(terminal), None, expect!("3"), &None);
+ test_aux::<Coproc<Fr>>(s, expr2, Some(res2), None, Some(terminal), None, expect!("3"), &None);
+ test_aux::<Coproc<Fr>>(s, expr3, None, None, Some(error), None, expect!("3"), &None);
}
#[test]
@@ -2409,9 +2409,9 @@ fn test_num_mod() {
let error = s.cont_error();
- test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, 3, &None);
- test_aux::<Coproc<Fr>>(s, expr2, None, None, Some(error), None, 3, &None);
- test_aux::<Coproc<Fr>>(s, expr3, None, None, Some(error), None, 3, &None);
+ test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, expect!("3"), &None);
+ test_aux::<Coproc<Fr>>(s, expr2, None, None, Some(error), None, expect!("3"), &None);
+ test_aux::<Coproc<Fr>>(s, expr3, None, None, Some(error), None, expect!("3"), &None);
}
#[test]
@@ -2438,21 +2438,21 @@ fn test_u64_comp() {
let nil = s.intern_nil();
let terminal = s.cont_terminal();
- test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, 3, &None);
- test_aux::<Coproc<Fr>>(s, expr2, Some(nil), None, Some(terminal), None, 3, &None);
- test_aux::<Coproc<Fr>>(s, expr3, Some(t), None, Some(terminal), None, 3, &None);
- test_aux::<Coproc<Fr>>(s, expr4, Some(nil), None, Some(terminal), None, 3, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, expect!("3"), &None);
+ test_aux::<Coproc<Fr>>(s, expr2, Some(nil), None, Some(terminal), None, expect!("3"), &None);
+ test_aux::<Coproc<Fr>>(s, expr3, Some(t), None, Some(terminal), None, expect!("3"), &None);
+ test_aux::<Coproc<Fr>>(s, expr4, Some(nil), None, Some(terminal), None, expect!("3"), &None);
- test_aux::<Coproc<Fr>>(s, expr5, Some(nil), None, Some(terminal), None, 3, &None);
- test_aux::<Coproc<Fr>>(s, expr6, Some(t), None, Some(terminal), None, 3, &None);
- test_aux::<Coproc<Fr>>(s, expr7, Some(nil), None, Some(terminal), None, 3, &None);
- test_aux::<Coproc<Fr>>(s, expr8, Some(t), None, Some(terminal), None, 3, &None);
+ test_aux::<Coproc<Fr>>(s, expr5, Some(nil), None, Some(terminal), None, expect!("3"), &None);
+ test_aux::<Coproc<Fr>>(s, expr6, Some(t), None, Some(terminal), None, expect!("3"), &None);
+ test_aux::<Coproc<Fr>>(s, expr7, Some(nil), None, Some(terminal), None, expect!("3"), &None);
+ test_aux::<Coproc<Fr>>(s, expr8, Some(t), None, Some(terminal), None, expect!("3"), &None);
- test_aux::<Coproc<Fr>>(s, expr9, Some(t), None, Some(terminal), None, 3, &None);
- test_aux::<Coproc<Fr>>(s, expr10, Some(t), None, Some(terminal), None, 3, &None);
+ test_aux::<Coproc<Fr>>(s, expr9, Some(t), None, Some(terminal), None, expect!("3"), &None);
+ test_aux::<Coproc<Fr>>(s, expr10, Some(t), None, Some(terminal), None, expect!("3"), &None);
- test_aux::<Coproc<Fr>>(s, expr11, Some(t), None, Some(terminal), None, 3, &None);
- test_aux::<Coproc<Fr>>(s, expr12, Some(nil), None, Some(terminal), None, 3, &None);
+ test_aux::<Coproc<Fr>>(s, expr11, Some(t), None, Some(terminal), None, expect!("3"), &None);
+ test_aux::<Coproc<Fr>>(s, expr12, Some(nil), None, Some(terminal), None, expect!("3"), &None);
}
#[test]
@@ -2474,14 +2474,14 @@ fn test_u64_conversion() {
let terminal = s.cont_terminal();
let error = s.cont_error();
- test_aux::<Coproc<Fr>>(s, expr, Some(res), None, Some(terminal), None, 3, &None);
- test_aux::<Coproc<Fr>>(s, expr2, Some(res), None, Some(terminal), None, 2, &None);
- test_aux::<Coproc<Fr>>(s, expr3, Some(res2), None, Some(terminal), None, 3, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(res), None, Some(terminal), None, expect!("3"), &None);
+ test_aux::<Coproc<Fr>>(s, expr2, Some(res), None, Some(terminal), None, expect!("2"), &None);
+ test_aux::<Coproc<Fr>>(s, expr3, Some(res2), None, Some(terminal), None, expect!("3"), &None);
- test_aux::<Coproc<Fr>>(s, expr4, Some(res3), None, Some(terminal), None, 5, &None);
- test_aux::<Coproc<Fr>>(s, expr5, Some(res5), None, Some(terminal), None, 2, &None);
- test_aux::<Coproc<Fr>>(s, expr6, None, None, Some(error), None, 1, &None);
- test_aux::<Coproc<Fr>>(s, expr7, None, None, Some(error), None, 1, &None);
+ test_aux::<Coproc<Fr>>(s, expr4, Some(res3), None, Some(terminal), None, expect!("5"), &None);
+ test_aux::<Coproc<Fr>>(s, expr5, Some(res5), None, Some(terminal), None, expect!("2"), &None);
+ test_aux::<Coproc<Fr>>(s, expr6, None, None, Some(error), None, expect!("1"), &None);
+ test_aux::<Coproc<Fr>>(s, expr7, None, None, Some(error), None, expect!("1"), &None);
}
#[test]
@@ -2493,8 +2493,8 @@ fn test_numeric_type_error() {
let expr = &format!("({op} 0 'a)");
let expr2 = &format!("({op} 0u64 'a)");
- test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, 3, &None);
- test_aux::<Coproc<Fr>>(s, expr2, None, None, Some(error), None, 3, &None);
+ test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, expect!("3"), &None);
+ test_aux::<Coproc<Fr>>(s, expr2, None, None, Some(error), None, expect!("3"), &None);
};
test("+");
@@ -2519,8 +2519,8 @@ fn test_u64_num_comparison() {
let nil = s.intern_nil();
let terminal = s.cont_terminal();
- test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, 3, &None);
- test_aux::<Coproc<Fr>>(s, expr2, Some(nil), None, Some(terminal), None, 3, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(t), None, Some(terminal), None, expect!("3"), &None);
+ test_aux::<Coproc<Fr>>(s, expr2, Some(nil), None, Some(terminal), None, expect!("3"), &None);
}
#[test]
@@ -2533,8 +2533,8 @@ fn test_u64_num_cons() {
let res2 = s.read_with_default_state("(1u64 . 1)").unwrap();
let terminal = s.cont_terminal();
- test_aux::<Coproc<Fr>>(s, expr, Some(res), None, Some(terminal), None, 3, &None);
- test_aux::<Coproc<Fr>>(s, expr2, Some(res2), None, Some(terminal), None, 3, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(res), None, Some(terminal), None, expect!("3"), &None);
+ test_aux::<Coproc<Fr>>(s, expr2, Some(res2), None, Some(terminal), None, expect!("3"), &None);
}
#[test]
@@ -2544,7 +2544,7 @@ fn test_hide_u64_secret() {
let expr = "(hide 0u64 123)";
let error = s.cont_error();
- test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, 3, &None);
+ test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, expect!("3"), &None);
}
#[test]
@@ -2560,9 +2560,9 @@ fn test_keyword() {
let terminal = s.cont_terminal();
- test_aux::<Coproc<Fr>>(s, expr, Some(res), None, Some(terminal), None, 1, &None);
- test_aux::<Coproc<Fr>>(s, expr2, Some(res2), None, Some(terminal), None, 3, &None);
- test_aux::<Coproc<Fr>>(s, expr3, Some(res3), None, Some(terminal), None, 3, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(res), None, Some(terminal), None, expect!("1"), &None);
+ test_aux::<Coproc<Fr>>(s, expr2, Some(res2), None, Some(terminal), None, expect!("3"), &None);
+ test_aux::<Coproc<Fr>>(s, expr3, Some(res3), None, Some(terminal), None, expect!("3"), &None);
}
#[test]
@@ -2635,7 +2635,7 @@ fn test_fold_cons_regression() {
let res = s.num_u64(6);
let terminal = s.cont_terminal();
- test_aux::<Coproc<Fr>>(s, expr, Some(res), None, Some(terminal), None, 152, &None);
+ test_aux::<Coproc<Fr>>(s, expr, Some(res), None, Some(terminal), None, expect!("152"), &None);
}
#[test]
@@ -2645,7 +2645,7 @@ fn test_lambda_args_regression() {
let expr = "(cons (lambda (x y) nil) nil)";
let terminal = s.cont_terminal();
- test_aux::<Coproc<Fr>>(s, expr, None, None, Some(terminal), None, 3, &None);
+ test_aux::<Coproc<Fr>>(s, expr, None, None, Some(terminal), None, expect!("3"), &None);
}
#[test]
@@ -2654,7 +2654,7 @@ fn test_eval_bad_form() {
let expr = "(* 5 (eval '(+ 1 a) '((0 . 3))))"; // two-arg eval, optional second arg is env.
let error = s.cont_error();
- test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, 8, &None);
+ test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, expect!("8"), &None);
}
#[test]
@@ -2662,10 +2662,10 @@ fn test_eval_quote_error() {
let s = &Store::<Fr>::default();
let error = s.cont_error();
- test_aux::<Coproc<Fr>>(s, "(1)", None, None, Some(error), None, 1, &None);
- test_aux::<Coproc<Fr>>(s, "(quote . 1)", None, None, Some(error), None, 1, &None);
- test_aux::<Coproc<Fr>>(s, "(quote 1 . 1)", None, None, Some(error), None, 1, &None);
- test_aux::<Coproc<Fr>>(s, "(quote 1 1)", None, None, Some(error), None, 1, &None);
+ test_aux::<Coproc<Fr>>(s, "(1)", None, None, Some(error), None, expect!("1"), &None);
+ test_aux::<Coproc<Fr>>(s, "(quote . 1)", None, None, Some(error), None, expect!("1"), &None);
+ test_aux::<Coproc<Fr>>(s, "(quote 1 . 1)", None, None, Some(error), None, expect!("1"), &None);
+ test_aux::<Coproc<Fr>>(s, "(quote 1 1)", None, None, Some(error), None, expect!("1"), &None);
}
#[test]
@@ -2674,7 +2674,7 @@ fn test_eval_dotted_syntax_error() {
let expr = "(let ((a (lambda (x) (+ x 1)))) (a . 1))";
let error = s.cont_error();
- test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, 3, &None);
+ test_aux::<Coproc<Fr>>(s, expr, None, None, Some(error), None, expect!("3"), &None);
}
#[allow(dead_code)]
@@ -2687,30 +2687,30 @@ fn op_syntax_error<T: Op + Copy>() {
{
let expr = format!("({name} . 1)");
tracing::debug!("{}", &expr);
- test_aux::<Coproc<Fr>>(s, &expr, None, None, Some(error), None, 1, &None);
+ test_aux::<Coproc<Fr>>(s, &expr, None, None, Some(error), None, expect!("1"), &None);
}
if !op.supports_arity(0) {
let expr = format!("({name})");
tracing::debug!("{}", &expr);
- test_aux::<Coproc<Fr>>(s, &expr, None, None, Some(error), None, 1, &None);
+ test_aux::<Coproc<Fr>>(s, &expr, None, None, Some(error), None, expect!("1"), &None);
}
if !op.supports_arity(1) {
let expr = format!("({name} 123)");
tracing::debug!("{}", &expr);
- test_aux::<Coproc<Fr>>(s, &expr, None, None, Some(error), None, 1, &None);
+ test_aux::<Coproc<Fr>>(s, &expr, None, None, Some(error), None, expect!("1"), &None);
}
if !op.supports_arity(2) {
let expr = format!("({name} 123 456)");
tracing::debug!("{}", &expr);
- test_aux::<Coproc<Fr>>(s, &expr, None, None, Some(error), None, 1, &None);
+ test_aux::<Coproc<Fr>>(s, &expr, None, None, Some(error), None, expect!("1"), &None);
}
if !op.supports_arity(3) {
let expr = format!("({name} 123 456 789)");
tracing::debug!("{}", &expr);
let iterations = if op.supports_arity(2) { 2 } else { 1 };
- test_aux::<Coproc<Fr>>(s, &expr, None, None, Some(error), None, iterations, &None);
+ test_aux::<Coproc<Fr>>(s, &expr, None, None, Some(error), None, expect!("iterations"), &None);
}
};
@@ -2734,7 +2734,7 @@ fn test_eval_lambda_body_syntax() {
let s = &Store::<Fr>::default();
let error = s.cont_error();
- test_aux::<Coproc<Fr>>(s, "((lambda ()))", None, None, Some(error), None, 2, &None);
+ test_aux::<Coproc<Fr>>(s, "((lambda ()))", None, None, Some(error), None, expect!("2"), &None);
test_aux::<Coproc<Fr>>(
s,
"((lambda () 1 2))",
@@ -2777,9 +2777,9 @@ fn test_eval_non_symbol_binding_error() {
let expr2 = format!("(letrec (({x} 123)) {x})");
let expr3 = format!("(lambda ({x}) {x})");
- test_aux::<Coproc<Fr>>(s, &expr, None, None, Some(error), None, 1, &None);
- test_aux::<Coproc<Fr>>(s, &expr2, None, None, Some(error), None, 1, &None);
- test_aux::<Coproc<Fr>>(s, &expr3, None, None, Some(error), None, 1, &None);
+ test_aux::<Coproc<Fr>>(s, &expr, None, None, Some(error), None, expect!("1"), &None);
+ test_aux::<Coproc<Fr>>(s, &expr2, None, None, Some(error), None, expect!("1"), &None);
+ test_aux::<Coproc<Fr>>(s, &expr3, None, None, Some(error), None, expect!("1"), &None);
};
test(":a");
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment