minor changes

2020-07-23 09:12:50 +07:00 · 2020-07-23 09:12:50 +07:00 · 9db3226a41
parent 2c62d2249e
commit 9db3226a41
5 changed files with 59220 additions and 58972 deletions
--- a/grammar.js
+++ b/grammar.js
@ -1675,7 +1675,7 @@ module.exports = grammar({
        getter_signature: $ => seq(
            optional($._type),
            $._get,
-            $.identifier,
+            field('name', $.identifier),
            optional($._native)
        ),
        setter_signature: $ => seq(
@ -2189,9 +2189,9 @@ module.exports = grammar({
        function_signature: $ => seq(
            // optional($._metadata),
            optional($._type),
-            field('name', $.identifier),
+            field('name', choice($._get, $.identifier)),
            $._formal_parameter_part,
-            optional($._native)
+            optional($._native),
        ),

        _formal_parameter_part: $ => seq(
--- a/src/grammar.json
+++ b/src/grammar.json
@ -6126,8 +6126,12 @@
          "name": "_get"
        },
        {
-          "type": "SYMBOL",
-          "name": "identifier"
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
        },
        {
          "type": "CHOICE",
@ -8483,8 +8487,17 @@
          "type": "FIELD",
          "name": "name",
          "content": {
-            "type": "SYMBOL",
-            "name": "identifier"
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "_get"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "identifier"
+              }
+            ]
          }
        },
        {
--- a/src/node-types.json
+++ b/src/node-types.json
@ -5346,19 +5346,26 @@
  {
    "type": "getter_signature",
    "named": true,
-    "fields": {},
+    "fields": {
+      "name": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "identifier",
+            "named": true
+          }
+        ]
+      }
+    },
    "children": {
      "multiple": true,
-      "required": true,
+      "required": false,
      "types": [
        {
          "type": "function_type",
          "named": true
        },
-        {
-          "type": "identifier",
-          "named": true
-        },
        {
          "type": "string_literal",
          "named": true
--- a/src/parser.c
+++ b/src/parser.c
--- a/test/corpus/more_expressions.txt
+++ b/test/corpus/more_expressions.txt
@ -94,7 +94,8 @@ var a;

 (program

- (getter_signature (identifier))
+ (getter_signature 
+    name: (identifier))
    (function_body
         (block
            (local_variable_declaration (initialized_variable_definition (inferred_type) name: (identifier)))