ebnf 0.3.5 → 0.3.6

data/etc/ebnf.rb

@@ -6,9 +6,7 @@ module Branch
   BRANCH = {
     :alt => {
       "(" => [:seq, :_alt_1],
-      :ENUM => [:seq, :_alt_1],
       :HEX => [:seq, :_alt_1],
-      :O_ENUM => [:seq, :_alt_1],
       :O_RANGE => [:seq, :_alt_1],
       :RANGE => [:seq, :_alt_1],
       :STRING1 => [:seq, :_alt_1],
@@ -34,9 +32,7 @@ module Branch
     },
     :diff => {
       "(" => [:postfix, :_diff_1],
-      :ENUM => [:postfix, :_diff_1],
       :HEX => [:postfix, :_diff_1],
-      :O_ENUM => [:postfix, :_diff_1],
       :O_RANGE => [:postfix, :_diff_1],
       :RANGE => [:postfix, :_diff_1],
       :STRING1 => [:postfix, :_diff_1],
@@ -49,10 +45,8 @@ module Branch
       "-" => [:_diff_2],
       "@pass" => [],
       "@terminals" => [],
-      :ENUM => [],
       :HEX => [],
       :LHS => [],
-      :O_ENUM => [],
       :O_RANGE => [],
       :RANGE => [],
       :STRING1 => [],
@@ -80,9 +74,7 @@ module Branch
     },
     :expression => {
       "(" => [:alt],
-      :ENUM => [:alt],
       :HEX => [:alt],
-      :O_ENUM => [:alt],
       :O_RANGE => [:alt],
       :RANGE => [:alt],
       :STRING1 => [:alt],
@@ -94,9 +86,7 @@ module Branch
     },
     :postfix => {
       "(" => [:primary, :_postfix_1],
-      :ENUM => [:primary, :_postfix_1],
       :HEX => [:primary, :_postfix_1],
-      :O_ENUM => [:primary, :_postfix_1],
       :O_RANGE => [:primary, :_postfix_1],
       :RANGE => [:primary, :_postfix_1],
       :STRING1 => [:primary, :_postfix_1],
@@ -109,10 +99,8 @@ module Branch
       "-" => [],
       "@pass" => [],
       "@terminals" => [],
-      :ENUM => [],
       :HEX => [],
       :LHS => [],
-      :O_ENUM => [],
       :O_RANGE => [],
       :POSTFIX => [:POSTFIX],
       :RANGE => [],
@@ -123,9 +111,7 @@ module Branch
     },
     :primary => {
       "(" => [:_primary_1],
-      :ENUM => [:ENUM],
       :HEX => [:HEX],
-      :O_ENUM => [:O_ENUM],
       :O_RANGE => [:O_RANGE],
       :RANGE => [:RANGE],
       :STRING1 => [:STRING1],
@@ -140,9 +126,7 @@ module Branch
     },
     :seq => {
       "(" => [:diff, :_seq_1],
-      :ENUM => [:diff, :_seq_1],
       :HEX => [:diff, :_seq_1],
-      :O_ENUM => [:diff, :_seq_1],
       :O_RANGE => [:diff, :_seq_1],
       :RANGE => [:diff, :_seq_1],
       :STRING1 => [:diff, :_seq_1],
@@ -154,10 +138,8 @@ module Branch
       ")" => [],
       "@pass" => [],
       "@terminals" => [],
-      :ENUM => [:_seq_2],
       :HEX => [:_seq_2],
       :LHS => [],
-      :O_ENUM => [:_seq_2],
       :O_RANGE => [:_seq_2],
       :RANGE => [:_seq_2],
       :STRING1 => [:_seq_2],
@@ -167,9 +149,7 @@ module Branch
     },
     :_seq_2 => {
       "(" => [:diff, :_seq_1],
-      :ENUM => [:diff, :_seq_1],
       :HEX => [:diff, :_seq_1],
-      :O_ENUM => [:diff, :_seq_1],
       :O_RANGE => [:diff, :_seq_1],
       :RANGE => [:diff, :_seq_1],
       :STRING1 => [:diff, :_seq_1],
@@ -183,10 +163,8 @@ module Branch
     "-",
     "@pass",
     "@terminals",
-    :ENUM,
     :HEX,
     :LHS,
-    :O_ENUM,
     :O_RANGE,
     :POSTFIX,
     :RANGE,
@@ -200,9 +178,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "("],
@@ -223,9 +199,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "("],
@@ -236,9 +210,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "("],
@@ -254,9 +226,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "("],
@@ -284,9 +254,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "("],
@@ -296,9 +264,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "("],
@@ -306,9 +272,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "("],
@@ -322,9 +286,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "("],
@@ -334,9 +296,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "("],
@@ -348,9 +308,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "("],
@@ -358,9 +316,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "("],
@@ -369,9 +325,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "("],
@@ -379,9 +333,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "("],
@@ -390,9 +342,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "("],
@@ -401,9 +351,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "("],
@@ -465,9 +413,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "@terminals",
@@ -481,9 +427,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "@terminals",
@@ -497,9 +441,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "@terminals",
@@ -513,9 +455,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "@terminals",
@@ -529,9 +469,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "@terminals",
@@ -573,9 +511,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "@terminals",
@@ -590,9 +526,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "@terminals",
@@ -607,9 +541,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "@terminals",
@@ -625,9 +557,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "@terminals",
@@ -643,9 +573,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "@terminals",
@@ -661,9 +589,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "@terminals",
@@ -679,9 +605,7 @@ module Branch
       :HEX,
       :SYMBOL,
       :RANGE,
-      :ENUM,
       :O_RANGE,
-      :O_ENUM,
       :STRING1,
       :STRING2,
       "@terminals",

data/etc/ebnf.sxp

@@ -9,26 +9,25 @@
  (rule diff "7" (seq postfix (opt (seq "-" postfix))))
  (rule postfix "8" (seq primary (opt POSTFIX)))
  (rule primary "9"
-  (alt HEX SYMBOL RANGE ENUM O_RANGE O_ENUM STRING1 STRING2 (seq "(" expression ")")))
+  (alt HEX SYMBOL RANGE O_RANGE STRING1 STRING2 (seq "(" expression ")")))
  (rule pass "10" (seq "@pass" 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 "^*"))) "*)")) )) )

data/lib/ebnf/base.rb

@@ -183,6 +183,13 @@ module EBNF
       Writer.string(*ast)
     end
 
+    ##
+    # Output formatted EBNF as HTML
+    # @return [String]
+    def to_html
+      Writer.html(*ast)
+    end
+
     def dup
       new_obj = super
       new_obj.instance_variable_set(:@ast, @ast.dup)

data/lib/ebnf/ll1/scanner.rb

@@ -57,7 +57,23 @@ module EBNF::LL1
       feed_me
       super
     end
-    
+
+    ##
+    # Returns true if the scan pointer is at the end of the string
+    #
+    # @return [Boolean]
+    def eos?
+      feed_me
+      super
+    end
+
+    ##
+    # Set the scan pointer to the end of the string and clear matching data
+    def terminate
+      feed_me
+      super
+    end
+
     ##
     # Tries to match with `pattern` at the current position.
     #