diff --git a/integration_tests/macros_test.ucg b/integration_tests/macros_test.ucg index 81e94b0..0c63e04 100644 --- a/integration_tests/macros_test.ucg +++ b/integration_tests/macros_test.ucg @@ -8,6 +8,7 @@ let cplxmacro = macro(argint, argstr, argfloat) => { field1 = argint + 1, field2 = argstr + " are here", field3 = argfloat - 1.0, + boolfield = argint == 1, }; let simpleresult = simplemacro(1, 2, 3); @@ -19,4 +20,5 @@ assert |simpleresult.field3 == 3|; assert |cplxresult.field1 == 2|; assert |cplxresult.field2 == "We are here"|; -assert |cplxresult.field3 == 2.0|; \ No newline at end of file +assert |cplxresult.field3 == 2.0|; +assert |cplxresult.boolfield == true|; \ No newline at end of file diff --git a/integration_tests/operator_precedence_test.ucg b/integration_tests/operator_precedence_test.ucg index 1e99e6f..f093e0f 100644 --- a/integration_tests/operator_precedence_test.ucg +++ b/integration_tests/operator_precedence_test.ucg @@ -2,6 +2,6 @@ assert |2 * 2 + 1 == 5|; assert |2 + 2 * 3 == 8|; assert |2 * (2 + 1) == 6|; assert |2 * 2 + 1 > 4|; -assert |2 * 2 + 1 > 6|; +assert |2 * 2 + 1 < 6|; assert |2 * 2 + 1 >= 5|; assert |2 * 2 + 1 <= 5|; \ No newline at end of file diff --git a/src/parse/precedence.rs b/src/parse/precedence.rs index f2bd04e..6d06e40 100644 --- a/src/parse/precedence.rs +++ b/src/parse/precedence.rs @@ -406,7 +406,7 @@ pub fn op_expression(i: TokenIter) -> NomResult { let parse_result = alt!( i_, - trace_nom!(math_expression) | trace_nom!(compare_expression) + trace_nom!(compare_expression) | trace_nom!(math_expression) ); match parse_result {