ebnf 2.0.0 → 2.1.0

data/etc/ebnf.peg.rb

@@ -1,6 +1,6 @@
 # This file is automatically generated by ebnf version 2.0.0
 # Derived from etc/ebnf.ebnf
-module Meta
+module EBNFMeta
   RULES = [
     EBNF::Rule.new(:ebnf, "1", [:star, :_ebnf_1]).extend(EBNF::PEG::Rule),
     EBNF::Rule.new(:_ebnf_1, "1.1", [:alt, :declaration, :rule]).extend(EBNF::PEG::Rule),
@@ -16,14 +16,14 @@ module Meta
     EBNF::Rule.new(:_diff_2, "7.2", [:seq, "-", :postfix]).extend(EBNF::PEG::Rule),
     EBNF::Rule.new(:postfix, "8", [:seq, :primary, :_postfix_1]).extend(EBNF::PEG::Rule),
     EBNF::Rule.new(:_postfix_1, "8.1", [:opt, :POSTFIX]).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:primary, "9", [:alt, :HEX, :SYMBOL, :ENUM, :O_ENUM, :RANGE, :O_RANGE, :STRING1, :STRING2, :_primary_1]).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:primary, "9", [:alt, :HEX, :SYMBOL, :O_RANGE, :RANGE, :STRING1, :STRING2, :_primary_1]).extend(EBNF::PEG::Rule),
     EBNF::Rule.new(:_primary_1, "9.1", [:seq, "(", :expression, ")"]).extend(EBNF::PEG::Rule),
     EBNF::Rule.new(:pass, "10", [:seq, "@pass", :expression]).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_terminals, nil, [:seq], kind: :terminals).extend(EBNF::PEG::Rule),
     EBNF::Rule.new(:LHS, "11", [:seq, :_LHS_1, :SYMBOL, :_LHS_2, "::="], kind: :terminal).extend(EBNF::PEG::Rule),
     EBNF::Rule.new(:_LHS_1, "11.1", [:opt, :_LHS_3], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_LHS_3, "11.3", [:seq, "[", :_LHS_4, "]", :_LHS_5], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_LHS_4, "11.4", [:plus, :SYMBOL], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_LHS_5, "11.5", [:plus, " "], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_LHS_3, "11.3", [:seq, "[", :SYMBOL, "]", :_LHS_4], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_LHS_4, "11.4", [:plus, " "], kind: :terminal).extend(EBNF::PEG::Rule),
     EBNF::Rule.new(:_LHS_2, "11.2", [:star, " "], kind: :terminal).extend(EBNF::PEG::Rule),
     EBNF::Rule.new(:SYMBOL, "12", [:plus, :_SYMBOL_1], kind: :terminal).extend(EBNF::PEG::Rule),
     EBNF::Rule.new(:_SYMBOL_1, "12.1", [:alt, :_SYMBOL_2, :_SYMBOL_3, :_SYMBOL_4, "_", "."], kind: :terminal).extend(EBNF::PEG::Rule),
@@ -36,63 +36,55 @@ module Meta
     EBNF::Rule.new(:_HEX_3, "13.3", [:range, "a-f"], kind: :terminal).extend(EBNF::PEG::Rule),
     EBNF::Rule.new(:_HEX_4, "13.4", [:range, "A-F"], kind: :terminal).extend(EBNF::PEG::Rule),
     EBNF::Rule.new(:_HEX_5, "13.5", [:range, "0-9"], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:ENUM, "14", [:diff, :_ENUM_1, :LHS], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_ENUM_1, "14.1", [:alt, :_ENUM_2, :_ENUM_3], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_ENUM_2, "14.2", [:seq, "[", :_ENUM_4], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_ENUM_4, "14.4", [:plus, :R_CHAR], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_ENUM_3, "14.3", [:seq, :_ENUM_5, "]"], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_ENUM_5, "14.5", [:plus, :HEX], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:O_ENUM, "15", [:alt, :_O_ENUM_1, :_O_ENUM_2], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_O_ENUM_1, "15.1", [:seq, "[^", :_O_ENUM_3], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_O_ENUM_3, "15.3", [:plus, :R_CHAR], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_O_ENUM_2, "15.2", [:seq, :_O_ENUM_4, "]"], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_O_ENUM_4, "15.4", [:plus, :HEX], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:RANGE, "16", [:alt, :_RANGE_1, :_RANGE_2], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_RANGE_1, "16.1", [:seq, "[", :_RANGE_3], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_RANGE_3, "16.3", [:seq, :R_CHAR, "-", :R_CHAR], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_RANGE_2, "16.2", [:seq, :_RANGE_4, "]"], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_RANGE_4, "16.4", [:diff, :HEX, :HEX], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:O_RANGE, "17", [:alt, :_O_RANGE_1, :_O_RANGE_2], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_O_RANGE_1, "17.1", [:seq, "[^", :_O_RANGE_3], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_O_RANGE_3, "17.3", [:seq, :R_CHAR, "-", :R_CHAR], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_O_RANGE_2, "17.2", [:seq, :_O_RANGE_4, "]"], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_O_RANGE_4, "17.4", [:diff, :HEX, :HEX], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:STRING1, "18", [:seq, "\"", :_STRING1_1, "\""], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_STRING1_1, "18.1", [:star, :_STRING1_2], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_STRING1_2, "18.2", [:diff, :CHAR, "\""], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:STRING2, "19", [:seq, "'", :_STRING2_1, "'"], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_STRING2_1, "19.1", [:star, :_STRING2_2], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_STRING2_2, "19.2", [:diff, :CHAR, "'"], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:CHAR, "20", [:alt, :_CHAR_1, :_CHAR_2, :_CHAR_3, :_CHAR_4], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_CHAR_1, "20.1", [:range, "#x9#xA#xD"], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_CHAR_2, "20.2", [:range, "#x20-#xD7FF"], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_CHAR_3, "20.3", [:range, "#xE000-#xFFFD"], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_CHAR_4, "20.4", [:range, "#x10000-#x10FFFF"], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:R_CHAR, "21", [:diff, :CHAR, "]"], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:POSTFIX, "22", [:range, "?*+"], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:PASS, "23", [:plus, :_PASS_1], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_PASS_1, "23.1", [:alt, :_PASS_2, :_PASS_3, :_PASS_4, :_PASS_5], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_PASS_2, "23.2", [:range, "#x00-#x20"], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_PASS_3, "23.3", [:seq, :_PASS_6, :_PASS_7], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_PASS_6, "23.6", [:alt, :_PASS_8, "//"], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_PASS_8, "23.8", [:diff, "#", "#x"], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_PASS_7, "23.7", [:star, :_PASS_9], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_PASS_9, "23.9", [:range, "^#x0A#x0Dx"], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_PASS_4, "23.4", [:seq, "/*", :_PASS_10, "*/"], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_PASS_10, "23.10", [:star, :_PASS_11], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_PASS_11, "23.11", [:alt, :_PASS_12, :_PASS_13], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_PASS_12, "23.12", [:opt, :_PASS_14], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_PASS_14, "23.14", [:seq, "*", :_PASS_15], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_PASS_15, "23.15", [:range, "^/"], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_PASS_13, "23.13", [:range, "^*"], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_PASS_5, "23.5", [:seq, "(*", :_PASS_16, "*)"], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_PASS_16, "23.16", [:star, :_PASS_17], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_PASS_17, "23.17", [:alt, :_PASS_18, :_PASS_19], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_PASS_18, "23.18", [:opt, :_PASS_20], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_PASS_20, "23.20", [:seq, "*", :_PASS_21], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_PASS_21, "23.21", [:range, "^)"], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(:_PASS_19, "23.19", [:range, "^*"], kind: :terminal).extend(EBNF::PEG::Rule),
-    EBNF::Rule.new(nil, nil, [:seq, :PASS], kind: :pass).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:RANGE, "14", [:seq, "[", :_RANGE_1, :_RANGE_2, :_RANGE_3], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_RANGE_1, "14.1", [:plus, :_RANGE_4], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_RANGE_4, "14.4", [:alt, :_RANGE_5, :_RANGE_6, :R_CHAR, :HEX], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_RANGE_5, "14.5", [:seq, :R_CHAR, "-", :R_CHAR], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_RANGE_6, "14.6", [:seq, :HEX, "-", :HEX], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_RANGE_2, "14.2", [:opt, "-"], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_RANGE_3, "14.3", [:diff, "]", :LHS], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:O_RANGE, "15", [:seq, "[^", :_O_RANGE_1, :_O_RANGE_2, "]"], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_O_RANGE_1, "15.1", [:plus, :_O_RANGE_3], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_O_RANGE_3, "15.3", [:alt, :_O_RANGE_4, :_O_RANGE_5, :R_CHAR, :HEX], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_O_RANGE_4, "15.4", [:seq, :R_CHAR, "-", :R_CHAR], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_O_RANGE_5, "15.5", [:seq, :HEX, "-", :HEX], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_O_RANGE_2, "15.2", [:opt, "-"], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:STRING1, "16", [:seq, "\"", :_STRING1_1, "\""], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_STRING1_1, "16.1", [:star, :_STRING1_2], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_STRING1_2, "16.2", [:diff, :CHAR, "\""], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:STRING2, "17", [:seq, "'", :_STRING2_1, "'"], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_STRING2_1, "17.1", [:star, :_STRING2_2], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_STRING2_2, "17.2", [:diff, :CHAR, "'"], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:CHAR, "18", [:alt, :_CHAR_1, :_CHAR_2, :_CHAR_3, :_CHAR_4], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_CHAR_1, "18.1", [:range, "#x9#xA#xD"], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_CHAR_2, "18.2", [:range, "#x20-#xD7FF"], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_CHAR_3, "18.3", [:range, "#xE000-#xFFFD"], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_CHAR_4, "18.4", [:range, "#x10000-#x10FFFF"], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:R_CHAR, "19", [:diff, :CHAR, :_R_CHAR_1], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_R_CHAR_1, "19.1", [:alt, "]", "-", :HEX], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:POSTFIX, "20", [:range, "?*+"], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:PASS, "21", [:alt, :_PASS_1, :_PASS_2, :_PASS_3, :_PASS_4], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_PASS_1, "21.1", [:range, "#x9#xA#xD#x20"], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_PASS_2, "21.2", [:seq, :_PASS_5, :_PASS_6], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_PASS_5, "21.5", [:alt, :_PASS_7, "//"], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_PASS_7, "21.7", [:diff, "#", "#x"], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_PASS_6, "21.6", [:star, :_PASS_8], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_PASS_8, "21.8", [:range, "^#xA#xD"], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_PASS_3, "21.3", [:seq, "/*", :_PASS_9, "*/"], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_PASS_9, "21.9", [:star, :_PASS_10], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_PASS_10, "21.10", [:alt, :_PASS_11, :_PASS_12], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_PASS_11, "21.11", [:opt, :_PASS_13], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_PASS_13, "21.13", [:seq, "*", :_PASS_14], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_PASS_14, "21.14", [:range, "^/"], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_PASS_12, "21.12", [:range, "^*"], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_PASS_4, "21.4", [:seq, "(*", :_PASS_15, "*)"], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_PASS_15, "21.15", [:star, :_PASS_16], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_PASS_16, "21.16", [:alt, :_PASS_17, :_PASS_18], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_PASS_17, "21.17", [:opt, :_PASS_19], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_PASS_19, "21.19", [:seq, "*", :_PASS_20], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_PASS_20, "21.20", [:range, "^)"], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_PASS_18, "21.18", [:range, "^*"], kind: :terminal).extend(EBNF::PEG::Rule),
+    EBNF::Rule.new(:_pass, nil, [:seq, :PASS], kind: :pass).extend(EBNF::PEG::Rule),
   ]
 end
 

data/etc/ebnf.peg.sxp

@@ -1,5 +1,4 @@
     (
-     (pass (seq PASS))
      (rule ebnf "1" (star _ebnf_1))
      (rule _ebnf_1 "1.1" (alt declaration rule))
      (rule declaration "2" (alt "@terminals" pass))
@@ -14,16 +13,15 @@
      (rule _diff_2 "7.2" (seq "-" postfix))
      (rule postfix "8" (seq primary _postfix_1))
      (rule _postfix_1 "8.1" (opt POSTFIX))
-     (rule primary "9"
-      (alt HEX SYMBOL ENUM O_ENUM RANGE O_RANGE STRING1 STRING2 _primary_1))
+     (rule primary "9" (alt HEX SYMBOL O_RANGE RANGE STRING1 STRING2 _primary_1))
      (rule _primary_1 "9.1" (seq "(" expression ")"))
      (rule pass "10" (seq "@pass" expression))
+     (terminals _terminals (seq))
      (terminal LHS "11" (seq _LHS_1 SYMBOL _LHS_2 "::="))
      (terminal _LHS_1 "11.1" (opt _LHS_3))
+     (terminal _LHS_3 "11.3" (seq "[" SYMBOL "]" _LHS_4))
+     (terminal _LHS_4 "11.4" (plus " "))
      (terminal _LHS_2 "11.2" (star " "))
-     (terminal _LHS_3 "11.3" (seq "[" _LHS_4 "]" _LHS_5))
-     (terminal _LHS_4 "11.4" (plus SYMBOL))
-     (terminal _LHS_5 "11.5" (plus " "))
      (terminal SYMBOL "12" (plus _SYMBOL_1))
      (terminal _SYMBOL_1 "12.1" (alt _SYMBOL_2 _SYMBOL_3 _SYMBOL_4 "_" "."))
      (terminal _SYMBOL_2 "12.2" (range "a-z"))
@@ -35,59 +33,52 @@
      (terminal _HEX_3 "13.3" (range "a-f"))
      (terminal _HEX_4 "13.4" (range "A-F"))
      (terminal _HEX_5 "13.5" (range "0-9"))
-     (terminal ENUM "14" (diff _ENUM_1 LHS))
-     (terminal _ENUM_1 "14.1" (alt _ENUM_2 _ENUM_3))
-     (terminal _ENUM_2 "14.2" (seq "[" _ENUM_4))
-     (terminal _ENUM_3 "14.3" (seq _ENUM_5 "]"))
-     (terminal _ENUM_4 "14.4" (plus R_CHAR))
-     (terminal _ENUM_5 "14.5" (plus HEX))
-     (terminal O_ENUM "15" (alt _O_ENUM_1 _O_ENUM_2))
-     (terminal _O_ENUM_1 "15.1" (seq "[^" _O_ENUM_3))
-     (terminal _O_ENUM_2 "15.2" (seq _O_ENUM_4 "]"))
-     (terminal _O_ENUM_3 "15.3" (plus R_CHAR))
-     (terminal _O_ENUM_4 "15.4" (plus HEX))
-     (terminal RANGE "16" (alt _RANGE_1 _RANGE_2))
-     (terminal _RANGE_1 "16.1" (seq "[" _RANGE_3))
-     (terminal _RANGE_2 "16.2" (seq _RANGE_4 "]"))
-     (terminal _RANGE_3 "16.3" (seq R_CHAR "-" R_CHAR))
-     (terminal _RANGE_4 "16.4" (diff HEX HEX))
-     (terminal O_RANGE "17" (alt _O_RANGE_1 _O_RANGE_2))
-     (terminal _O_RANGE_1 "17.1" (seq "[^" _O_RANGE_3))
-     (terminal _O_RANGE_2 "17.2" (seq _O_RANGE_4 "]"))
-     (terminal _O_RANGE_3 "17.3" (seq R_CHAR "-" R_CHAR))
-     (terminal _O_RANGE_4 "17.4" (diff HEX HEX))
-     (terminal STRING1 "18" (seq "\"" _STRING1_1 "\""))
-     (terminal _STRING1_1 "18.1" (star _STRING1_2))
-     (terminal _STRING1_2 "18.2" (diff CHAR "\""))
-     (terminal STRING2 "19" (seq "'" _STRING2_1 "'"))
-     (terminal _STRING2_1 "19.1" (star _STRING2_2))
-     (terminal _STRING2_2 "19.2" (diff CHAR "'"))
-     (terminal CHAR "20" (alt _CHAR_1 _CHAR_2 _CHAR_3 _CHAR_4))
-     (terminal _CHAR_1 "20.1" (range "#x9#xA#xD"))
-     (terminal _CHAR_2 "20.2" (range "#x20-#xD7FF"))
-     (terminal _CHAR_3 "20.3" (range "#xE000-#xFFFD"))
-     (terminal _CHAR_4 "20.4" (range "#x10000-#x10FFFF"))
-     (terminal R_CHAR "21" (diff CHAR "]"))
-     (terminal POSTFIX "22" (range "?*+"))
-     (terminal PASS "23" (plus _PASS_1))
-     (terminal _PASS_1 "23.1" (alt _PASS_2 _PASS_3 _PASS_4 _PASS_5))
-     (terminal _PASS_10 "23.10" (star _PASS_11))
-     (terminal _PASS_11 "23.11" (alt _PASS_12 _PASS_13))
-     (terminal _PASS_12 "23.12" (opt _PASS_14))
-     (terminal _PASS_13 "23.13" (range "^*"))
-     (terminal _PASS_14 "23.14" (seq "*" _PASS_15))
-     (terminal _PASS_15 "23.15" (range "^/"))
-     (terminal _PASS_16 "23.16" (star _PASS_17))
-     (terminal _PASS_17 "23.17" (alt _PASS_18 _PASS_19))
-     (terminal _PASS_18 "23.18" (opt _PASS_20))
-     (terminal _PASS_19 "23.19" (range "^*"))
-     (terminal _PASS_2 "23.2" (range "#x00-#x20"))
-     (terminal _PASS_20 "23.20" (seq "*" _PASS_21))
-     (terminal _PASS_21 "23.21" (range "^)"))
-     (terminal _PASS_3 "23.3" (seq _PASS_6 _PASS_7))
-     (terminal _PASS_4 "23.4" (seq "/*" _PASS_10 "*/"))
-     (terminal _PASS_5 "23.5" (seq "(*" _PASS_16 "*)"))
-     (terminal _PASS_6 "23.6" (alt _PASS_8 "//"))
-     (terminal _PASS_7 "23.7" (star _PASS_9))
-     (terminal _PASS_8 "23.8" (diff "#" "#x"))
-     (terminal _PASS_9 "23.9" (range "^#x0A#x0Dx")))
+     (terminal RANGE "14" (seq "[" _RANGE_1 _RANGE_2 _RANGE_3))
+     (terminal _RANGE_1 "14.1" (plus _RANGE_4))
+     (terminal _RANGE_4 "14.4" (alt _RANGE_5 _RANGE_6 R_CHAR HEX))
+     (terminal _RANGE_5 "14.5" (seq R_CHAR "-" R_CHAR))
+     (terminal _RANGE_6 "14.6" (seq HEX "-" HEX))
+     (terminal _RANGE_2 "14.2" (opt "-"))
+     (terminal _RANGE_3 "14.3" (diff "]" LHS))
+     (terminal O_RANGE "15" (seq "[^" _O_RANGE_1 _O_RANGE_2 "]"))
+     (terminal _O_RANGE_1 "15.1" (plus _O_RANGE_3))
+     (terminal _O_RANGE_3 "15.3" (alt _O_RANGE_4 _O_RANGE_5 R_CHAR HEX))
+     (terminal _O_RANGE_4 "15.4" (seq R_CHAR "-" R_CHAR))
+     (terminal _O_RANGE_5 "15.5" (seq HEX "-" HEX))
+     (terminal _O_RANGE_2 "15.2" (opt "-"))
+     (terminal STRING1 "16" (seq "\"" _STRING1_1 "\""))
+     (terminal _STRING1_1 "16.1" (star _STRING1_2))
+     (terminal _STRING1_2 "16.2" (diff CHAR "\""))
+     (terminal STRING2 "17" (seq "'" _STRING2_1 "'"))
+     (terminal _STRING2_1 "17.1" (star _STRING2_2))
+     (terminal _STRING2_2 "17.2" (diff CHAR "'"))
+     (terminal CHAR "18" (alt _CHAR_1 _CHAR_2 _CHAR_3 _CHAR_4))
+     (terminal _CHAR_1 "18.1" (range "#x9#xA#xD"))
+     (terminal _CHAR_2 "18.2" (range "#x20-#xD7FF"))
+     (terminal _CHAR_3 "18.3" (range "#xE000-#xFFFD"))
+     (terminal _CHAR_4 "18.4" (range "#x10000-#x10FFFF"))
+     (terminal R_CHAR "19" (diff CHAR _R_CHAR_1))
+     (terminal _R_CHAR_1 "19.1" (alt "]" "-" HEX))
+     (terminal POSTFIX "20" (range "?*+"))
+     (terminal PASS "21" (alt _PASS_1 _PASS_2 _PASS_3 _PASS_4))
+     (terminal _PASS_1 "21.1" (range "#x9#xA#xD#x20"))
+     (terminal _PASS_2 "21.2" (seq _PASS_5 _PASS_6))
+     (terminal _PASS_5 "21.5" (alt _PASS_7 "//"))
+     (terminal _PASS_7 "21.7" (diff "#" "#x"))
+     (terminal _PASS_6 "21.6" (star _PASS_8))
+     (terminal _PASS_8 "21.8" (range "^#xA#xD"))
+     (terminal _PASS_3 "21.3" (seq "/*" _PASS_9 "*/"))
+     (terminal _PASS_9 "21.9" (star _PASS_10))
+     (terminal _PASS_10 "21.10" (alt _PASS_11 _PASS_12))
+     (terminal _PASS_11 "21.11" (opt _PASS_13))
+     (terminal _PASS_13 "21.13" (seq "*" _PASS_14))
+     (terminal _PASS_14 "21.14" (range "^/"))
+     (terminal _PASS_12 "21.12" (range "^*"))
+     (terminal _PASS_4 "21.4" (seq "(*" _PASS_15 "*)"))
+     (terminal _PASS_15 "21.15" (star _PASS_16))
+     (terminal _PASS_16 "21.16" (alt _PASS_17 _PASS_18))
+     (terminal _PASS_17 "21.17" (opt _PASS_19))
+     (terminal _PASS_19 "21.19" (seq "*" _PASS_20))
+     (terminal _PASS_20 "21.20" (range "^)"))
+     (terminal _PASS_18 "21.18" (range "^*"))
+     (pass _pass (seq PASS)))

data/etc/ebnf.sxp

@@ -1,5 +1,4 @@
     (
-     (pass (seq PASS))
      (rule ebnf "1" (star (alt declaration rule)))
      (rule declaration "2" (alt "@terminals" pass))
      (rule rule "3" (seq LHS expression))
@@ -9,29 +8,33 @@
      (rule diff "7" (seq postfix (opt (seq "-" postfix))))
      (rule postfix "8" (seq primary (opt POSTFIX)))
      (rule primary "9"
-      (alt HEX SYMBOL ENUM O_ENUM RANGE O_RANGE STRING1 STRING2 (seq "(" expression ")")))
+      (alt HEX SYMBOL O_RANGE RANGE STRING1 STRING2 (seq "(" expression ")")))
      (rule pass "10" (seq "@pass" expression))
-     (terminal LHS "11" (seq (opt (seq "[" (plus SYMBOL) "]" (plus " "))) SYMBOL (star " ") "::="))
+     (terminals _terminals (seq))
+     (terminal LHS "11" (seq (opt (seq "[" SYMBOL "]" (plus " "))) SYMBOL (star " ") "::="))
      (terminal SYMBOL "12" (plus (alt (range "a-z") (range "A-Z") (range "0-9") "_" ".")))
      (terminal HEX "13" (seq "#x" (plus (alt (range "a-f") (range "A-F") (range "0-9")))))
-     (terminal ENUM "14" (diff (alt (seq "[" (plus R_CHAR)) (seq (plus HEX) "]")) LHS))
-     (terminal O_ENUM "15" (alt (seq "[^" (plus R_CHAR)) (seq (plus HEX) "]")))
-     (terminal RANGE "16" (alt (seq "[" (seq R_CHAR "-" R_CHAR)) (seq (diff HEX HEX) "]")))
-     (terminal O_RANGE "17" (alt (seq "[^" (seq R_CHAR "-" R_CHAR)) (seq (diff HEX HEX) "]")))
-     (terminal STRING1 "18" (seq "\"" (star (diff CHAR "\"")) "\""))
-     (terminal STRING2 "19" (seq "'" (star (diff CHAR "'")) "'"))
-     (terminal CHAR "20"
+     (terminal RANGE "14"
+      (seq "["
+       (plus (alt (seq R_CHAR "-" R_CHAR) (seq HEX "-" HEX) R_CHAR HEX))
+       (opt "-")
+       (diff "]" LHS)) )
+     (terminal O_RANGE "15"
+      (seq "[^" (plus (alt (seq R_CHAR "-" R_CHAR) (seq HEX "-" HEX) R_CHAR HEX)) (opt "-") "]"))
+     (terminal STRING1 "16" (seq "\"" (star (diff CHAR "\"")) "\""))
+     (terminal STRING2 "17" (seq "'" (star (diff CHAR "'")) "'"))
+     (terminal CHAR "18"
       (alt
        (range "#x9#xA#xD")
        (range "#x20-#xD7FF")
        (range "#xE000-#xFFFD")
        (range "#x10000-#x10FFFF")) )
-     (terminal R_CHAR "21" (diff CHAR "]"))
-     (terminal POSTFIX "22" (range "?*+"))
-     (terminal PASS "23"
-      (plus
-       (alt
-        (range "#x00-#x20")
-        (seq (alt (diff "#" "#x") "//") (star (range "^#x0A#x0Dx")))
-        (seq "/*" (star (alt (opt (seq "*" (range "^/"))) (range "^*"))) "*/")
-        (seq "(*" (star (alt (opt (seq "*" (range "^)"))) (range "^*"))) "*)")) )) )
+     (terminal R_CHAR "19" (diff CHAR (alt "]" "-" HEX)))
+     (terminal POSTFIX "20" (range "?*+"))
+     (terminal PASS "21"
+      (alt
+       (range "#x9#xA#xD#x20")
+       (seq (alt (diff "#" "#x") "//") (star (range "^#xA#xD")))
+       (seq "/*" (star (alt (opt (seq "*" (range "^/"))) (range "^*"))) "*/")
+       (seq "(*" (star (alt (opt (seq "*" (range "^)"))) (range "^*"))) "*)")) )
+     (pass _pass (seq PASS)))

data/etc/iso-ebnf.ebnf

@@ -0,0 +1,140 @@
+# W3C EBNF for ISO/IEC 14977 : 1996 EBNF
+# (Scoured from https://www.cl.cam.ac.uk/~mgk25/iso-14977.pdf)
+
+# Extended to allow no syntax_rule to be valid.
+syntax                      ::= syntax_rule*
+
+syntax_rule                 ::= meta_identifier defining_symbol definitions_list terminator_symbol
+                                (* A <syntax rule> defines the sequences of
+                                   symbols represented by a <meta identifier> *)
+
+definitions_list            ::= single_definition (definition_separator_symbol definitions_list)*
+                                (* | separates alternative <single definitions> *)
+
+single_definition           ::= term (',' term)*
+                                (* , separates successive <terms> *)
+
+term                        ::= factor ('-' exception)?
+                                (* A <term> represents any sequence of symbols that is defined by the <factor> but
+                                   not defined by the <exception> *)
+
+exception                   ::= factor
+                                (* A <factor> may be used as an <exception>
+                                   if it could be replaced by a <factor>
+                                    containingno<metaidentifiers> *)
+
+factor                      ::= (integer '*')? primary
+                                (* The <integer> specifies the number of repetitions of the <primary> *)
+
+primary                     ::= optional_sequence
+                              | repeated_sequence
+                              | special_sequence
+                              | grouped_sequence
+                              | meta_identifier
+                              | terminal_string
+                              | empty
+
+optional_sequence           ::= start_option_symbol definitions_list end_option_symbol
+                                (* The brackets [ and ] enclose symbols which are optional *)
+
+repeated_sequence           ::= start_repeat_symbol definitions_list end_repeat_symbol
+                                (* The brackets { and } enclose symbols
+                                   which may be repeated any number of times *)
+
+grouped_sequence            ::= '(' definitions_list ')'
+                                (* The brackets ( and ) allow any <definitions list> to be a <primary> *)
+
+# Note, the following are nominally terminal rules,
+# although ISO EBNF does not really distinguish between non-terminal and terminal rules.
+
+@terminals
+
+terminal_string             ::= ("'" first_terminal_character+ "'")
+                              | ('"' second_terminal_character+ '"')
+                                (* A <terminal string> represents the
+                                   <characters> between the quote symbols '_' or "_" *)
+
+meta_identifier             ::= letter meta_identifier_character*
+                                (* A <meta identifier> is the name of a syntactic element of the language being defined *)
+
+integer                     ::= decimal_digit+
+
+special_sequence            ::= '?' special_sequence_character* '?'
+                                (* The meaning of a <special sequence> is not defined in the standard metalanguage. *)
+
+comment                     ::= start_comment_symbol comment_symbol* end_comment_symbol
+                                (* A comment is allowed anywhere outside a
+                                   <terminal string>, <meta identifier>,
+                                   <integer> or <special sequence> *)
+
+comment_symbol              ::= comment | commentless_symbol | other_character
+
+commentless_symbol          ::= terminal_character | meta_identifier | integer
+                              | terminal_string | special_sequence
+
+letter                      ::= [a-zA-Z]
+# gratuitous comment
+decimal_digit               ::= [0-9]
+
+# Extended to allow '_'
+meta_identifier_character   ::= letter | decimal_digit | '_'
+
+first_terminal_character    ::= terminal_character - "'"
+
+second_terminal_character   ::= terminal_character - '"'
+
+special_sequence_character  ::= terminal_character - '?'
+
+terminal_character          ::= letter
+                              | decimal_digit
+                              | concatenate_symbol
+                              | defining_symbol
+                              | definition_separator_symbol
+                              | end_comment_symbol
+                              | end_group_symbol
+                              | end_option_symbol
+                              | end_repeat_symbol
+                              | except_symbol
+                              | first_quote_symbol
+                              | repetition_symbol
+                              | second_quote_symbol
+                              | special_sequence_symbol
+                              | start_comment_symbol
+                              | start_group_symbol
+                              | start_option_symbol
+                              | start_repeat_symbol
+                              | terminator_symbol
+                              | other_character
+
+other_character            ::= [:+_%@&$<>^` ̃#x20#x23] | '\'
+
+gap_separator              ::= [#x9#xa#xb#xc#xd#x20]
+
+@pass                           gap_separator+ | comment
+
+empty                      ::= ''
+
+concatenate_symbol         ::= ','
+repetition_symbol          ::= '*'
+except_symbol              ::= '-'
+first_quote_symbol         ::= "'"
+second_quote_symbol        ::= '"'
+start_comment_symbol       ::= '(*'
+end_comment_symbol         ::= '*)'
+start_group_symbol         ::= '('
+end_group_symbol           ::= ')'
+special_sequence_symbol    ::= '?'
+
+# Simple terminals that are often extended
+defining_symbol            ::= '=' | ':'
+definition_separator_symbol ::= '|' | '/' | '!'
+terminator_symbol          ::= ';' | '.'
+start_option_symbol        ::= '['
+end_option_symbol          ::= ']'
+start_repeat_symbol        ::= '{' | '(:'
+end_repeat_symbol          ::= '}' | ':)'
+
+# Symbols described, but not actually used.
+
+gap_free_symbol            ::= (terminal_character - ['"])
+                             | terminal_string