Fix native parsing of RANGE containing a backslash.

dryruby · Jun 2, 2023 · 5685540 · 5685540
1 parent 16dadca
commit 5685540
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/ebnf/native.rb b/lib/ebnf/native.rb
@@ -289,7 +289,8 @@ def terminal(s)
         l, s = s[1..-1].split(m.rstrip, 2)
         [Unescape.unescape_string(l), s]
       when '[' # RANGE, O_RANGE
-        l, s = s[1..-1].split(/(?<=[^\\])\]/, 2)
+        # Includes RANGE and O_RANGE which can't include a ']'
+        l, s = s[1..-1].split(']', 2)
         [[:range, Unescape.unescape_string(l)], s]
       when '#' # HEX
         s.match(/(#x\h+)(.*)$/)

diff --git a/spec/writer_spec.rb b/spec/writer_spec.rb
@@ -107,6 +107,10 @@
           %{[2]     Prolog    ::=           BaseDecl? PrefixDecl*},
           %{[2] Prolog ::= BaseDecl? PrefixDecl*\n}
         ],
+        backslash: [
+          %{LHS ::= [^'\] | ECHAR},
+          %{LHS ::= [^'\] | ECHAR\n}
+        ]
       }.each do |title, (grammar, plain)|
         context title do
           subject {EBNF::Base.new(grammar, format: :native).ast}