Refactoring. V2.2.0 Circom Support

.gitmodules

@@ -7,3 +7,9 @@
 [submodule "passport-zk-circuits"]
 	path = passport-zk-circuits
 	url = [email protected]:rarimo/passport-zk-circuits.git
+[submodule "ed25519-circom"]
+	path = ed25519-circom
+	url = [email protected]:Electron-Labs/ed25519-circom.git
+[submodule "maci"]
+	path = maci
+	url = [email protected]:privacy-scaling-explorations/maci.git

base_test.go

@@ -9,7 +9,14 @@ import (
 
 // TestParseAllCircuits recursively parses all circuit files in the directory
 func TestParseAllCircuits(t *testing.T) {
-	baseDirs := []string{"iden3-circuits/circuits", "circomlib/circuits", "data", "passport-zk-circuits/circuits"}
+	baseDirs := []string{
+		"iden3-circuits/circuits",
+		"circomlib/circuits",
+		"data",
+		"passport-zk-circuits/circuits",
+		"ed25519-circom/circuits",
+		"maci/packages/circuits/circom",
+	}
 
 	for _, baseDir := range baseDirs {
 		err := filepath.Walk(baseDir, func(path string, info os.FileInfo, err error) error {

data/Example1.circom

@@ -20,7 +20,16 @@ function nbits(a) {
 
 template A(a, b, c) {}
 
+function TestFunc() {
+    return [[1, 2, 3]];
+}
+
 template nbits(a) {
+    var i = 0;
+    for (kek.out[0] <-- 9; kek.out[0] < 10; i++) {}
+    for (9 --> kek.out[1]; kek.out[0] < 10; i++) {}
+    for (var some[1] = [0]; kek.out[0] < 10; i++) {}
+
     var o_u_t;
     var o$o;
     var x[3] = [2,8,4];

grammar/CircomLexer.g4

@@ -1,7 +1,7 @@
 lexer grammar CircomLexer;
 
 /*//////////////////////////////////////////////////////////////
-                       COMMON STRUCTURES
+                COMMON STRUCTURES AND TERMINALS
 //////////////////////////////////////////////////////////////*/
 
 VERSION: NUMBER '.' NUMBER '.' NUMBER ;
@@ -22,6 +22,7 @@ INCLUDE: 'include' ;
 CUSTOM: 'custom' ;
 PARALLEL: 'parallel' ;
 
+BUS: 'bus' ;
 TEMPLATE: 'template' ;
 FUNCTION: 'function' ;
 
@@ -75,8 +76,12 @@ TERNARY_CONDITION: '?' ;
 TERNARY_ALTERNATIVE: ':' ;
 
 EQ_CONSTRAINT: '===' ;
-LEFT_CONSTRAINT: '<--' | '<==' ;
-RIGHT_CONSTRAINT: '-->' | '==>' ;
+
+LEFT_CONSTRAINT: '<==' ;
+LEFT_ASSIGNMENT: '<--' ;
+
+RIGHT_CONSTRAINT: '==>' ;
+RIGHT_ASSIGNMENT: '-->' ;
 
 // Unary operators
 SELF_OP: '++' | '--' ;
@@ -118,17 +123,17 @@ OR: '||' ;
 ASSIGNMENT: '=' ;
 ASSIGNMENT_WITH_OP: '+=' | '-=' | '*=' | '**=' | '/=' | '\\=' | '%=' | '<<=' | '>>=' | '&=' | '^=' | '|=' ;
 
-ID          :   ID_SYMBOL* LETTER (LETTER|DIGIT|ID_SYMBOL)*;
+ID          :   ID_SYMBOL* LETTER (LETTER|ID_SYMBOL|DIGIT)* ; // r"[$_]*[a-zA-Z][a-zA-Z$_0-9]*"
 fragment
-LETTER      :   [a-zA-Z\u0080-\u00FF] ;
+LETTER      :   [a-zA-Z] ;
 fragment
 ID_SYMBOL   :   [_$] ;
 
 NUMBER: DIGIT+ | HEX;
 fragment
 DIGIT: [0-9] ;
 
-HEX :   '0' 'x' HEXDIGIT+ ;
+HEX :   '0' 'x' HEXDIGIT+ ; // 0x[0-9A-Fa-f]*
 fragment
 HEXDIGIT : ('0'..'9'|'a'..'f'|'A'..'F') ;