Merge pull request #2 from distributed-lab/fix/identifier-assign

Fix bug with constraint assignment to parenthesis identifiers
distributed-lab · Sep 8, 2024 · 01da6d3 · 01da6d3
2 parents 4724b90 + a12dc21
commit 01da6d3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/data/Example1.circom b/data/Example1.circom
@@ -57,6 +57,9 @@ template nbits(a) {
     i = out;
    }
    outA <== i;
+
+   component commitmentHash = Poseidon(2);
+   (commitmentHash.inputs[0], commitmentHash.inputs[1]) <== (nullifier, secret);
 }
 
 component main {public [in1]}= A();

diff --git a/grammar/Circom.g4 b/grammar/Circom.g4
@@ -68,8 +68,10 @@ templateStmt
     | blockInstantiation ';'
     | (identifier ('.' ID)?) ASSIGNMENT expression ';'
     | expression CONSTRAINT_EQ expression ';'
-    | (primary | (identifier '.' identifier)) (LEFT_ASSIGNMENT | ASSIGNMENT_OP) expression ';'
-    | expression RIGHT_ASSIGNMENT (identifier ('.' identifier)?) ';'
+    | element (LEFT_ASSIGNMENT | ASSIGNMENT_OP) expression ';'
+    | '(' element (',' element)* ')' LEFT_ASSIGNMENT expression ';'
+    | expression RIGHT_ASSIGNMENT element ';'
+    | expression RIGHT_ASSIGNMENT '(' element (',' element)* ')' ';'
     | '_' (ASSIGNMENT | LEFT_ASSIGNMENT) (expression | blockInstantiation) ';'
     | (expression | blockInstantiation) RIGHT_ASSIGNMENT '_' ';'
     | '(' argsWithUnderscore ')' (ASSIGNMENT | LEFT_ASSIGNMENT) (blockInstantiation | expression) ';'
@@ -81,6 +83,8 @@ templateStmt
     | logStmt ';'
     ;
 
+element: (identifier ('.' identifier)?) ;
+
 forControl: forInit ';' expression ';' forUpdate ;
 
 forInit: 'var'? identifier (ASSIGNMENT rhsValue)? ;