Merge pull request #903 from AleoHQ/bug/abnf-circuit-grammar

Bug/abnf-circuit-grammar
ProvableHQ · May 6, 2021 · 2ddb474 · 2ddb474
2 parents 15deef6 + c063200
commit 2ddb474
Show file tree

Hide file tree

Showing 105 changed files with 508 additions and 398 deletions.
diff --git a/asg/tests/fail/circuits/inline_fail.leo b/asg/tests/fail/circuits/inline_fail.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    x: u32
+    x: u32;
 }
 
 function main() {

diff --git a/asg/tests/fail/circuits/member_variable_fail.leo b/asg/tests/fail/circuits/member_variable_fail.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    x: u32
+    x: u32;
 }
 
 function main() {

diff --git a/asg/tests/fail/circuits/mut_function_fail.leo b/asg/tests/fail/circuits/mut_function_fail.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    a: u8,
+    a: u8;
 
     function bar() {}
 }

diff --git a/asg/tests/fail/circuits/mut_self_function_fail.leo b/asg/tests/fail/circuits/mut_self_function_fail.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    a: u8,
+    a: u8;
 
     function bar() {}
 

diff --git a/asg/tests/fail/circuits/mut_self_static_function_fail.leo b/asg/tests/fail/circuits/mut_self_static_function_fail.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    a: u8,
+    a: u8;
 
     function bar() {}
 

diff --git a/asg/tests/fail/circuits/mut_self_variable_fail.leo b/asg/tests/fail/circuits/mut_self_variable_fail.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    a: u8,
+    a: u8;
 
     function set_a(self, new: u8) {
         self.a = new;

diff --git a/asg/tests/fail/circuits/mut_variable_fail.leo b/asg/tests/fail/circuits/mut_variable_fail.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    a: u8,
+    a: u8;
 }
 
 function main() {

diff --git a/asg/tests/fail/circuits/self_member_invalid.leo b/asg/tests/fail/circuits/self_member_invalid.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    f: u32,
+    f: u32;
 
     function bar() -> u32 {
         return f;

diff --git a/asg/tests/fail/mutability/circuit.leo b/asg/tests/fail/mutability/circuit.leo
@@ -1,6 +1,6 @@
 // Circuits are immutable by default.
 circuit Foo {
-    x: u32
+    x: u32;
 }
 
 function main() {

diff --git a/asg/tests/pass/circuits/define_circuit_inside_circuit_function.leo b/asg/tests/pass/circuits/define_circuit_inside_circuit_function.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    a: u32,
+    a: u32;
 }
 
 circuit Bar {

diff --git a/asg/tests/pass/circuits/inline.leo b/asg/tests/pass/circuits/inline.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    x: u32
+    x: u32;
 }
 
 function main() {

diff --git a/asg/tests/pass/circuits/member_function_nested.leo b/asg/tests/pass/circuits/member_function_nested.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    x: u32,
+    x: u32;
 
     function add_x(self, y: u32) -> u32 {
         return self.x + y;

diff --git a/asg/tests/pass/circuits/member_variable.leo b/asg/tests/pass/circuits/member_variable.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    x: u32,
+    x: u32;
 }
 
 function main() {

diff --git a/asg/tests/pass/circuits/member_variable_and_function.leo b/asg/tests/pass/circuits/member_variable_and_function.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    foo: u32,
+    foo: u32;
 
     function bar() -> u32 {
         return 1u32;

diff --git a/asg/tests/pass/circuits/mut_self_variable.leo b/asg/tests/pass/circuits/mut_self_variable.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    a: u8,
+    a: u8;
 
     function set_a(mut self, new: u8) {
         self.a = new;

diff --git a/asg/tests/pass/circuits/mut_self_variable_conditional.leo b/asg/tests/pass/circuits/mut_self_variable_conditional.leo
@@ -5,7 +5,7 @@ function main() {
 }
 
 circuit Foo {
-    a: u32
+    a: u32;
 
     function bar(mut self) {
         if true {

diff --git a/asg/tests/pass/circuits/mut_variable.leo b/asg/tests/pass/circuits/mut_variable.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    a: u8,
+    a: u8;
 }
 
 function main() {

diff --git a/asg/tests/pass/circuits/pedersen_mock.leo b/asg/tests/pass/circuits/pedersen_mock.leo
@@ -1,5 +1,5 @@
 circuit PedersenHash {
-    parameters: [u32; 512]
+    parameters: [u32; 512];
 
     function new(const parameters: [u32; 512]) -> Self {
         return Self { parameters: parameters };

diff --git a/asg/tests/pass/circuits/self_member.leo b/asg/tests/pass/circuits/self_member.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    f: u32,
+    f: u32;
 
     function bar(self) -> u32 {
         return self.f;

diff --git a/asg/tests/pass/form_ast.rs b/asg/tests/pass/form_ast.rs
@@ -58,8 +58,8 @@ fn test_imports() {
     let mut imports = crate::mocked_resolver(&context);
     let test_import = r#"
     circuit Point {
-      x: u32
-      y: u32
+      x: u32;
+      y: u32;
     }
     
     function foo() -> u32 {

diff --git a/asg/tests/pass/import/imports/bar/src/bat/bat.leo b/asg/tests/pass/import/imports/bar/src/bat/bat.leo
@@ -1,3 +1,3 @@
 circuit Bat {
-    t: u32
+    t: u32;
 }
diff --git a/asg/tests/pass/import/imports/bar/src/baz.leo b/asg/tests/pass/import/imports/bar/src/baz.leo
@@ -1,7 +1,7 @@
 circuit Baz {
-    z: u32
+    z: u32;
 }
 
 circuit Bazzar {
-    a: u32
+    a: u32;
 }
diff --git a/asg/tests/pass/import/imports/bar/src/lib.leo b/asg/tests/pass/import/imports/bar/src/lib.leo
@@ -1,3 +1,3 @@
 circuit Bar {
-    r: u32
+    r: u32;
 }
diff --git a/asg/tests/pass/import/imports/car/src/lib.leo b/asg/tests/pass/import/imports/car/src/lib.leo
@@ -1,3 +1,3 @@
 circuit Car {
-    c: u32
+    c: u32;
 }
diff --git a/asg/tests/pass/import/src/test-import.leo b/asg/tests/pass/import/src/test-import.leo
@@ -1,6 +1,6 @@
 circuit Point {
-  x: u32
-  y: u32
+  x: u32;
+  y: u32;
 }
 
 function foo() -> u32 {

diff --git a/asg/tests/pass/mutability/circuit_mut.leo b/asg/tests/pass/mutability/circuit_mut.leo
@@ -1,6 +1,6 @@
 // Adding the `mut` keyword makes a circuit variable mutable.
 circuit Foo {
-    x: u32
+    x: u32;
 }
 
 function main() {

diff --git a/asg/tests/pass/mutability/circuit_variable_mut.leo b/asg/tests/pass/mutability/circuit_variable_mut.leo
@@ -1,6 +1,6 @@
 // Adding the `mut` keyword makes a circuit variable mutable.
 circuit Foo {
-    x: u32
+    x: u32;
 }
 
 function main() {

diff --git a/compiler/tests/canonicalization/big_self_in_circuit_replacement.leo b/compiler/tests/canonicalization/big_self_in_circuit_replacement.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-  x: u32
+  x: u32;
 
   function new() -> Self {
     let new: Self = Self {

diff --git a/compiler/tests/canonicalization/big_self_outside_circuit_fail.leo b/compiler/tests/canonicalization/big_self_outside_circuit_fail.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-  x: u32
+  x: u32;
 
   function new() -> Self {
     let new: Self = Self {

diff --git a/compiler/tests/canonicalization/compound_assignment.leo b/compiler/tests/canonicalization/compound_assignment.leo
@@ -1,6 +1,6 @@
 circuit Foo {
-  f: u8,
-  y: (u8, u8),
+  f: u8;
+  y: (u8, u8);
 
   function z (mut self) -> u16 {
     self.y.0 += 1u8;

diff --git a/compiler/tests/circuits/const_self_variable.leo b/compiler/tests/circuits/const_self_variable.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    a: u8,
+    a: u8;
 
     function use_a(const self) -> u8 {
         return self.a + 1;

diff --git a/compiler/tests/circuits/const_self_variable_fail.leo b/compiler/tests/circuits/const_self_variable_fail.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    a: u8,
+    a: u8;
 
     function set_a(const self, new: u8) {
         self.a = new;

diff --git a/compiler/tests/circuits/define_circuit_inside_circuit_function.leo b/compiler/tests/circuits/define_circuit_inside_circuit_function.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    a: u32,
+    a: u32;
 }
 
 circuit Bar {

diff --git a/compiler/tests/circuits/duplicate_name_context.leo b/compiler/tests/circuits/duplicate_name_context.leo
@@ -1,5 +1,5 @@
 circuit Bar {
-    b2: u32
+    b2: u32;
 
     function add_five(z:u32) -> u32 {
         return z+5u32;

diff --git a/compiler/tests/circuits/inline.leo b/compiler/tests/circuits/inline.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    x: u32
+    x: u32;
 }
 
 function main() {

diff --git a/compiler/tests/circuits/inline_fail.leo b/compiler/tests/circuits/inline_fail.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    x: u32
+    x: u32;
 }
 
 function main() {

diff --git a/compiler/tests/circuits/inline_member_fail.leo b/compiler/tests/circuits/inline_member_fail.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    x: u8
+    x: u8;
 }
 
 function main() {

diff --git a/compiler/tests/circuits/inline_member_pass.leo b/compiler/tests/circuits/inline_member_pass.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    x: u8
+    x: u8;
 
     function new(x: u8) -> Self {
         return Self { x };

diff --git a/compiler/tests/circuits/member_function.leo b/compiler/tests/circuits/member_function.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    x: u32,
+    x: u32;
 
     function echo(self) -> u32 {
         return self.x;

diff --git a/compiler/tests/circuits/member_function_nested.leo b/compiler/tests/circuits/member_function_nested.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    x: u32,
+    x: u32;
 
     function add_x(self, y: u32) -> u32 {
         return self.x + y;

diff --git a/compiler/tests/circuits/member_variable.leo b/compiler/tests/circuits/member_variable.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    x: u32,
+    x: u32;
 }
 
 function main() {

diff --git a/compiler/tests/circuits/member_variable_and_function.leo b/compiler/tests/circuits/member_variable_and_function.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    foo: u32,
+    foo: u32;
 
     function bar() -> u32 {
         return 1u32;

diff --git a/compiler/tests/circuits/member_variable_fail.leo b/compiler/tests/circuits/member_variable_fail.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    x: u32
+    x: u32;
 }
 
 function main() {

diff --git a/compiler/tests/circuits/mut_function_fail.leo b/compiler/tests/circuits/mut_function_fail.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    a: u8,
+    a: u8;
 
     function bar() {}
 }

diff --git a/compiler/tests/circuits/mut_self_function_fail.leo b/compiler/tests/circuits/mut_self_function_fail.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    a: u8,
+    a: u8;
 
     function bar() {}
 

diff --git a/compiler/tests/circuits/mut_self_static_function_fail.leo b/compiler/tests/circuits/mut_self_static_function_fail.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    a: u8,
+    a: u8;
 
     function bar() {}
 

diff --git a/compiler/tests/circuits/mut_self_variable.leo b/compiler/tests/circuits/mut_self_variable.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    a: u8,
+    a: u8;
 
     function set_a(mut self, new: u8) {
         self.a = new;

diff --git a/compiler/tests/circuits/mut_self_variable_branch.leo b/compiler/tests/circuits/mut_self_variable_branch.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    a: u8,
+    a: u8;
 
     function set_a(mut self, condition: bool, new: u8) {
         if condition {

diff --git a/compiler/tests/circuits/mut_self_variable_conditional.leo b/compiler/tests/circuits/mut_self_variable_conditional.leo
@@ -5,7 +5,7 @@ function main() {
 }
 
 circuit Foo {
-    a: u32
+    a: u32;
 
     function bar(mut self) {
         if true {

diff --git a/compiler/tests/circuits/mut_self_variable_fail.leo b/compiler/tests/circuits/mut_self_variable_fail.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    a: u8,
+    a: u8;
 
     function set_a(self, new: u8) {
         self.a = new;

diff --git a/compiler/tests/circuits/mut_variable.leo b/compiler/tests/circuits/mut_variable.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    a: u8,
+    a: u8;
 }
 
 function main() {

diff --git a/compiler/tests/circuits/mut_variable_fail.leo b/compiler/tests/circuits/mut_variable_fail.leo
@@ -1,5 +1,5 @@
 circuit Foo {
-    a: u8,
+    a: u8;
 }
 
 function main() {

diff --git a/compiler/tests/circuits/mutable_call_immutable_context.leo b/compiler/tests/circuits/mutable_call_immutable_context.leo
@@ -1,5 +1,5 @@
 circuit TestMe {
-    x: u8,
+    x: u8;
 
     function test_me(mut self) -> u8 {
         self.x += 1;

diff --git a/compiler/tests/circuits/pedersen_mock.leo b/compiler/tests/circuits/pedersen_mock.leo
@@ -1,5 +1,5 @@
 circuit PedersenHash {
-    parameters: [u32; 512]
+    parameters: [u32; 512];
 
     function new(const parameters: [u32; 512]) -> Self {
         return Self { parameters: parameters };
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ function main() { @@
     }
     circuit Foo {
-        a: u32
+        a: u32;
         function bar(mut self) {
             if true {
@@ Expand Down @@