Add lexicals for "for (... : ...)" construction

Skydev0h · May 6, 2021 · 3ff8092 · 3ff8092
1 parent 9f5c379
commit 3ff8092
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.3.2-TL-0.5
+version=2.3.2-TL-0.7
 group=me.serce
 kotlin_version=1.3.72
 sentry_version=1.6.4
diff --git a/src/main/grammars/Solidity.g4 b/src/main/grammars/Solidity.g4
@@ -167,7 +167,7 @@ whileStatement
   : 'while' '(' expression ')' statement ;
 
 forStatement
-  : 'for' '(' ( simpleStatement | ';' ) ( expressionStatement | ';' ) expression? ')' statement ;
+  : 'for' '(' ( simpleStatement | ';' ) ( expressionStatement | ';' | ':' ) expression? ')' statement ;
 
 simpleStatement
   : ( variableDeclarationStatement | expressionStatement ) ;

diff --git a/src/main/grammars/grammar.txt b/src/main/grammars/grammar.txt
@@ -71,7 +71,7 @@ IfStatement = 'if' '(' Expression ')' Statement ( 'else' Statement )?
 WhileStatement = 'while' '(' Expression ')' Statement
 PlaceholderStatement = '_'
 SimpleStatement = VariableDefinition | ExpressionStatement
-ForStatement = 'for' '(' (SimpleStatement)? ';' (Expression)? ';' (ExpressionStatement)? ')' Statement
+ForStatement = 'for' '(' ((SimpleStatement)? ';' (Expression)? ';' (ExpressionStatement)? | SimpleStatement ':' Identifier) ')' Statement
 RepeatStatement = 'repeat' '(' (SimpleStatement)? ';' (Expression)? ';' (ExpressionStatement)? ')' Statement
 InlineAssemblyStatement = 'assembly' StringLiteral? InlineAssemblyBlock
 DoWhileStatement = 'do' Statement 'while' '(' Expression ')'

diff --git a/src/main/grammars/solidity.bnf b/src/main/grammars/solidity.bnf
@@ -359,7 +359,7 @@ CatchClause ::= catch ( Identifier? ParameterList )? Block {pin = 1}
 WhileStatement ::= while '(' Expression ')' Statement {pin = 1}
 PlaceholderStatement ::= '_'
 private SimpleStatement ::= VariableDefinition | ExpressionStatement
-ForStatement ::= for '(' (SimpleStatement)? ';' (Expression)? ';' (ExpressionStatement)? ')' Statement {pin=1}
+ForStatement ::= for '(' ((SimpleStatement)? ';' (Expression)? ';' (ExpressionStatement)? | SimpleStatement ':' Identifier) ')' Statement {pin=1}
 RepeatStatement ::= repeat '(' (SimpleStatement)? ';' (Expression)? ';' (ExpressionStatement)? ')' Statement {pin=1}
 InlineAssemblyStatement ::= assembly AssemblyBlock {pin=1}
 DoWhileStatement ::= do Statement while '(' Expression ')' {pin=1}