Fixed grammar (hanging comma)

distributed-lab · Aug 3, 2024 · b077169 · b077169
1 parent 3fde741
commit b077169
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/grammar/Circom.g4 b/grammar/Circom.g4
@@ -43,7 +43,7 @@ templateDeclaration
     ;
 
 componentMainDeclaration
-    : 'component' 'main' ('{' 'public' '[' args ']'  '}')? '=' ID '(' (expression ','?)* ')' ';'
+    : 'component' 'main' ('{' 'public' '[' args ']'  '}')? '=' ID '(' expressionList? ')' ';'
     ;
 
 statement
@@ -80,7 +80,7 @@ expression
     | blockInstantiation
     | expression '.' ID ('[' expression ']')?
     | expression '?' expression ':' expression
-    | ('~' | '!' | '-') expression
+    | ('~' | '!') expression
     | expression '**' expression
     | expression ('*' | '/' | '\\' | '%') expression
     | expression ('+' | '-') expression
@@ -91,7 +91,7 @@ expression
 
 primary
     : '(' expression ')'
-    | '[' (expression ','?)+ ']'
+    | '[' expressionList ']'
     | NUMBER
     | identifier
     | args
@@ -121,19 +121,21 @@ varDeclaration
 rhsValue: expression | blockInstantiation ;
 
 componentCall
-    : '(' (expression ','?)* ')'
-    | '(' (ID LEFT_ASSIGNMENT expression ','?)* ')'
-    | '(' (expression RIGHT_ASSIGNMENT ID ','?)* ')'
+    : '(' expressionList? ')'
+    | '(' ID LEFT_ASSIGNMENT expression (',' ID LEFT_ASSIGNMENT expression)* ')'
+    | '(' expression RIGHT_ASSIGNMENT ID (',' expression RIGHT_ASSIGNMENT ID)* ')'
     ;
 
-blockInstantiation: ID '(' (expression ','?)* ')' componentCall? ;
+blockInstantiation: ID '(' expressionList? ')' componentCall? ;
 
 arrayDimension: '[' (NUMBER | ID | expression) ']' ;
 
 argsWithUnderscore: ('_' | ID) (',' ('_' | ID) )* ;
 
-args: (ID ','?)+ ;
+args: ID (',' ID)* ;
 
-numSequence: (NUMBER ','?)+ ;
+numSequence: NUMBER (',' NUMBER)* ;
+
+expressionList: expression (',' expression)* ;
 
 identifier: ID arrayDimension* ;