[orx-kotlin-parser] Update kotlin antlr grammars

openrndr · Dec 18, 2021 · bc18782 · bc18782
1 parent e5312e6
commit bc18782
Show file tree

Hide file tree

Showing 4 changed files with 172 additions and 172 deletions.
diff --git a/orx-jvm/orx-kotlin-parser/src/main/antlr/KotlinLexer.g4 b/orx-jvm/orx-kotlin-parser/src/main/antlr/KotlinLexer.g4
@@ -2,12 +2,8 @@
  * Kotlin lexical grammar in ANTLR4 notation
  */
 
-
-
 lexer grammar KotlinLexer;
 
-
-
 import UnicodeClasses;
 
 // SECTION: lexicalGeneral
@@ -160,6 +156,7 @@ SEALED: 'sealed';
 ANNOTATION: 'annotation';
 DATA: 'data';
 INNER: 'inner';
+VALUE: 'value';
 TAILREC: 'tailrec';
 OPERATOR: 'operator';
 INLINE: 'inline';
@@ -229,11 +226,11 @@ BinLiteral
     ;
 
 UnsignedLiteral
-    : (IntegerLiteral | HexLiteral | BinLiteral) [uU] 'L'?
+    : (IntegerLiteral | HexLiteral | BinLiteral) [uU] [lL]?
     ;
 
 LongLiteral
-    : (IntegerLiteral | HexLiteral | BinLiteral) 'L'
+    : (IntegerLiteral | HexLiteral | BinLiteral) [lL]
     ;
 
 BooleanLiteral: 'true'| 'false';
@@ -300,6 +297,7 @@ IdentifierOrSoftKey
     | FILE
     | EXPECT
     | ACTUAL
+    | VALUE
     /* Strong keywords */
     | CONST
     | SUSPEND
@@ -488,6 +486,7 @@ Inside_SEALED: SEALED -> type(SEALED);
 Inside_ANNOTATION: ANNOTATION -> type(ANNOTATION);
 Inside_DATA: DATA -> type(DATA);
 Inside_INNER: INNER -> type(INNER);
+Inside_VALUE: VALUE -> type(VALUE);
 Inside_TAILREC: TAILREC -> type(TAILREC);
 Inside_OPERATOR: OPERATOR -> type(OPERATOR);
 Inside_INLINE: INLINE -> type(INLINE);

diff --git a/orx-jvm/orx-kotlin-parser/src/main/antlr/KotlinLexer.tokens b/orx-jvm/orx-kotlin-parser/src/main/antlr/KotlinLexer.tokens
@@ -113,61 +113,62 @@ SEALED=112
 ANNOTATION=113
 DATA=114
 INNER=115
-TAILREC=116
-OPERATOR=117
-INLINE=118
-INFIX=119
-EXTERNAL=120
-SUSPEND=121
-OVERRIDE=122
-ABSTRACT=123
-FINAL=124
-OPEN=125
-CONST=126
-LATEINIT=127
-VARARG=128
-NOINLINE=129
-CROSSINLINE=130
-REIFIED=131
-EXPECT=132
-ACTUAL=133
-RealLiteral=134
-FloatLiteral=135
-DoubleLiteral=136
-IntegerLiteral=137
-HexLiteral=138
-BinLiteral=139
-UnsignedLiteral=140
-LongLiteral=141
-BooleanLiteral=142
-NullLiteral=143
-CharacterLiteral=144
-Identifier=145
-IdentifierOrSoftKey=146
-FieldIdentifier=147
-QUOTE_OPEN=148
-TRIPLE_QUOTE_OPEN=149
-UNICODE_CLASS_LL=150
-UNICODE_CLASS_LM=151
-UNICODE_CLASS_LO=152
-UNICODE_CLASS_LT=153
-UNICODE_CLASS_LU=154
-UNICODE_CLASS_ND=155
-UNICODE_CLASS_NL=156
-QUOTE_CLOSE=157
-LineStrRef=158
-LineStrText=159
-LineStrEscapedChar=160
-LineStrExprStart=161
-TRIPLE_QUOTE_CLOSE=162
-MultiLineStringQuote=163
-MultiLineStrRef=164
-MultiLineStrText=165
-MultiLineStrExprStart=166
-Inside_Comment=167
-Inside_WS=168
-Inside_NL=169
-ErrorCharacter=170
+VALUE=116
+TAILREC=117
+OPERATOR=118
+INLINE=119
+INFIX=120
+EXTERNAL=121
+SUSPEND=122
+OVERRIDE=123
+ABSTRACT=124
+FINAL=125
+OPEN=126
+CONST=127
+LATEINIT=128
+VARARG=129
+NOINLINE=130
+CROSSINLINE=131
+REIFIED=132
+EXPECT=133
+ACTUAL=134
+RealLiteral=135
+FloatLiteral=136
+DoubleLiteral=137
+IntegerLiteral=138
+HexLiteral=139
+BinLiteral=140
+UnsignedLiteral=141
+LongLiteral=142
+BooleanLiteral=143
+NullLiteral=144
+CharacterLiteral=145
+Identifier=146
+IdentifierOrSoftKey=147
+FieldIdentifier=148
+QUOTE_OPEN=149
+TRIPLE_QUOTE_OPEN=150
+UNICODE_CLASS_LL=151
+UNICODE_CLASS_LM=152
+UNICODE_CLASS_LO=153
+UNICODE_CLASS_LT=154
+UNICODE_CLASS_LU=155
+UNICODE_CLASS_ND=156
+UNICODE_CLASS_NL=157
+QUOTE_CLOSE=158
+LineStrRef=159
+LineStrText=160
+LineStrEscapedChar=161
+LineStrExprStart=162
+TRIPLE_QUOTE_CLOSE=163
+MultiLineStringQuote=164
+MultiLineStrRef=165
+MultiLineStrText=166
+MultiLineStrExprStart=167
+Inside_Comment=168
+Inside_WS=169
+Inside_NL=170
+ErrorCharacter=171
 '...'=6
 '.'=7
 ','=8
@@ -266,23 +267,24 @@ ErrorCharacter=170
 'annotation'=113
 'data'=114
 'inner'=115
-'tailrec'=116
-'operator'=117
-'inline'=118
-'infix'=119
-'external'=120
-'suspend'=121
-'override'=122
-'abstract'=123
-'final'=124
-'open'=125
-'const'=126
-'lateinit'=127
-'vararg'=128
-'noinline'=129
-'crossinline'=130
-'reified'=131
-'expect'=132
-'actual'=133
-'null'=143
-'"""'=149
+'value'=116
+'tailrec'=117
+'operator'=118
+'inline'=119
+'infix'=120
+'external'=121
+'suspend'=122
+'override'=123
+'abstract'=124
+'final'=125
+'open'=126
+'const'=127
+'lateinit'=128
+'vararg'=129
+'noinline'=130
+'crossinline'=131
+'reified'=132
+'expect'=133
+'actual'=134
+'null'=144
+'"""'=150