Merge pull request #222 from aibaars/parser-fixes-3

Some improvements to the parser

Author: aibaars

grammar.js

@@ -100,10 +100,11 @@ module.exports = grammar({
   rules: {
     program: $ => seq(
       optional($._statements),
-      optional(seq(
-        '__END__',
-        $._line_break,
-        $.uninterpreted)
+      optional(
+        choice(
+          seq(/__END__[\r\n]/, $.uninterpreted),
+          seq('__END__', alias('', $.uninterpreted))
+        )
       )
     ),
 
@@ -261,8 +262,10 @@ module.exports = grammar({
     class: $ => seq(
       'class',
       field('name', choice($.constant, $.scope_resolution)),
-      field('superclass', optional($.superclass)),
-      $._terminator,
+      choice(
+        seq(field('superclass', $.superclass), $._terminator),
+        optional($._terminator)
+      ),
       $._body_statement
     ),
 
@@ -279,10 +282,8 @@ module.exports = grammar({
     module: $ => seq(
       'module',
       field('name', choice($.constant, $.scope_resolution)),
-      choice(
-        seq($._terminator, $._body_statement),
-        'end'
-      )
+      optional($._terminator),
+      $._body_statement,
     ),
 
     return_command: $ => prec.left(seq('return', alias($.command_argument_list, $.argument_list))),
@@ -999,7 +1000,7 @@ module.exports = grammar({
 
     operator: $ => choice(
       '..', '|', '^', '&', '<=>', '==', '===', '=~', '>', '>=', '<', '<=', '+',
-      '-', '*', '/', '%', '!', '!~', '**', '<<', '>>', '~', '+@', '-@', '[]', '[]=', '`'
+      '-', '*', '/', '%', '!', '!~', '**', '<<', '>>', '~', '+@', '-@', '~@', '[]', '[]=', '`'
     ),
 
     _method_name: $ => choice(

src/grammar.json

@@ -21,19 +21,38 @@
           "type": "CHOICE",
           "members": [
             {
-              "type": "SEQ",
+              "type": "CHOICE",
               "members": [
                 {
-                  "type": "STRING",
-                  "value": "__END__"
-                },
-                {
-                  "type": "SYMBOL",
-                  "name": "_line_break"
+                  "type": "SEQ",
+                  "members": [
+                    {
+                      "type": "PATTERN",
+                      "value": "__END__[\\r\\n]"
+                    },
+                    {
+                      "type": "SYMBOL",
+                      "name": "uninterpreted"
+                    }
+                  ]
                 },
                 {
-                  "type": "SYMBOL",
-                  "name": "uninterpreted"
+                  "type": "SEQ",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": "__END__"
+                    },
+                    {
+                      "type": "ALIAS",
+                      "content": {
+                        "type": "STRING",
+                        "value": ""
+                      },
+                      "named": true,
+                      "value": "uninterpreted"
+                    }
+                  ]
                 }
               ]
             },
@@ -894,24 +913,38 @@
           }
         },
         {
-          "type": "FIELD",
-          "name": "superclass",
-          "content": {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "superclass"
-              },
-              {
-                "type": "BLANK"
-              }
-            ]
-          }
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_terminator"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "FIELD",
+                  "name": "superclass",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "superclass"
+                  }
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "_terminator"
+                }
+              ]
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "_terminator"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            }
+          ]
         },
         {
           "type": "SYMBOL",
@@ -994,23 +1027,17 @@
           "type": "CHOICE",
           "members": [
             {
-              "type": "SEQ",
-              "members": [
-                {
-                  "type": "SYMBOL",
-                  "name": "_terminator"
-                },
-                {
-                  "type": "SYMBOL",
-                  "name": "_body_statement"
-                }
-              ]
+              "type": "SYMBOL",
+              "name": "_terminator"
             },
             {
-              "type": "STRING",
-              "value": "end"
+              "type": "BLANK"
             }
           ]
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_body_statement"
         }
       ]
     },
@@ -6568,6 +6595,10 @@
           "type": "STRING",
           "value": "-@"
         },
+        {
+          "type": "STRING",
+          "value": "~@"
+        },
         {
           "type": "STRING",
           "value": "[]"

src/node-types.json

@@ -4067,5 +4067,9 @@
   {
     "type": "~",
     "named": false
+  },
+  {
+    "type": "~@",
+    "named": false
   }
 ]