constrain (argument) definition

corpus/arguments.txt

@@ -2,8 +2,8 @@
 argument
 ================================================================================
 argument: {arg}
-argument: {arg arg}
-CTRL-R CTRL-R {register CTRL-F}
+tuple: {arg,arg}
+keycode: CTRL-R {CTRL-R} {register CTRL-F}
 list of { uri:string, name: string } tables
 
 
@@ -23,7 +23,12 @@ list of { uri:string, name: string } tables
       (word)
       (keycode)
       (argument
-        (word)))
+        (word))
+      (word)
+      (ERROR
+        (word))
+      (keycode)
+      (word))
     (line
       (word)
       (word)
@@ -71,6 +76,7 @@ argument in parentheses
 ================================================================================
 NOT an argument
 ================================================================================
+a '{' '}' block
 {foo "{bar}" `{baz}` |{baz| } {}
 foo { bar 
 { {} foo{{ foo{{{
@@ -92,10 +98,20 @@ EXTERNAL *netrw-externapp* {{{2
 (help_file
   (block
     (line
+      (word)
+      (word)
       (word)
       (ERROR
-        (word)
         (word))
+      (word)
+      (word)
+      (word)
+      (word))
+    (line
+      (word)
+      (ERROR
+        (word))
+      (word)
       (codespan
         (word))
       (taglink

corpus/optionlink.txt

@@ -99,9 +99,6 @@ Regular	  /	:help /[
         (word))
       (word)
       (word)
-      (word)
-      (ERROR
-        (word))
       (argument
         (word))
       (word)
@@ -112,7 +109,9 @@ Regular	  /	:help /[
       (word)
       (word)
       (word)
-      (word))
+      (word
+        (ERROR
+          (word))))
     (line
       (word)
       (word)

corpus/taglink.txt

@@ -150,7 +150,8 @@ Note: ":autocmd" can...
     (line
       (word)
       (word)
-      (word)
+      (ERROR
+        (word))
       (word))
     (line
       (word)

corpus/tags.txt

@@ -108,9 +108,9 @@ NOT a tag
       (word)
       (word)
       (word)
-      (tag
-        (word)
-        (MISSING "*")))
+      (word)
+      (ERROR
+        (word)))
     (line
       (word)
       (word)
@@ -121,16 +121,16 @@ NOT a tag
       (word))
     (line
       (word)
-      (tag
-        (word)
-        (MISSING "*"))
+      (word)
+      (ERROR
+        (word))
       (word)))
   (block
     (line
       (word)
-      (tag
-        (word)
-        (MISSING "*"))
+      (word)
+      (ERROR
+        (word))
       (word)
       (word)
       (word))))

grammar.js

@@ -219,8 +219,8 @@ module.exports = grammar({
       '|', '|'),
     // Inline code (may contain whitespace!): `foo bar`
     codespan: ($) => _word($, /[^``\n]+/, '`', '`'),
-    // Argument: {arg}
-    argument: ($) => _word($, /[^{}\n\t ][^{}\n\t]*/, '{', '}'),
+    // Argument: {arg} (no whitespace allowed)
+    argument: ($) => _word($, /[^}\n\t ]+/, '{', '}'),
   },
 });