Merge pull request #120 from bmahe/update_elasticsearch

Update to example repositories and to the grammar to support new cases

Author: aryx

grammar.js

@@ -4,7 +4,6 @@ const PREC = {
   // https://introcs.cs.princeton.edu/java/11precedence/
   COMMENT: 0,      // //  /*  */
   ASSIGN: 1,       // =  += -=  *=  /=  %=  &=  ^=  |=  <<=  >>=  >>>=
-  SWITCH_EXP: 1,   // always prefer to parse switch as expression over statement
   DECL: 2,
   ELEMENT_VAL: 2,
   TERNARY: 3,      // ?:
@@ -66,8 +65,10 @@ module.exports = grammar({
     [$._unannotated_type, $.scoped_type_identifier],
     [$._unannotated_type, $.generic_type],
     [$.generic_type, $.primary_expression],
+    [$.expression, $.statement],
     // Only conflicts in switch expressions
     [$.lambda_expression, $.primary_expression],
+    [$.inferred_parameters, $.primary_expression],
   ],
 
   word: $ => $.identifier,
@@ -174,7 +175,7 @@ module.exports = grammar({
       $.primary_expression,
       $.unary_expression,
       $.cast_expression,
-      prec(PREC.SWITCH_EXP, $.switch_expression),
+      $.switch_expression,
     ),
 
     cast_expression: $ => prec(PREC.CAST, seq(
@@ -233,15 +234,15 @@ module.exports = grammar({
 
     lambda_expression: $ => seq(
       field('parameters', choice(
-        $.identifier, $.formal_parameters, $.inferred_parameters
+        $.identifier, $.formal_parameters, $.inferred_parameters, $._reserved_identifier
       )),
       '->',
       field('body', choice($.expression, $.block))
     ),
 
     inferred_parameters: $ => seq(
       '(',
-      commaSep1($.identifier),
+      commaSep1(choice($.identifier, $._reserved_identifier)),
       ')'
     ),
 
@@ -290,6 +291,7 @@ module.exports = grammar({
 
     array_creation_expression: $ => prec.right(seq(
       'new',
+      repeat($._annotation),
       field('type', $._simple_type),
       choice(
         seq(
@@ -922,6 +924,7 @@ module.exports = grammar({
         $.constant_declaration,
         $.class_declaration,
         $.interface_declaration,
+        $.enum_declaration,
         $.annotation_type_declaration
       )),
       '}'

script/known-failures.txt

@@ -0,0 +1,3 @@
+examples/flink/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/src/main/java/DataStreamJob.java
+examples/flink/flink-walkthroughs/flink-walkthrough-datastream-java/src/main/resources/archetype-resources/src/main/java/FraudDetectionJob.java
+examples/flink/flink-walkthroughs/flink-walkthrough-datastream-java/src/main/resources/archetype-resources/src/main/java/FraudDetector.java

script/parse-examples

@@ -26,8 +26,11 @@ function clone_repo {
 }
 
 clone_repo elastic elasticsearch 4d62640bf116af7e825d89c7319a39c3f2f325b4
-clone_repo google guava e24fddc5fff7fd36d33ea38737b6606a7e476845
-clone_repo ReactiveX RxJava 8a6bf14fc9a61f7c1c0016ca217be02ca86211d2
+clone_repo google guava v31.1
+clone_repo ReactiveX RxJava v3.1.5
+clone_repo apache flink release-1.15.1
+clone_repo apache logging-log4j2 rel/2.17.2
+clone_repo apache cassandra cassandra-4.0.5
 
 known_failures="$(cat script/known-failures.txt)"
 

src/grammar.json

@@ -1194,12 +1194,8 @@
           "name": "cast_expression"
         },
         {
-          "type": "PREC",
-          "value": 1,
-          "content": {
-            "type": "SYMBOL",
-            "name": "switch_expression"
-          }
+          "type": "SYMBOL",
+          "name": "switch_expression"
         }
       ]
     },
@@ -2066,6 +2062,10 @@
               {
                 "type": "SYMBOL",
                 "name": "inferred_parameters"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "_reserved_identifier"
               }
             ]
           }
@@ -2104,8 +2104,17 @@
           "type": "SEQ",
           "members": [
             {
-              "type": "SYMBOL",
-              "name": "identifier"
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "identifier"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "_reserved_identifier"
+                }
+              ]
             },
             {
               "type": "REPEAT",
@@ -2117,8 +2126,17 @@
                     "value": ","
                   },
                   {
-                    "type": "SYMBOL",
-                    "name": "identifier"
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "identifier"
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "_reserved_identifier"
+                      }
+                    ]
                   }
                 ]
               }
@@ -2401,6 +2419,13 @@
             "type": "STRING",
             "value": "new"
           },
+          {
+            "type": "REPEAT",
+            "content": {
+              "type": "SYMBOL",
+              "name": "_annotation"
+            }
+          },
           {
             "type": "FIELD",
             "name": "type",
@@ -5852,6 +5877,10 @@
                 "type": "SYMBOL",
                 "name": "interface_declaration"
               },
+              {
+                "type": "SYMBOL",
+                "name": "enum_declaration"
+              },
               {
                 "type": "SYMBOL",
                 "name": "annotation_type_declaration"
@@ -7059,9 +7088,17 @@
       "generic_type",
       "primary_expression"
     ],
+    [
+      "expression",
+      "statement"
+    ],
     [
       "lambda_expression",
       "primary_expression"
+    ],
+    [
+      "inferred_parameters",
+      "primary_expression"
     ]
   ],
   "precedences": [],

src/node-types.json

@@ -487,6 +487,10 @@
           "type": "constant_declaration",
           "named": true
         },
+        {
+          "type": "enum_declaration",
+          "named": true
+        },
         {
           "type": "interface_declaration",
           "named": true
@@ -677,6 +681,20 @@
           }
         ]
       }
+    },
+    "children": {
+      "multiple": true,
+      "required": false,
+      "types": [
+        {
+          "type": "annotation",
+          "named": true
+        },
+        {
+          "type": "marker_annotation",
+          "named": true
+        }
+      ]
     }
   },
   {