re-introduce some disabled tests, fix some

compiler/parser/src/parser/type_.rs

@@ -32,6 +32,7 @@ pub(crate) const TYPE_TOKENS: &[Token] = &[
     Token::Group,
     Token::Address,
     Token::Bool,
+    Token::Char,
 ];
 
 impl ParserContext<'_> {

disabled_tests/compiler/function/multiple_returns_fail.leo

@@ -5,9 +5,6 @@ input_file: input/dummy.in
 */
 
 function main() -> i8 {
-    if true {
+    return 2i8;
-        return 1i8;   //ignored
+    return 3i8;
-    }
-    return 2i8;       //ignored
-    return 3i8;       //returns
 }

disabled_tests/compiler/function/shadow_global_const_input_fail copy.leo

@@ -1,7 +1,6 @@
 /*
 namespace: Compile
 expectation: Fail
-input_file: input/dummy.in
 */
 
 const hi = 1u32;

disabled_tests/compiler/integers/i32/max.leo

@@ -1,10 +0,0 @@
-/*
-namespace: Compile
-expectation: Pass
-input_file: ../input/dummy.in
-*/
-
-function main(y: bool) -> bool {
-    const a: i32 = 2147483647;
-    return y == true;
-}

disabled_tests/compiler/integers/i32/min.leo

@@ -1,10 +0,0 @@
-/*
-namespace: Compile
-expectation: Pass
-input_file: ../input/dummy.in
-*/
-
-function main(y: bool) -> bool {
-    const a: i32 = -2147483648;
-    return y == true;
-}

disabled_tests/compiler/integers/i32/mul.leo

@@ -1,17 +0,0 @@
-/*
-namespace: Compile
-expectation: Pass
-inputs:
- - i32.in: |
-    [main]
-    a: i32 = 2;
-    b: i32 = 5;
-    c: i32 = 10;
-    
-    [registers]
-    r0: bool = false;
-*/
-
-function main(a: i32, b: i32, c: i32) -> bool {
-    return a * b == c;
-}

disabled_tests/compiler/integers/i32/ne.leo

@@ -1,25 +0,0 @@
-/*
-namespace: Compile
-expectation: Pass
-inputs:
- - i32_ne.in: |
-    [main]
-    a: i32 = 2;
-    b: i32 = 5;
-    c: bool = true;
-
-    [registers]
-    r0: bool = false;
- - i32_e.in: |
-    [main]
-    a: i32 = 5;
-    b: i32 = 5;
-    c: bool = false;
-
-    [registers]
-    r0: bool = false;
-*/
-
-function main(a: i32, b: i32, c: bool) -> bool{
-    return (a != b) == c;
-}

disabled_tests/compiler/integers/i32/negate.leo

@@ -1,23 +0,0 @@
-/*
-namespace: Compile
-expectation: Pass
-inputs:
- - i32.in: |
-    [main]
-    a: i32 = 5;
-    b: i32 = -5;
-
-    [registers]
-    r0: bool = false;
- - i32.in: |
-    [main]
-    a: i32 = -5;
-    b: i32 = 5;
-
-    [registers]
-    r0: bool = false;
-*/
-
-function main(a: i32, b: i32) -> bool {
-    return -a == b;
-}

disabled_tests/compiler/integers/i32/negate_zero.leo

@@ -1,17 +0,0 @@
-/*
-namespace: Compile
-expectation: Pass
-inputs:
- - dummy.in: |
-    [main]
-    y: bool = true;
-
-    [registers]
-    r0: bool = false;
-*/
-
-function main(y: bool) -> bool {
-    const a = 0i32;
-
-    return (-a == 0i32) == y;
-}

disabled_tests/compiler/integers/i32/pow.leo

@@ -1,3 +0,0 @@
-function main(a: i32, b: i32, c: i32) -> bool {
-    return a ** b == c;
-}

disabled_tests/compiler/integers/i32/sub.leo

@@ -1,17 +0,0 @@
-/*
-namespace: Compile
-expectation: Pass
-inputs:
- - i32.in: |
-    [main]
-    a: i32 = 100;
-    b: i32 = 50;
-    c: i32 = 50;
-    
-    [registers]
-    r0: bool = false;
-*/
-
-function main(a: i32, b: i32, c: i32) -> bool {
-    return a - b == c;
-}

disabled_tests/compiler/integers/i32/ternary.leo

@@ -1,29 +0,0 @@
-/*
-namespace: Compile
-expectation: Pass
-inputs:
- - i32.in: |
-    [main]
-    s: bool = true;
-    a: i32 = 10;
-    b: i32 = 5;
-    c: i32 = 10;
-
-    [registers]
-    r0: bool = false;
- - i32_rev.in: |
-    [main]
-    s: bool = false;
-    a: i32 = 10;
-    b: i32 = 5;
-    c: i32 = 5;
-
-    [registers]
-    r0: bool = false;
-*/
-
-function main(s: bool, a: i32, b: i32, c: i32) -> bool {
-    let r = s ? a : b;
-
-    return r == c;
-}

disabled_tests/compiler/integers/i8/negate_min.leo

@@ -1,9 +1,12 @@
 /*
 namespace: Compile
-expectation: Fail
+expectation: Pass
+input_file: ../input/dummy.in
 */
 
-function main() {
+function main(y: bool) -> bool {
-    const a = -128i8;
+    const a: = -128i8;
-    const b = -a;
+    const b: = -a;
+
+    return (b == -a) == y;
 }

disabled_tests/compiler/mutability/let_mut_nested.leo

@@ -1,12 +0,0 @@
-/*
-namespace: Compile
-expectation: Pass
-input_file: input/dummy.in
-*/
-
-function main(a: bool) -> bool {
-    let x = 2u8;
-    let y = x;
-    let z = y / 2u8;
-    return (z == 1) == a;
-}

disabled_tests/compiler/statements/all_loops.leo

@@ -1,29 +0,0 @@
-/*
-namespace: Compile
-expectation: Pass
-input_file: inputs/dummy.in
-*/
-
-function main(k: bool) -> bool {
-    let reverse: u32 = 0;
-    for i in 9..0 {
-        reverse += i;
-    }
-
-    let forward: u32 = 0;
-    for x in 0..10 {
-        forward += x;
-    }
-
-    let reverse_inclusive: u32 = 0;
-    for a in 10..=0 {
-        reverse_inclusive += a;
-    }
-
-    let forward_inclusive: u32 = 0;
-    for b in 0..=10 {
-        forward_inclusive += b;
-    }
-
-    return (reverse == forward) && (reverse_inclusive == forward_inclusive) && k;
-}

disabled_tests/compiler/statements/iteration_variable.leo

@@ -1,16 +0,0 @@
-/*
-namespace: Compile
-expectation: Pass
-input_file: inputs/u32_3.in
-*/
-
-function main(x: u32) -> bool {
-    const COUNT: u32 = 2;
-    let y = x;
-    
-    for i in 0..COUNT {
-        y -= 1;
-    }
-
-    return y == 1;
-}

tests/compiler/_group/add.leo

@@ -1,3 +0,0 @@
-function main(a: group, b: group, c: group) {
-    console.assert(a + b == c);
-}

tests/compiler/_group/assert_eq.leo

@@ -1,3 +0,0 @@
-function main(a: group, b: group) {
-    console.assert(a == b);
-}

tests/compiler/_group/both_sign_high.leo

@@ -1,3 +0,0 @@
-function main() {
-    const element = (+, +)group;
-}

tests/compiler/_group/both_sign_inferred.leo

@@ -1,3 +0,0 @@
-function main() {
-    const element = (_, _)group;
-}

tests/compiler/_group/both_sign_low.leo

@@ -1,3 +0,0 @@
-function main() {
-    const element = (-, -)group;
-}

tests/compiler/_group/eq.leo

@@ -1,3 +0,0 @@
-function main(a: group, b: group, c: bool) {
-    console.assert((a == b) == c);
-}

tests/compiler/_group/input.leo

@@ -1,3 +0,0 @@
-function main(a: group, b: group) {
-    console.assert(a == b);
-}

tests/compiler/_group/input/valid.in

@@ -1,3 +0,0 @@
-[main]
-a: group = (0, -)group;
-b: group = (0, _)group;

tests/compiler/_group/negate.leo

@@ -1,3 +0,0 @@
-function main(a: group, b: group) {
-    console.assert(-a == b);
-}

tests/compiler/_group/no_space_between_literal.leo

@@ -1,3 +0,0 @@
-function main() {
-  const g = (0,1) group;
-}

tests/compiler/_group/one.leo

@@ -1,3 +0,0 @@
-function main() {
-    const element = 1group;
-}

tests/compiler/_group/point.leo

@@ -1,3 +0,0 @@
-function main() {
-    const point = (7374112779530666882856915975292384652154477718021969292781165691637980424078, 3435195339177955418892975564890903138308061187980579490487898366607011481796)group;
-}

tests/compiler/_group/point_input.leo

@@ -1,3 +0,0 @@
-function main(a: group) {
-    const b = a;
-}

tests/compiler/_group/positive_and_negative.leo

@@ -1,10 +0,0 @@
-function main() {
-    const pos_element = 1group;
-    const neg_element = -1group;
-
-    const pair_x_pos = (1, _)group;
-    const pair_x_neg = (-1, _)group;
-
-    const pair_y_pos = (_, 1)group;
-    const pair_y_neg = (_, -1)group;
-}

tests/compiler/_group/sub.leo

@@ -1,3 +0,0 @@
-function main(a: group, b: group, c: group) {
-    console.assert(a - b == c);
-}

tests/compiler/_group/ternary.leo

@@ -1,5 +0,0 @@
-function main(s: bool, a: group, b: group, c: group) {
-    const r = s ? a : b;
-
-    console.assert(r == c);
-}

tests/compiler/_group/x_sign_high.leo

@@ -1,3 +0,0 @@
-function main() {
-    const element = (0, +)group;
-}

tests/compiler/_group/x_sign_inferred.leo

@@ -1,3 +0,0 @@
-function main() {
-    const element = (0, _)group;
-}

tests/compiler/_group/x_sign_low.leo

@@ -1,3 +0,0 @@
-function main() {
-    const element = (0, -)group;
-}

tests/compiler/_group/y_sign_high.leo

@@ -1,3 +0,0 @@
-function main() {
-    const element = (+, 1)group;
-}

tests/compiler/_group/y_sign_inferred.leo

@@ -1,3 +0,0 @@
-function main() {
-    const element = (_, 1)group;
-}

tests/compiler/_group/y_sign_low.leo

@@ -1,3 +0,0 @@
-function main() {
-    const element = (-, 1)group;
-}

tests/compiler/_group/zero.leo

@@ -1,3 +0,0 @@
-function main() {
-    const element = 0group;
-}

tests/compiler/boolean/and.leo

@@ -2,10 +2,10 @@
 namespace: Compile
 expectation: Pass
 input_file:
- - input/false_false.in
+ - inputs/false_false.in
- - input/false_true.in
+ - inputs/false_true.in
- - input/true_false.in
+ - inputs/true_false.in
- - input/true_true.in
+ - inputs/true_true.in
 */
 
 function main(a: bool, b: bool) -> bool {

tests/compiler/boolean/conditional.leo

@@ -2,10 +2,10 @@
 namespace: Compile
 expectation: Pass
 input_file:
- - input/false_false.in
+ - inputs/false_false.in
- - input/false_true.in
+ - inputs/false_true.in
- - input/true_false.in
+ - inputs/true_false.in
- - input/true_true.in
+ - inputs/true_true.in
 */
 
 function main(a: bool, b: bool) -> bool {

tests/compiler/boolean/equal.leo

@@ -2,10 +2,10 @@
 namespace: Compile
 expectation: Pass
 input_file:
- - input/false_false.in
+ - inputs/false_false.in
- - input/false_true.in
+ - inputs/false_true.in
- - input/true_false.in
+ - inputs/true_false.in
- - input/true_true.in
+ - inputs/true_true.in
 */
 
 function main(a: bool, b: bool) -> bool {

tests/compiler/boolean/not_equal.leo

@@ -2,10 +2,10 @@
 namespace: Compile
 expectation: Pass
 input_file:
- - input/false_false.in
+ - inputs/false_false.in
- - input/false_true.in
+ - inputs/false_true.in
- - input/true_false.in
+ - inputs/true_false.in
- - input/true_true.in
+ - inputs/true_true.in
 */
 
 function main(a: bool, b: bool) -> bool {

tests/compiler/boolean/or.leo

@@ -2,10 +2,10 @@
 namespace: Compile
 expectation: Pass
 input_file:
- - input/false_false.in
+ - inputs/false_false.in
- - input/false_true.in
+ - inputs/false_true.in
- - input/true_false.in
+ - inputs/true_false.in
- - input/true_true.in
+ - inputs/true_true.in
 */
 
 function main(a: bool, b: bool) -> bool {

tests/compiler/console/assert.leo

@@ -1,13 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
+input_file: inputs/true.in
- - assert.in: |
-    [main]
-    a: bool = true;
-
-    [registers]
-    r0: bool = false;
 */
 
 function main(a: bool) -> bool {

tests/compiler/console/conditional_assert.leo

@@ -1,19 +1,17 @@
 /*
 namespace: Compile
 expectation: Pass
-inputs:
+input_file:
- - cond.in: |
+    - inputs/true.in
-    [main]
+    - inputs/false.in
-    a: bool = true;
- - cond_2.in: |
-    [main]
-    a: bool = false;
 */
 
-function main(a: bool) {
+function main(a: bool) -> bool {
     if a {
         console.assert(a == true);
     } else {
         console.assert(a == false);
     }
+
+    return a;
 }

tests/compiler/console/error.leo

@@ -1,7 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-input_file: input/dummy.in
+input_file: inputs/dummy.in
 */
 
 function main(y: bool) -> bool {

tests/compiler/console/inputs/false.in

@@ -0,0 +1,5 @@
+[main]
+a: bool = false;
+
+[registers]
+r0: bool = false;

tests/compiler/console/inputs/input_equal.in

@@ -1,6 +1,6 @@
 [main]
-a: u32 = 1;
+a: u32 = 1u32;
-b: u32 = 1;
+b: u32 = 1u32;
 
 [registers]
 r0: bool = true;

tests/compiler/console/inputs/input_unequal.in

@@ -1,6 +1,6 @@
 [main]
-a: u32 = 1;
+a: u32 = 1u32;
-b: u32 = 0;
+b: u32 = 0u32;
 
 [registers]
 r0: bool = true;

tests/compiler/console/inputs/true.in

@@ -0,0 +1,5 @@
+[main]
+a: bool = true;
+
+[registers]
+r0: bool = false;

tests/compiler/console/log.leo

@@ -1,7 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-input_file: input/dummy.in
+input_file: inputs/dummy.in
 */
 
 function main(y: bool) -> bool {

tests/compiler/console/log_conditional.leo

@@ -2,8 +2,8 @@
 namespace: Compile
 expectation: Pass
 input_file: 
- - input/input_unequal.in
+ - inputs/input_unequal.in
- - input/input_equal.in
+ - inputs/input_equal.in
 */
 
 // Conditionally add two u32 integers and log the result to the console.

tests/compiler/console/log_input.leo

@@ -1,7 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-input_file: input/dummy.in
+input_file: inputs/dummy.in
 */
 
 function main(y: bool) -> bool {

tests/compiler/console/log_parameter.leo

@@ -1,7 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-input_file: input/dummy.in
+input_file: inputs/dummy.in
 */
 
 function main(y: bool) -> bool {

tests/compiler/console/log_parameter_many.leo

@@ -1,7 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-input_file: input/dummy.in
+input_file: inputs/dummy.in
 */
 
 function main(y: bool) -> bool {

tests/compiler/definition/out_of_order.leo

@@ -1,7 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-input_file: input/dummy.in
+input_file: inputs/dummy.in
 */
 
 // @test

tests/compiler/field/output/register_one.out

@@ -1,2 +0,0 @@
-[registers]
-r: field = 1;

tests/compiler/field/output/register_zero.out

@@ -1,2 +0,0 @@
-[registers]
-r: field = 0;

tests/compiler/function/conditional_return.leo

@@ -1,7 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-input_file: input/integers.in
+input_file: inputs/integers.in
 */
 
 function main(a: u32) -> u32 {

tests/compiler/function/duplicate_definition_fail.leo

@@ -1,7 +1,7 @@
 /*
 namespace: Compile
 expectation: Fail
-input_file: input/dummy.in
+input_file: inputs/dummy.in
 */
 
 function main(y: bool) -> bool {

tests/compiler/function/duplicate_parameter_fail.leo

@@ -1,7 +1,7 @@
 /*
 namespace: Compile
 expectation: Fail
-input_file: input/dummy.in
+input_file: inputs/dummy.in
 */
 
 function main(a: u32, a: u32) -> u32 {

tests/compiler/function/iteration.leo

@@ -1,7 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-input_file: input/dummy.in
+input_file: inputs/dummy.in
 */
 
 function one() -> u32 {

tests/compiler/function/iteration_repeated.leo

@@ -1,7 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-input_file: input/dummy.in
+input_file: inputs/dummy.in
 */
 
 function iteration() -> u32 {

tests/compiler/function/repeated.leo

@@ -1,7 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-input_file: input/dummy.in
+input_file: inputs/dummy.in
 */
 
 function one() -> bool {

tests/compiler/function/return.leo

@@ -1,7 +1,7 @@
 /*
 namespace: Compile
 expectation: Pass
-input_file: input/dummy.in
+input_file: inputs/dummy.in
 */
 
 function one() -> u32 {

tests/compiler/function/scope_fail.leo

@@ -8,9 +8,9 @@ function foo() -> field {
     return myGlobal;
 }
 
-function main() {
+function main() -> field {
     const myGlobal = 42field;
     const err = foo();
 
-    // TODO: update after field comparison is enabled
+    return err;
 }

tests/compiler/function/shadow_function_with_input_fail.leo

@@ -0,0 +1,16 @@
+/*
+namespace: Compile
+expectation: Fail
+*/
+
+function hi() -> u8 {
+    return 0u8;
+}
+
+function tester(hi: u8) -> u8 {
+    return 0u8;
+}
+
+function main (y: bool) -> bool {
+    return y;
+}