constrain (argument) definition

Author: justinmk

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,11 +98,19 @@ EXTERNAL *netrw-externapp* {{{2
 (help_file
   (block
     (line
-      (argument
-        (word)
-        (ERROR
-          (word)
-          (word)))
+      (word)
+      (word)
+      (word)
+      (ERROR
+        (word))
+      (word)
+      (word)
+      (word)
+      (word))
+    (line
+      (word)
+      (ERROR
+        (word))
       (word)
       (codespan
         (word))

corpus/heading3-column_heading.txt

@@ -271,11 +271,13 @@ buffer-diagram
       (word))
     (line
       (word)
-      (word)
+      (ERROR
+        (word))
       (word))
     (line
       (word)
-      (word)
+      (ERROR
+        (word))
       (word))
     (line
       (taglink

corpus/line_block.txt

@@ -130,7 +130,9 @@ li continues
     (line_li
       (line
         (word)
-        (word)
+        (word
+          (ERROR
+            (word)))
         (word)
         (word)
         (word))
@@ -147,7 +149,9 @@ li continues
   (block
     (line_li
       (line
-        (word)
+        (word
+          (ERROR
+            (word)))
         (word)
         (word))
       (line))

corpus/optionlink.txt

@@ -33,7 +33,6 @@ NOT optionlink: ' or 'x
 ================================================================================
 'fillchars'
 stl		' ' or '^'	statusline
-wbr		' '		windowbar
 tricky:	' 'yes'  's foo
 
 
@@ -51,11 +50,6 @@ tricky:	' 'yes'  's foo
       (word)
       (word)
       (word))
-    (line
-      (word)
-      (word)
-      (word)
-      (word))
     (line
       (word)
       (word)
@@ -72,9 +66,8 @@ no! ','sqlKeyword'
 single-char '-' 'g' '보'
 non-ascii: '\"' '%)' '-bang' '.*\\.log' '.gitignore' '@{${\"foo\"}}'
 number: '04' 'ISO-10646-1' 'python3'
-
-	Option	  '	:help 'textwidth'
-	Regular	  /	:help /[
+Option	  '	:help 'textwidth'
+Regular	  /	:help /[
 
 
 --------------------------------------------------------------------------------
@@ -101,16 +94,13 @@ number: '04' 'ISO-10646-1' 'python3'
       (word)
       (word)
       (word)
-      (tag
-        (word)
-        (MISSING "*"))
+      (word)
+      (ERROR
+        (word))
       (word)
       (word)
       (argument
-        (word)
-        (ERROR
-          (word)
-          (word)))
+        (word))
       (word)
       (word))
     (line
@@ -119,8 +109,9 @@ number: '04' 'ISO-10646-1' 'python3'
       (word)
       (word)
       (word)
-      (word)))
-  (block
+      (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

@@ -62,7 +62,7 @@ module.exports = grammar({
     // Explicit special cases: these are plaintext, not errors.
     _word_common: () => choice(
       // NOT tag: isolated "*".
-      /\*[\n\t ]/,
+      '*',
       // NOT optionlink: '
       "'",
       // NOT optionlink: 'x
@@ -208,26 +208,28 @@ module.exports = grammar({
     optionlink: ($) => _word($, /[a-z][a-z]+/, "'", "'"),
     // Link to tag: |foo|
     taglink: ($) => _word($, choice(
-          token.immediate(/[^|\n\t ]+/),
-          // Special cases: |(| |{| …
-          token.immediate('{'),
-          token.immediate('}'),
-          token.immediate('('),
-          token.immediate(')'),
-          token.immediate('`'),
-    ), '|', '|'),
+        /[^|\n\t ]+/,
+        // Special cases: |(| |{| …
+        '{',
+        '}',
+        '(',
+        ')',
+        '`',
+      ),
+      '|', '|'),
     // 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 ]+/, '{', '}'),
   },
 });
 
 // Word delimited by special chars.
 // `rule` can be a rule function or regex. It is aliased to "word" because they are
 // semantically the same: atoms of captured plain text.
 function _word($, rule, c1, c2, fname) {
-  rule = rule.test !== undefined ? token.immediate(rule) : rule
+  // rule = rule.test ? token.immediate(rule) : rule
+  // rule = token.immediate(rule)
   fname = fname ?? 'text';
-  return seq(c1, field(fname, alias(rule, $.word)), token.immediate(c2));
+  return seq(c1, field(fname, alias(token.immediate(prec(1, rule)), $.word)), token.immediate(c2));
 }