RubyGems - ebnf - Versions diffs - 0.3.5 → 0.3.6 - Mend

ebnf 0.3.5 → 0.3.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f38cc65305f0cd2ab9e08efb54451ac8d30cb13
-  data.tar.gz: 946ef35ebd63d45eb33b2b7d3ad01d6c2f6847a4
+  metadata.gz: 6ff1ded5e44c9136111320f969eaa0825f216155
+  data.tar.gz: f6150889a8250eaecba0123f5589eeb9b0b59959
 SHA512:
-  metadata.gz: b50668809f1938d4bd6776162fcca12bc839321a7da9579e14f20ab07d6f8c69753d75771bdfdfd701fa83e86bc5704229c8ee2f90ccbe4000d07bb7a12a2d97
-  data.tar.gz: 28c2d558b9aaad3395ccfe946f10e746cd9c5e793a76ed195f52d259fd53c452bb464208d255025a84ed59c6bdcf3cc45929a7a8c1b81f55f05c36a94310cd39
+  metadata.gz: 60b7be1a7d0aa55e7ce5af2f4569277d78a99741e3d474aeb6957dc5b5bd6983b6a1eec9dba3472e99706fc16f4d1ae1b32eecf9bccfd48739e285198401eb5c
+  data.tar.gz: 68bf7ea88a84cb418e6656e19bee3761ee214c0b0a68a586c557077e7867b4b86af9a55ff9534a52e8f2dfd32aadf9f4dc684e2ef1383038a7ee07f51761dc65

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 0.3.5
1	+ 0.3.6

data/bin/ebnf CHANGED

@@ -48,7 +48,7 @@ OPT_ARGS = [
   ["--bnf",             GetoptLong::NO_ARGUMENT,      "Transform EBNF to BNF"],
   ["--evaluate","-e",   GetoptLong::REQUIRED_ARGUMENT,"Evaluate argument as a JSON-LD document"],
   ["--ll1",             GetoptLong::REQUIRED_ARGUMENT,"Generate First/Follow rules, argument is start symbol"],
-  ["--format", "-f",    GetoptLong::REQUIRED_ARGUMENT,"Specify output format one of ebnf, ttl, sxp, or rb"],
+  ["--format", "-f",    GetoptLong::REQUIRED_ARGUMENT,"Specify output format one of ebnf, html, ttl, sxp, or rb"],
   ["--input-format",    GetoptLong::REQUIRED_ARGUMENT,"Specify input format one of ebnf or sxp"],
   ["--mod-name",        GetoptLong::REQUIRED_ARGUMENT,"Module name used when creating ruby tables"],
   ["--output", "-o",    GetoptLong::REQUIRED_ARGUMENT,"Output to the specified file path"],
@@ -105,6 +105,7 @@ ebnf.first_follow(options[:ll1]) if options[:ll1]
 res = case options[:output_format]
 when :ebnf    then ebnf.to_s
+when :html    then ebnf.to_html
 when :sxp     then ebnf.to_sxp
 when :ttl     then ebnf.to_ttl(options[:prefix], options[:namespace])
 when :rb      then dump_tables(ARGV[0], ebnf, out, options)

data/etc/ebnf.ebnf CHANGED

@@ -6,7 +6,7 @@
     [3] rule        ::= LHS expression
     # Use a terminal to match the identifier, rule name and assignment due to
-    # confusion between the identifier ENUM
+    # confusion between the identifier RANGE
     [4] expression  ::= alt
@@ -21,9 +21,7 @@
     [9] primary     ::= HEX
                     |   SYMBOL
                     |   RANGE
-                    |   ENUM
                     |   O_RANGE
-                    |   O_ENUM
                     |   STRING1
                     |   STRING2
                     |   '(' expression ')'
@@ -32,36 +30,38 @@
     @terminals
-    [11] LHS        ::= ENUM? SYMBOL "::="
+    [11] LHS        ::= ('[' SYMBOL+ ']')? SYMBOL "::="
     [12] SYMBOL     ::= ([a-z] | [A-Z] | [0-9] | "_" | ".")+
-    [13] HEX        ::= '#x' ([0-9]|[a-f]|[A-F]) ([0-9]|[a-f]|[A-F])
+    [13] HEX        ::= '#x' ([0-9]|[a-f]|[A-F])+
-    [14] RANGE      ::= '[' R_CHAR '-' R_CHAR ']'
+    # Range is any combination of R_CHAR '-' R_CHAR or R_CHAR+
+    [14] RANGE      ::= '[' ((R_BEGIN (HEX | R_CHAR)) | (HEX | R_CHAR))+ ']'
-    [15] ENUM       ::= '[' R_CHAR+ ']'
+    # Range is any combination of R_CHAR '-' R_CHAR or R_CHAR+ preceded by ^
+    [15] O_RANGE    ::= '[^' ((R_BEGIN (HEX | R_CHAR)) | (HEX | R_CHAR))+ ']'
-    [16] O_RANGE    ::= '[^' R_CHAR '-' R_CHAR ']'
+    # Strings are unescaped Unicode, excepting control characters and hash (#)
+    [16] STRING1    ::= '"' (CHAR - '"')* '"'
-    [17] O_ENUM     ::= '[^' R_CHAR+ ']'
+    [17] STRING2    ::= "'" (CHAR - "'"))* "'"
-    [18] STRING1    ::= '"' ((CHAR - '"') | "\t")* '"'
+    [18] CHAR       ::= HEX
+                      | [#x20#x21#x22]
+                      | [#x24-#x00FFFFFF]
-    [19] STRING2    ::= "'" ((CHAR - "'") | "\t")* "'"
+    [19] R_CHAR     ::= CHAR - ']'
-    [20] CHAR       ::= HEX
-                      | ('\\' [\\trn"'])
-                      | [^\t\r\n]
-    [21] R_CHAR     ::= CHAR - "]"
+    [20] R_BEGIN    ::= (HEX | R_CHAR) "-"
     # Should be able to do this inline, but not until terminal regular expressions are created automatically
-    [22] POSTFIX    ::= [?*+]
+    [21] POSTFIX    ::= [?*+]
-    [23] PASS       ::= ( [#x20\t\r\n]
-                        | ( '#' | '//' ) [^\r\n]*
+    [22] PASS       ::= ( [#x00-#x20]
+                        | ( '#' | '//' ) [^#x0A#x0D]*
                         | '/*' (( '*' [^/] )? | [^*] )* '*/'
+                        | '(*' (( '*' [^)] )? | [^*] )* '*)'
                         )+
     # Should be able to do this inline, but not until terminal regular expressions are created automatically

data/etc/ebnf.html ADDED

@@ -0,0 +1,214 @@
+<table class='grammar'>
+  <tbody id='grammar-productions'>
+    <tr id='grammar-production-ebnf'>
+      <td>[1]</td>
+      <td><code>ebnf</code></td>
+      <td>::=</td>
+      <td>
+        (<a href="#grammar-production-declaration">declaration</a> <code>|</code> <a href="#grammar-production-rule">rule</a>)<code>*</code>
+      </td>
+    </tr>
+    <tr id='grammar-production-declaration'>
+      <td>[2]</td>
+      <td><code>declaration</code></td>
+      <td>::=</td>
+      <td>
+        "<code class="grammar-literal">@terminals</code>"
+        <code>|</code> <a href="#grammar-production-pass">pass</a>
+      </td>
+    </tr>
+    <tr id='grammar-production-rule'>
+      <td>[3]</td>
+      <td><code>rule</code></td>
+      <td>::=</td>
+      <td>
+        <a href="#grammar-production-LHS">LHS</a>
+        <a href="#grammar-production-expression">expression</a>
+      </td>
+    </tr>
+    <tr id='grammar-production-expression'>
+      <td>[4]</td>
+      <td><code>expression</code></td>
+      <td>::=</td>
+      <td>
+        <a href="#grammar-production-alt">alt</a>
+      </td>
+    </tr>
+    <tr id='grammar-production-alt'>
+      <td>[5]</td>
+      <td><code>alt</code></td>
+      <td>::=</td>
+      <td>
+        <a href="#grammar-production-seq">seq</a>
+        ("<code class="grammar-literal">|</code>" <a href="#grammar-production-seq">seq</a>)<code>*</code>
+      </td>
+    </tr>
+    <tr id='grammar-production-seq'>
+      <td>[6]</td>
+      <td><code>seq</code></td>
+      <td>::=</td>
+      <td>
+        <a href="#grammar-production-diff">diff</a><code>+</code>
+      </td>
+    </tr>
+    <tr id='grammar-production-diff'>
+      <td>[7]</td>
+      <td><code>diff</code></td>
+      <td>::=</td>
+      <td>
+        <a href="#grammar-production-postfix">postfix</a>
+        ("<code class="grammar-literal">-</code>" <a href="#grammar-production-postfix">postfix</a>)<code>?</code>
+      </td>
+    </tr>
+    <tr id='grammar-production-postfix'>
+      <td>[8]</td>
+      <td><code>postfix</code></td>
+      <td>::=</td>
+      <td>
+        <a href="#grammar-production-primary">primary</a>
+        <a href="#grammar-production-POSTFIX">POSTFIX</a><code>?</code>
+      </td>
+    </tr>
+    <tr id='grammar-production-primary'>
+      <td>[9]</td>
+      <td><code>primary</code></td>
+      <td>::=</td>
+      <td>
+        <a href="#grammar-production-HEX">HEX</a>
+        <code>|</code> <a href="#grammar-production-SYMBOL">SYMBOL</a>
+        <code>|</code> <a href="#grammar-production-RANGE">RANGE</a>
+        <code>|</code> <a href="#grammar-production-O_RANGE">O_RANGE</a>
+        <code>|</code> <a href="#grammar-production-STRING1">STRING1</a>
+        <code>|</code> <a href="#grammar-production-STRING2">STRING2</a>
+        <code>|</code> "<code class="grammar-literal">(</code>" <a href="#grammar-production-expression">expression</a> "<code class="grammar-literal">)</code>"
+      </td>
+    </tr>
+    <tr id='grammar-production-pass'>
+      <td>[10]</td>
+      <td><code>pass</code></td>
+      <td>::=</td>
+      <td>
+        "<code class="grammar-literal">@pass</code>"
+        <a href="#grammar-production-expression">expression</a>
+      </td>
+    </tr>
+    <tr id='grammar-production-LHS'>
+      <td>[11]</td>
+      <td><code>LHS</code></td>
+      <td>::=</td>
+      <td>
+        ("<code class="grammar-literal">[</code>" <a href="#grammar-production-SYMBOL">SYMBOL</a><code>+</code>  "<code class="grammar-literal">]</code>")<code>?</code>
+        <a href="#grammar-production-SYMBOL">SYMBOL</a>
+        "<code class="grammar-literal">::=</code>"
+      </td>
+    </tr>
+    <tr id='grammar-production-SYMBOL'>
+      <td>[12]</td>
+      <td><code>SYMBOL</code></td>
+      <td>::=</td>
+      <td>
+        (<code>[</code> <code class="grammar-literal">a-z</code><code>]</code>  <code>|</code> <code>[</code> <code class="grammar-literal">A-Z</code><code>]</code>  <code>|</code> <code>[</code> <code class="grammar-literal">0-9</code><code>]</code>  <code>|</code> "<code class="grammar-literal">_</code>" <code>|</code> "<code class="grammar-literal">.</code>")<code>+</code>
+      </td>
+    </tr>
+    <tr id='grammar-production-HEX'>
+      <td>[13]</td>
+      <td><code>HEX</code></td>
+      <td>::=</td>
+      <td>
+        "<code class="grammar-literal">#x</code>"
+        (<code>[</code> <code class="grammar-literal">0-9</code><code>]</code>  <code>|</code> <code>[</code> <code class="grammar-literal">a-f</code><code>]</code>  <code>|</code> <code>[</code> <code class="grammar-literal">A-F</code><code>]</code> )<code>+</code>
+      </td>
+    </tr>
+    <tr id='grammar-production-RANGE'>
+      <td>[14]</td>
+      <td><code>RANGE</code></td>
+      <td>::=</td>
+      <td>
+        "<code class="grammar-literal">[</code>"
+        (<a href="#grammar-production-R_BEGIN">R_BEGIN</a> <code>(</code> <a href="#grammar-production-HEX">HEX</a> <code>|</code> <a href="#grammar-production-R_CHAR">R_CHAR</a><code>)</code>  <code>|</code> <a href="#grammar-production-HEX">HEX</a> <code>|</code> <a href="#grammar-production-R_CHAR">R_CHAR</a>)<code>+</code>
+        "<code class="grammar-literal">]</code>"
+      </td>
+    </tr>
+    <tr id='grammar-production-O_RANGE'>
+      <td>[15]</td>
+      <td><code>O_RANGE</code></td>
+      <td>::=</td>
+      <td>
+        "<code class="grammar-literal">[^</code>"
+        (<a href="#grammar-production-R_BEGIN">R_BEGIN</a> <code>(</code> <a href="#grammar-production-HEX">HEX</a> <code>|</code> <a href="#grammar-production-R_CHAR">R_CHAR</a><code>)</code>  <code>|</code> <a href="#grammar-production-HEX">HEX</a> <code>|</code> <a href="#grammar-production-R_CHAR">R_CHAR</a>)<code>+</code>
+        "<code class="grammar-literal">]</code>"
+      </td>
+    </tr>
+    <tr id='grammar-production-STRING1'>
+      <td>[16]</td>
+      <td><code>STRING1</code></td>
+      <td>::=</td>
+      <td>
+        '<code class="grammar-literal">"</code>'
+        (<a href="#grammar-production-CHAR">CHAR</a> <code>-</code> '<code class="grammar-literal">"</code>')<code>*</code>
+        '<code class="grammar-literal">"</code>'
+      </td>
+    </tr>
+    <tr id='grammar-production-STRING2'>
+      <td>[17]</td>
+      <td><code>STRING2</code></td>
+      <td>::=</td>
+      <td>
+        "<code class="grammar-literal">'</code>"
+        <code>(</code> <a href="#grammar-production-CHAR">CHAR</a> <code>-</code> "<code class="grammar-literal">'</code>"<code>)</code>
+      </td>
+    </tr>
+    <tr id='grammar-production-CHAR'>
+      <td>[18]</td>
+      <td><code>CHAR</code></td>
+      <td>::=</td>
+      <td>
+        <a href="#grammar-production-HEX">HEX</a>
+        <code>|</code> <code>[</code> <code class="grammar-char-escape">#x20</code><code class="grammar-char-escape">#x21</code><code class="grammar-char-escape">#x22</code><code>]</code>
+        <code>|</code> <code>[</code> <code class="grammar-char-escape">#x24</code><code class="grammar-literal">-</code><code class="grammar-char-escape">#x00FFFFFF</code><code>]</code>
+      </td>
+    </tr>
+    <tr id='grammar-production-R_CHAR'>
+      <td>[19]</td>
+      <td><code>R_CHAR</code></td>
+      <td>::=</td>
+      <td>
+        <a href="#grammar-production-CHAR">CHAR</a>
+        <code>-</code> "<code class="grammar-literal">]</code>"
+      </td>
+    </tr>
+    <tr id='grammar-production-R_BEGIN'>
+      <td>[20]</td>
+      <td><code>R_BEGIN</code></td>
+      <td>::=</td>
+      <td>
+        <code>(</code> <a href="#grammar-production-HEX">HEX</a> <code>|</code> <a href="#grammar-production-R_CHAR">R_CHAR</a><code>)</code>
+        "<code class="grammar-literal">-</code>"
+      </td>
+    </tr>
+    <tr id='grammar-production-POSTFIX'>
+      <td>[21]</td>
+      <td><code>POSTFIX</code></td>
+      <td>::=</td>
+      <td>
+        <code>[</code> <code class="grammar-literal">?*+</code><code>]</code>
+      </td>
+    </tr>
+    <tr id='grammar-production-PASS'>
+      <td>[22]</td>
+      <td><code>PASS</code></td>
+      <td>::=</td>
+      <td>
+        (<code>[</code> <code class="grammar-char-escape">#x00</code><code class="grammar-literal">-</code><code class="grammar-char-escape">#x20</code><code>]</code>  <code>|</code> <code>(</code> "<code class="grammar-literal">#</code>" <code>|</code> "<code class="grammar-literal">//</code>"<code>)</code>  (<code>[</code> <code class="grammar-literal">^</code><code class="grammar-char-escape">#x0A</code><code class="grammar-char-escape">#x0D</code><code>]</code> )<code>*</code>  <code>|</code> "<code class="grammar-literal">/*</code>" ("<code class="grammar-literal">*</code>" <code>[</code> <code class="grammar-literal">^/</code><code>]</code> )<code>?</code>  <code>|</code> <code>[</code> <code class="grammar-literal">^*</code><code>]</code> <code>*</code>  "<code class="grammar-literal">*/</code>" <code>|</code> "<code class="grammar-literal">(*</code>" ("<code class="grammar-literal">*</code>" <code>[</code> <code class="grammar-literal">^)</code><code>]</code> )<code>?</code>  <code>|</code> <code>[</code> <code class="grammar-literal">^*</code><code>]</code> <code>*</code>  "<code class="grammar-literal">*)</code>")<code>+</code>
+      </td>
+    </tr>
+    <tr id='grammar-production-'>
+      <td colspan='3'>
+        <code>@pass</code>
+      </td>
+      <td>
+        <a href="#grammar-production-PASS">PASS</a>
+      </td>
+    </tr>
+  </tbody>
+</table>

data/etc/ebnf.ll1.sxp CHANGED

@@ -18,15 +18,15 @@
   (alt "@terminals" pass))
  (rule rule "3" (first LHS) (follow "@pass" "@terminals" LHS _eof) (seq LHS expression))
  (rule _rule_1 "3.1"
-  (first "(" ENUM HEX O_ENUM O_RANGE RANGE STRING1 STRING2 SYMBOL)
+  (first "(" HEX O_RANGE RANGE STRING1 STRING2 SYMBOL)
   (follow "@pass" "@terminals" LHS _eof)
   (seq expression))
  (rule expression "4"
-  (first "(" ENUM HEX O_ENUM O_RANGE RANGE STRING1 STRING2 SYMBOL)
+  (first "(" HEX O_RANGE RANGE STRING1 STRING2 SYMBOL)
   (follow ")" "@pass" "@terminals" LHS _eof)
   (seq alt))
  (rule alt "5"
-  (first "(" ENUM HEX O_ENUM O_RANGE RANGE STRING1 STRING2 SYMBOL)
+  (first "(" HEX O_RANGE RANGE STRING1 STRING2 SYMBOL)
   (follow ")" "@pass" "@terminals" LHS _eof)
   (seq seq _alt_1))
  (rule _alt_1 "5.1"
@@ -50,115 +50,114 @@
   (follow ")" "@pass" "@terminals" LHS _eof)
   (seq _alt_1))
  (rule _alt_6 "5.6"
-  (first "(" ENUM HEX O_ENUM O_RANGE RANGE STRING1 STRING2 SYMBOL)
+  (first "(" HEX O_RANGE RANGE STRING1 STRING2 SYMBOL)
   (follow ")" "@pass" "@terminals" LHS _eof "|")
   (seq seq))
  (rule seq "6"
-  (first "(" ENUM HEX O_ENUM O_RANGE RANGE STRING1 STRING2 SYMBOL)
+  (first "(" HEX O_RANGE RANGE STRING1 STRING2 SYMBOL)
   (follow ")" "@pass" "@terminals" LHS _eof "|")
   (seq diff _seq_1))
  (rule _seq_1 "6.1"
-  (first "(" ENUM HEX O_ENUM O_RANGE RANGE STRING1 STRING2 SYMBOL _eps)
+  (first "(" HEX O_RANGE RANGE STRING1 STRING2 SYMBOL _eps)
   (follow ")" "@pass" "@terminals" LHS _eof "|")
   (alt _empty _seq_2))
  (rule _seq_2 "6.2"
-  (first "(" ENUM HEX O_ENUM O_RANGE RANGE STRING1 STRING2 SYMBOL)
+  (first "(" HEX O_RANGE RANGE STRING1 STRING2 SYMBOL)
   (follow ")" "@pass" "@terminals" LHS _eof "|")
   (seq diff _seq_1))
  (rule _seq_3 "6.3"
-  (first "(" ENUM HEX O_ENUM O_RANGE RANGE STRING1 STRING2 SYMBOL _eps)
+  (first "(" HEX O_RANGE RANGE STRING1 STRING2 SYMBOL _eps)
   (follow ")" "@pass" "@terminals" LHS _eof "|")
   (seq _seq_1))
  (rule _seq_4 "6.4"
-  (first "(" ENUM HEX O_ENUM O_RANGE RANGE STRING1 STRING2 SYMBOL _eps)
+  (first "(" HEX O_RANGE RANGE STRING1 STRING2 SYMBOL _eps)
   (follow ")" "@pass" "@terminals" LHS _eof "|")
   (seq _seq_1))
  (rule diff "7"
-  (first "(" ENUM HEX O_ENUM O_RANGE RANGE STRING1 STRING2 SYMBOL)
-  (follow "(" ")" "@pass" "@terminals" ENUM HEX LHS O_ENUM O_RANGE RANGE
-   STRING1 STRING2 SYMBOL _eof "|" )
+  (first "(" HEX O_RANGE RANGE STRING1 STRING2 SYMBOL)
+  (follow "(" ")" "@pass" "@terminals" HEX LHS O_RANGE RANGE STRING1 STRING2
+   SYMBOL _eof "|" )
   (seq postfix _diff_1))
  (rule _diff_1 "7.1"
   (first "-" _eps)
-  (follow "(" ")" "@pass" "@terminals" ENUM HEX LHS O_ENUM O_RANGE RANGE
-   STRING1 STRING2 SYMBOL _eof "|" )
+  (follow "(" ")" "@pass" "@terminals" HEX LHS O_RANGE RANGE STRING1 STRING2
+   SYMBOL _eof "|" )
   (alt _empty _diff_2))
  (rule _diff_2 "7.2"
   (first "-")
-  (follow "(" ")" "@pass" "@terminals" ENUM HEX LHS O_ENUM O_RANGE RANGE
-   STRING1 STRING2 SYMBOL _eof "|" )
+  (follow "(" ")" "@pass" "@terminals" HEX LHS O_RANGE RANGE STRING1 STRING2
+   SYMBOL _eof "|" )
   (seq "-" postfix))
  (rule _diff_3 "7.3"
   (first "-" _eps)
-  (follow "(" ")" "@pass" "@terminals" ENUM HEX LHS O_ENUM O_RANGE RANGE
-   STRING1 STRING2 SYMBOL _eof "|" )
+  (follow "(" ")" "@pass" "@terminals" HEX LHS O_RANGE RANGE STRING1 STRING2
+   SYMBOL _eof "|" )
   (seq _diff_1))
  (rule _diff_4 "7.4"
-  (first "(" ENUM HEX O_ENUM O_RANGE RANGE STRING1 STRING2 SYMBOL)
-  (follow "(" ")" "@pass" "@terminals" ENUM HEX LHS O_ENUM O_RANGE RANGE
-   STRING1 STRING2 SYMBOL _eof "|" )
+  (first "(" HEX O_RANGE RANGE STRING1 STRING2 SYMBOL)
+  (follow "(" ")" "@pass" "@terminals" HEX LHS O_RANGE RANGE STRING1 STRING2
+   SYMBOL _eof "|" )
   (seq postfix))
  (rule postfix "8"
-  (first "(" ENUM HEX O_ENUM O_RANGE RANGE STRING1 STRING2 SYMBOL)
-  (follow "(" ")" "-" "@pass" "@terminals" ENUM HEX LHS O_ENUM O_RANGE RANGE
-   STRING1 STRING2 SYMBOL _eof "|" )
+  (first "(" HEX O_RANGE RANGE STRING1 STRING2 SYMBOL)
+  (follow "(" ")" "-" "@pass" "@terminals" HEX LHS O_RANGE RANGE STRING1
+   STRING2 SYMBOL _eof "|" )
   (seq primary _postfix_1))
  (rule _postfix_1 "8.1"
   (first POSTFIX _eps)
-  (follow "(" ")" "-" "@pass" "@terminals" ENUM HEX LHS O_ENUM O_RANGE RANGE
-   STRING1 STRING2 SYMBOL _eof "|" )
+  (follow "(" ")" "-" "@pass" "@terminals" HEX LHS O_RANGE RANGE STRING1
+   STRING2 SYMBOL _eof "|" )
   (alt _empty POSTFIX))
  (rule _postfix_2 "8.2"
   (first POSTFIX _eps)
-  (follow "(" ")" "-" "@pass" "@terminals" ENUM HEX LHS O_ENUM O_RANGE RANGE
-   STRING1 STRING2 SYMBOL _eof "|" )
+  (follow "(" ")" "-" "@pass" "@terminals" HEX LHS O_RANGE RANGE STRING1
+   STRING2 SYMBOL _eof "|" )
   (seq _postfix_1))
  (rule primary "9"
-  (first "(" ENUM HEX O_ENUM O_RANGE RANGE STRING1 STRING2 SYMBOL)
-  (follow "(" ")" "-" "@pass" "@terminals" ENUM HEX LHS O_ENUM O_RANGE POSTFIX
-   RANGE STRING1 STRING2 SYMBOL _eof "|" )
-  (alt HEX SYMBOL RANGE ENUM O_RANGE O_ENUM STRING1 STRING2 _primary_1))
+  (first "(" HEX O_RANGE RANGE STRING1 STRING2 SYMBOL)
+  (follow "(" ")" "-" "@pass" "@terminals" HEX LHS O_RANGE POSTFIX RANGE
+   STRING1 STRING2 SYMBOL _eof "|" )
+  (alt HEX SYMBOL RANGE O_RANGE STRING1 STRING2 _primary_1))
  (rule _primary_1 "9.1"
   (first "(")
-  (follow "(" ")" "-" "@pass" "@terminals" ENUM HEX LHS O_ENUM O_RANGE POSTFIX
-   RANGE STRING1 STRING2 SYMBOL _eof "|" )
+  (follow "(" ")" "-" "@pass" "@terminals" HEX LHS O_RANGE POSTFIX RANGE
+   STRING1 STRING2 SYMBOL _eof "|" )
   (seq "(" expression ")"))
  (rule _primary_2 "9.2"
-  (first "(" ENUM HEX O_ENUM O_RANGE RANGE STRING1 STRING2 SYMBOL)
-  (follow "(" ")" "-" "@pass" "@terminals" ENUM HEX LHS O_ENUM O_RANGE POSTFIX
-   RANGE STRING1 STRING2 SYMBOL _eof "|" )
+  (first "(" HEX O_RANGE RANGE STRING1 STRING2 SYMBOL)
+  (follow "(" ")" "-" "@pass" "@terminals" HEX LHS O_RANGE POSTFIX RANGE
+   STRING1 STRING2 SYMBOL _eof "|" )
   (seq expression ")"))
  (rule _primary_3 "9.3"
   (first ")")
-  (follow "(" ")" "-" "@pass" "@terminals" ENUM HEX LHS O_ENUM O_RANGE POSTFIX
-   RANGE STRING1 STRING2 SYMBOL _eof "|" )
+  (follow "(" ")" "-" "@pass" "@terminals" HEX LHS O_RANGE POSTFIX RANGE
+   STRING1 STRING2 SYMBOL _eof "|" )
   (seq ")"))
  (rule pass "10"
   (first "@pass")
   (follow "@pass" "@terminals" LHS _eof)
   (seq "@pass" expression))
  (rule _pass_1 "10.1"
-  (first "(" ENUM HEX O_ENUM O_RANGE RANGE STRING1 STRING2 SYMBOL)
+  (first "(" HEX O_RANGE RANGE STRING1 STRING2 SYMBOL)
   (follow "@pass" "@terminals" LHS _eof)
   (seq expression))
- (terminal LHS "11" (seq (opt ENUM) SYMBOL "::="))
+ (terminal LHS "11" (seq (opt (seq "[" (plus SYMBOL) "]")) SYMBOL "::="))
  (terminal SYMBOL "12" (plus (alt (range "a-z") (range "A-Z") (range "0-9") "_" ".")))
- (terminal HEX "13"
-  (seq "#x"
-   (alt (range "0-9") (range "a-f") (range "A-F"))
-   (alt (range "0-9") (range "a-f") (range "A-F"))) )
- (terminal RANGE "14" (seq "[" R_CHAR "-" R_CHAR "]"))
- (terminal ENUM "15" (seq "[" (plus R_CHAR) "]"))
- (terminal O_RANGE "16" (seq "[^" R_CHAR "-" R_CHAR "]"))
- (terminal O_ENUM "17" (seq "[^" (plus R_CHAR) "]"))
- (terminal STRING1 "18" (seq "\"" (star (alt (diff CHAR "\"") "\t")) "\""))
- (terminal STRING2 "19" (seq "'" (star (alt (diff CHAR "'") "\t")) "'"))
- (terminal CHAR "20" (alt HEX (seq "\\" (range "\\trn\"'")) (range "^\t\r\n")))
- (terminal R_CHAR "21" (diff CHAR "]"))
- (terminal POSTFIX "22" (range "?*+"))
- (terminal PASS "23"
+ (terminal HEX "13" (seq "#x" (plus (alt (range "0-9") (range "a-f") (range "A-F")))))
+ (terminal RANGE "14"
+  (seq "[" (plus (alt (seq R_BEGIN (alt HEX R_CHAR)) (alt HEX R_CHAR))) "]"))
+ (terminal O_RANGE "15"
+  (seq "[^" (plus (alt (seq R_BEGIN (alt HEX R_CHAR)) (alt HEX R_CHAR))) "]"))
+ (terminal STRING1 "16" (seq "\"" (star (diff CHAR "\"")) "\""))
+ (terminal STRING2 "17" (seq "'" (diff CHAR "'")))
+ (terminal CHAR "18" (alt HEX (range "#x20#x21#x22") (range "#x24-#x00FFFFFF")))
+ (terminal R_CHAR "19" (diff CHAR "]"))
+ (terminal R_BEGIN "20" (seq (alt HEX R_CHAR) "-"))
+ (terminal POSTFIX "21" (range "?*+"))
+ (terminal PASS "22"
   (plus
    (alt
-    (range "#x20\t\r\n")
-    (seq (alt "#" "//") (star (range "^\r\n")))
-    (seq "/*" (star (alt (opt (seq "*" (range "^/"))) (range "^*"))) "*/")) )) )
+    (range "#x00-#x20")
+    (seq (alt "#" "//") (star (range "^#x0A#x0D")))
+    (seq "/*" (star (alt (opt (seq "*" (range "^/"))) (range "^*"))) "*/")
+    (seq "(*" (star (alt (opt (seq "*" (range "^)"))) (range "^*"))) "*)")) )) )