Change comment starter, add commas and semicolons as separators

treuherz · Apr 6, 2024 · e220cd0 · e220cd0
1 parent 6fb1953
commit e220cd0
Show file tree

Hide file tree

Showing 8 changed files with 255 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,3 +3,5 @@
 ## 2024-04-06
 
 * Stopped the page crashing if input was unparseable, added an indicator for parse success.
+* Change the comment-starter to //
+* Add commas and semicolons as record and series separators
diff --git a/rampart-web/src/App.jsx b/rampart-web/src/App.jsx
@@ -54,7 +54,8 @@ function App() {
         </p>
       </section>
       <section className="help">
-        <p>Each line is a time/power pair. Blank lines separate series.</p>
+        <p>Each pair of values is a time and a power pair, separated by a newline or a comma.
+          Blank lines or semicolons separate series.</p>
 
         <p>
           Plain integer times are minutes, other valid formats are{" "}
@@ -81,8 +82,8 @@ function App() {
         </p>
 
         <p>
-          Comments can be added by starting them with a semicolon,{" "}
-          <code>; like this.</code>
+          Comments start with a double forward-slash,{" "}
+          <code>// like this.</code>
         </p>
       </section>
       <section className="chart">

diff --git a/tree-sitter-rampart/grammar.js b/tree-sitter-rampart/grammar.js
@@ -10,17 +10,18 @@ module.exports = grammar({
 
     _newline: $ => '\n',
 
-    _terminator: $ => choice('\n', '\0'),
+    _record_sep: $ => seq(choice('\n', ',', ',\n'), repeat(' ')),
+    _series_sep: $ => seq(choice('\n', '\0', ';', ';\n', ';\0'), repeat(' '), repeat('\n')),
 
     // Series consist of optional attributes and at least one point and end with at lease one newline.
     series: $ => seq(
       field('attributes', optional($.attribute_list)),
       field('points', $.point_list),
-      $._terminator,
+      $._series_sep,
     ),
 
     // Attributes are a list of '@key value' pairs
-    attribute_list: $ => repeat1(seq($.attribute, $._newline)),
+    attribute_list: $ => repeat1(seq($.attribute, $._record_sep)),
 
     // @key value
     // @key "v a l u e"
@@ -42,7 +43,7 @@ module.exports = grammar({
     qstring: $ => /[ a-zA-Z0-9._'-]+/,
 
     // Point lists are lists of time, power points
-    point_list: $ => repeat1(seq($.point, $._newline)),
+    point_list: $ => prec.right(seq(repeat(seq($.point, $._record_sep)), $.point, optional($._record_sep))),
 
     // Times and powers are separated by a space
     point: $ => seq(
@@ -84,7 +85,7 @@ module.exports = grammar({
     // 1.23456e2
     exponent: $ => /-?(\d(_?\d)*)?(\.(_?\d)*)?[eE]-?\d(_?\d)*/,
 
-    comment: $ => /\s*;.*/,
+    comment: $ => /\s*\/\/.*/,
   },
 
   // Comments are ignored

diff --git a/tree-sitter-rampart/src/grammar.json b/tree-sitter-rampart/src/grammar.json
@@ -24,16 +24,76 @@
       "type": "STRING",
       "value": "\n"
     },
-    "_terminator": {
-      "type": "CHOICE",
+    "_record_sep": {
+      "type": "SEQ",
       "members": [
         {
-          "type": "STRING",
-          "value": "\n"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "\n"
+            },
+            {
+              "type": "STRING",
+              "value": ","
+            },
+            {
+              "type": "STRING",
+              "value": ",\n"
+            }
+          ]
         },
         {
-          "type": "STRING",
-          "value": "\u0000"
+          "type": "REPEAT",
+          "content": {
+            "type": "STRING",
+            "value": " "
+          }
+        }
+      ]
+    },
+    "_series_sep": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "\n"
+            },
+            {
+              "type": "STRING",
+              "value": "\u0000"
+            },
+            {
+              "type": "STRING",
+              "value": ";"
+            },
+            {
+              "type": "STRING",
+              "value": ";\n"
+            },
+            {
+              "type": "STRING",
+              "value": ";\u0000"
+            }
+          ]
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "STRING",
+            "value": " "
+          }
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "STRING",
+            "value": "\n"
+          }
         }
       ]
     },
@@ -66,7 +126,7 @@
         },
         {
           "type": "SYMBOL",
-          "name": "_terminator"
+          "name": "_series_sep"
         }
       ]
     },
@@ -81,7 +141,7 @@
           },
           {
             "type": "SYMBOL",
-            "name": "_newline"
+            "name": "_record_sep"
           }
         ]
       }
@@ -169,17 +229,42 @@
       "value": "[ a-zA-Z0-9._'-]+"
     },
     "point_list": {
-      "type": "REPEAT1",
+      "type": "PREC_RIGHT",
+      "value": 0,
       "content": {
         "type": "SEQ",
         "members": [
+          {
+            "type": "REPEAT",
+            "content": {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "point"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "_record_sep"
+                }
+              ]
+            }
+          },
           {
             "type": "SYMBOL",
             "name": "point"
           },
           {
-            "type": "SYMBOL",
-            "name": "_newline"
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "_record_sep"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
           }
         ]
       }
@@ -380,7 +465,7 @@
     },
     "comment": {
       "type": "PATTERN",
-      "value": "\\s*;.*"
+      "value": "\\s*\\/\\/.*"
     }
   },
   "extras": [

diff --git a/tree-sitter-rampart/src/node-types.json b/tree-sitter-rampart/src/node-types.json
@@ -327,6 +327,26 @@
     "type": "\"",
     "named": false
   },
+  {
+    "type": ",",
+    "named": false
+  },
+  {
+    "type": ",\n",
+    "named": false
+  },
+  {
+    "type": ";",
+    "named": false
+  },
+  {
+    "type": ";\u0000",
+    "named": false
+  },
+  {
+    "type": ";\n",
+    "named": false
+  },
   {
     "type": "@",
     "named": false

diff --git a/tree-sitter-rampart/src/parser.c b/tree-sitter-rampart/src/parser.c