Merge pull request #250 from calebdw/for_fields

feat: add fields to for_statement
tree-sitter · Jul 5, 2024 · f2c5ae0 · f2c5ae0
2 parents 4f124bc + 5888922
commit f2c5ae0
Show file tree

Hide file tree

Showing 8 changed files with 184,867 additions and 165,272 deletions.
diff --git a/common/define-grammar.js b/common/define-grammar.js
@@ -724,18 +724,18 @@ module.exports = function defineGrammar(dialect) {
       for_statement: $ => seq(
         keyword('for'),
         '(',
-        optional($._expressions),
+        field('initialize', optional($._expressions)),
         ';',
-        optional($._expressions),
+        field('condition', optional($._expressions)),
         ';',
-        optional($._expressions),
+        field('update', optional($._expressions)),
         ')',
         choice(
           $._semicolon,
-          $.statement,
+          field('body', $.statement),
           seq(
             ':',
-            repeat($.statement),
+            field('body', repeat($.statement)),
             keyword('endfor'),
             $._semicolon,
           ),

diff --git a/php/src/grammar.json b/php/src/grammar.json
@@ -3616,48 +3616,60 @@
           "value": "("
         },
         {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "_expressions"
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
+          "type": "FIELD",
+          "name": "initialize",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "_expressions"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
         },
         {
           "type": "STRING",
           "value": ";"
         },
         {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "_expressions"
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
+          "type": "FIELD",
+          "name": "condition",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "_expressions"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
         },
         {
           "type": "STRING",
           "value": ";"
         },
         {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "_expressions"
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
+          "type": "FIELD",
+          "name": "update",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "_expressions"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
         },
         {
           "type": "STRING",
@@ -3671,8 +3683,12 @@
               "name": "_semicolon"
             },
             {
-              "type": "SYMBOL",
-              "name": "statement"
+              "type": "FIELD",
+              "name": "body",
+              "content": {
+                "type": "SYMBOL",
+                "name": "statement"
+              }
             },
             {
               "type": "SEQ",
@@ -3682,10 +3698,14 @@
                   "value": ":"
                 },
                 {
-                  "type": "REPEAT",
+                  "type": "FIELD",
+                  "name": "body",
                   "content": {
-                    "type": "SYMBOL",
-                    "name": "statement"
+                    "type": "REPEAT",
+                    "content": {
+                      "type": "SYMBOL",
+                      "name": "statement"
+                    }
                   }
                 },
                 {

diff --git a/php/src/node-types.json b/php/src/node-types.json
@@ -2095,24 +2095,59 @@
   {
     "type": "for_statement",
     "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": false,
-      "types": [
-        {
-          "type": "expression",
-          "named": true
-        },
-        {
-          "type": "sequence_expression",
-          "named": true
-        },
-        {
-          "type": "statement",
-          "named": true
-        }
-      ]
+    "fields": {
+      "body": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "statement",
+            "named": true
+          }
+        ]
+      },
+      "condition": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "expression",
+            "named": true
+          },
+          {
+            "type": "sequence_expression",
+            "named": true
+          }
+        ]
+      },
+      "initialize": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "expression",
+            "named": true
+          },
+          {
+            "type": "sequence_expression",
+            "named": true
+          }
+        ]
+      },
+      "update": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "expression",
+            "named": true
+          },
+          {
+            "type": "sequence_expression",
+            "named": true
+          }
+        ]
+      }
     }
   },
   {