feat: support tags

Author: vigoux

corpus/tags.txt

@@ -0,0 +1,37 @@
+================================================================================
+Simple tag
+================================================================================
+*foobar*
+--------------------------------------------------------------------------------
+
+(help_file
+  (line
+    (tag
+      (word))))
+
+================================================================================
+Tag in text
+================================================================================
+*tag* in text
+--------------------------------------------------------------------------------
+
+(help_file
+  (line
+    (tag
+      (word))
+    (word)
+    (word)))
+
+================================================================================
+Tag with lines after
+================================================================================
+*foo*
+Hello
+--------------------------------------------------------------------------------
+
+(help_file
+  (line
+    (tag
+      (word)))
+  (line
+    (word)))

grammar.js

@@ -5,18 +5,18 @@ module.exports = grammar({
 
   rules: {
     // TODO: add the actual grammar rules
-    help_file: ($) => seq($.line, repeat(seq('\n', $.line))),
+    help_file: ($) => repeat1($.line),
 
     header: ($) => seq($.tag),
 
-    line: ($) => repeat1($._atom),
+    line: ($) => prec.right(seq(repeat1($._atom), optional('\n'))),
 
     _atom: ($) => choice($.word, $.tag),
 
-    word: ($) => /[^*'|\n]\S*[^*'|\n]/,
+    word: ($) => /[^*|'\n \t]+/,
     tag: ($) => wrapped_word($, '*', 'name'),
-    option: ($) => /'[a-z]+'/,
-    hotlink: ($) => /|[a-z-]+|/,
+    option: ($) => wrapped_word($, "'", 'name'),
+    hotlink: ($) => wrapped_word($, '|', 'destination'),
   },
 });
 

src/grammar.json

@@ -2,44 +2,47 @@
   "name": "help",
   "rules": {
     "help_file": {
+      "type": "REPEAT1",
+      "content": {
+        "type": "SYMBOL",
+        "name": "line"
+      }
+    },
+    "header": {
       "type": "SEQ",
       "members": [
         {
           "type": "SYMBOL",
-          "name": "line"
-        },
-        {
-          "type": "REPEAT",
-          "content": {
-            "type": "SEQ",
+          "name": "tag"
+        }
+      ]
+    },
+    "line": {
+      "type": "PREC_RIGHT",
+      "value": 0,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "REPEAT1",
+            "content": {
+              "type": "SYMBOL",
+              "name": "_atom"
+            }
+          },
+          {
+            "type": "CHOICE",
             "members": [
               {
                 "type": "STRING",
                 "value": "\n"
               },
               {
-                "type": "SYMBOL",
-                "name": "line"
+                "type": "BLANK"
               }
             ]
           }
-        }
-      ]
-    },
-    "header": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "tag"
-        }
-      ]
-    },
-    "line": {
-      "type": "REPEAT1",
-      "content": {
-        "type": "SYMBOL",
-        "name": "_atom"
+        ]
       }
     },
     "_atom": {
@@ -57,7 +60,7 @@
     },
     "word": {
       "type": "PATTERN",
-      "value": "[^*'|\\n]\\S*[^*'|\\n]"
+      "value": "[^*|'\\n \\t]+"
     },
     "tag": {
       "type": "SEQ",
@@ -81,12 +84,46 @@
       ]
     },
     "option": {
-      "type": "PATTERN",
-      "value": "'[a-z]+'"
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "'"
+        },
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "word"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "'"
+        }
+      ]
     },
     "hotlink": {
-      "type": "PATTERN",
-      "value": "|[a-z-]+|"
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "|"
+        },
+        {
+          "type": "FIELD",
+          "name": "destination",
+          "content": {
+            "type": "SYMBOL",
+            "name": "word"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "|"
+        }
+      ]
     }
   },
   "extras": [

src/node-types.json

@@ -53,12 +53,20 @@
     "type": "\n",
     "named": false
   },
+  {
+    "type": "'",
+    "named": false
+  },
   {
     "type": "*",
     "named": false
   },
   {
     "type": "word",
     "named": true
+  },
+  {
+    "type": "|",
+    "named": false
   }
 ]