Support for do and while loops named fields (#324)

* Support for do and while loops named fields - both `body` and `condition` fields - updated parser * Update tests * Update file sizes
tree-sitter · Nov 29, 2023 · dd5e597 · dd5e597
1 parent 1648e21
commit dd5e597
Show file tree

Hide file tree

Showing 6 changed files with 1,214 additions and 1,162 deletions.
diff --git a/corpus/statements.txt b/corpus/statements.txt
@@ -67,8 +67,8 @@ class A {
         parameters: (parameter_list)
         body: (block
           (while_statement
-            (boolean_literal)
-            (break_statement)))))))
+            condition: (boolean_literal)
+            body: (break_statement)))))))
 
 ================================================================================
 Continue statement
@@ -92,8 +92,8 @@ class A {
         parameters: (parameter_list)
         body: (block
           (while_statement
-            (boolean_literal)
-            (continue_statement)))))))
+            condition: (boolean_literal)
+            body: (continue_statement)))))))
 
 ================================================================================
 Throw nothing
@@ -167,8 +167,8 @@ class A {
             name: (identifier)))
         body: (block
           (do_statement
-            (block)
-            (identifier)))))))
+            body: (block)
+            condition: (identifier)))))))
 
 ================================================================================
 Goto statement and label

diff --git a/grammar.js b/grammar.js
@@ -876,7 +876,15 @@ module.exports = grammar({
 
     continue_statement: $ => seq('continue', ';'),
 
-    do_statement: $ => seq('do', $._statement, 'while', '(', $._expression, ')', ';'),
+    do_statement: $ => seq(
+      'do',
+      field('body', $._statement),
+      'while',
+      '(',
+      field('condition', $._expression),
+      ')',
+      ';'
+    ),
 
     empty_statement: $ => ';',
 
@@ -1161,7 +1169,13 @@ module.exports = grammar({
       field('body', $._statement)
     ),
 
-    while_statement: $ => seq('while', '(', $._expression, ')', $._statement),
+    while_statement: $ => seq(
+      'while',
+      '(',
+      field('condition', $._expression),
+      ')',
+      field('body', $._statement)
+    ),
 
     yield_statement: $ => seq(
       'yield',

diff --git a/script/file_sizes.txt b/script/file_sizes.txt
@@ -1,5 +1,5 @@
-src/grammar.json    	0.2MB	     11140
-src/node-types.json 	0.1MB	      7902
-src/parser.c        	41.8MB	   1311926
+src/grammar.json    	0.2MB	     11156
+src/node-types.json 	0.1MB	      7916
+src/parser.c        	41.8MB	   1311934
 src/scanner.c       	0.0MB	        37
-total               	42.2MB	   1331005
+total               	42.2MB	   1331043
diff --git a/src/grammar.json b/src/grammar.json
@@ -4420,8 +4420,12 @@
           "value": "do"
         },
         {
-          "type": "SYMBOL",
-          "name": "_statement"
+          "type": "FIELD",
+          "name": "body",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_statement"
+          }
         },
         {
           "type": "STRING",
@@ -4432,8 +4436,12 @@
           "value": "("
         },
         {
-          "type": "SYMBOL",
-          "name": "_expression"
+          "type": "FIELD",
+          "name": "condition",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_expression"
+          }
         },
         {
           "type": "STRING",
@@ -6134,16 +6142,24 @@
           "value": "("
         },
         {
-          "type": "SYMBOL",
-          "name": "_expression"
+          "type": "FIELD",
+          "name": "condition",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_expression"
+          }
         },
         {
           "type": "STRING",
           "value": ")"
         },
         {
-          "type": "SYMBOL",
-          "name": "_statement"
+          "type": "FIELD",
+          "name": "body",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_statement"
+          }
         }
       ]
     },

diff --git a/src/node-types.json b/src/node-types.json
@@ -2271,20 +2271,27 @@
   {
     "type": "do_statement",
     "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": true,
-      "types": [
-        {
-          "type": "_expression",
-          "named": true
-        },
-        {
-          "type": "_statement",
-          "named": true
-        }
-      ]
+    "fields": {
+      "body": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "_statement",
+            "named": true
+          }
+        ]
+      },
+      "condition": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "_expression",
+            "named": true
+          }
+        ]
+      }
     }
   },
   {
@@ -7003,20 +7010,27 @@
   {
     "type": "while_statement",
     "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": true,
-      "types": [
-        {
-          "type": "_expression",
-          "named": true
-        },
-        {
-          "type": "_statement",
-          "named": true
-        }
-      ]
+    "fields": {
+      "body": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "_statement",
+            "named": true
+          }
+        ]
+      },
+      "condition": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "_expression",
+            "named": true
+          }
+        ]
+      }
     }
   },
   {