decltype(...) expressions can be used in qualified identifiers prior …

…to scope resolution operators
tree-sitter · Jan 9, 2023 · 2b90863 · 2b90863
1 parent b3bba38
commit 2b90863
Show file tree

Hide file tree

Showing 5 changed files with 267,209 additions and 264,339 deletions.
diff --git a/grammar.js b/grammar.js
@@ -73,10 +73,10 @@ module.exports = grammar(C, {
 
     // Types
 
-    placeholder_type_specifier: $ => seq(
+    placeholder_type_specifier: $ => prec(1, seq(
       field('constraint', optional($._type_specifier)),
       choice($.auto, alias($.decltype_auto, $.decltype))
-    ),
+    )),
 
     auto: $ => 'auto',
     decltype_auto: $ => seq(
@@ -1101,6 +1101,7 @@ module.exports = grammar(C, {
       field('scope', optional(choice(
         $._namespace_identifier,
         $.template_type,
+        $.decltype,
         alias($.dependent_type_identifier, $.dependent_name)
       ))),
       '::',

diff --git a/src/grammar.json b/src/grammar.json
@@ -7864,43 +7864,47 @@
       }
     },
     "placeholder_type_specifier": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "FIELD",
-          "name": "constraint",
-          "content": {
+      "type": "PREC",
+      "value": 1,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "FIELD",
+            "name": "constraint",
+            "content": {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "_type_specifier"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            }
+          },
+          {
             "type": "CHOICE",
             "members": [
               {
                 "type": "SYMBOL",
-                "name": "_type_specifier"
+                "name": "auto"
               },
               {
-                "type": "BLANK"
+                "type": "ALIAS",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "decltype_auto"
+                },
+                "named": true,
+                "value": "decltype"
               }
             ]
           }
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "auto"
-            },
-            {
-              "type": "ALIAS",
-              "content": {
-                "type": "SYMBOL",
-                "name": "decltype_auto"
-              },
-              "named": true,
-              "value": "decltype"
-            }
-          ]
-        }
-      ]
+        ]
+      }
     },
     "auto": {
       "type": "STRING",
@@ -12262,6 +12266,10 @@
                       "type": "SYMBOL",
                       "name": "template_type"
                     },
+                    {
+                      "type": "SYMBOL",
+                      "name": "decltype"
+                    },
                     {
                       "type": "ALIAS",
                       "content": {

diff --git a/src/node-types.json b/src/node-types.json
@@ -4795,6 +4795,10 @@
         "multiple": false,
         "required": false,
         "types": [
+          {
+            "type": "decltype",
+            "named": true
+          },
           {
             "type": "dependent_name",
             "named": true