fixed error on analysing rule regarding is and parsing cst

kokoro-aya · Apr 17, 2021 · 7843043 · 7843043
1 parent b8ca8a6
commit 7843043
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,5 @@
 /amatsukaze
 /.gradle/
 /build/
-/src/main/java/*.interp
-/src/main/java/*.tokens
-/src/main/java/*.java
 /src/main/amatsukazeGrammar-other.g4
+/src/main/gen/
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/build.gradle b/build.gradle
@@ -8,13 +8,15 @@ plugins {
 group 'org.ironica'
 version '1.2.0-SNAPSHOT'
 
-sourceCompatibility = 1.8
+sourceCompatibility = 11
 
 final GRAMMAR_DIR = "gen/src/main"
+final LOCAL_GRAMMAR_DIR = "src/main/gen"
 
 sourceSets {
     main {
         java { srcDirs += GRAMMAR_DIR }
+        java { srcDirs += LOCAL_GRAMMAR_DIR }
     }
 }
 
@@ -45,8 +47,8 @@ dependencies {
 }
 
 compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.jvmTarget = "11"
 }
 compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.jvmTarget = "11"
 }
diff --git a/src/main/amatsukazeGrammar.g4 b/src/main/amatsukazeGrammar.g4
@@ -53,7 +53,7 @@ expression: assignment_expression                       # assignmentExpr
           | expression op=(GT | LT | GEQ | LEQ) expression # ariComparativeExpr
           | expression op=(EQ | NEQ) expression         # boolComparativeExpr
           | expression op=(AND | OR) expression         # isNestedCondition
-          | expression '!is' type                       # notIsExpr
+          | expression '!' 'is' type                       # notIsExpr
           | expression 'is' type                        # isExpr
           | switch_expression                           # switchExpr
           | '(' expression ')'                          # parenthesisExpr
@@ -182,11 +182,10 @@ arrowfun_declaration: function_signature ARROW function_body;
 
 parameter_clause: '()' | '(' parameter_list ')';
 parameter_list: parameter (',' parameter)*;
-parameter: CONST? REF? param_name type_annotation;
+parameter: 'cst'? REF? param_name type_annotation;
 param_name: IDENTIFIER;
 
 REF: '&';
-CONST: 'cst';
 
 enum_declaration: 'enum' enum_name '{' enum_members+ '}';
 enum_name: IDENTIFIER;