ebnf 2.4.0 → 2.5.0

data/lib/ebnf/native.rb

@@ -33,6 +33,7 @@ module EBNF
         when s = scanner.scan(/\A["']/)
           # Found a quote, scan until end of matching quote
           s += scanner.scan_until(/#{scanner.matched}|$/)
+          s.quote_style = scanner.matched == "'" ? :squote : :dquote
           r += s
         when s = scanner.scan(%r(^@terminals))
           #debug("eachRule(@terminals)") { "[#{cur_lineno}] #{s.inspect}" }
@@ -287,11 +288,11 @@ module EBNF
       case m = s[0,1]
       when '"', "'" # STRING1 or STRING2
         l, s = s[1..-1].split(m.rstrip, 2)
-        [Unescape.unescape_string(l), s]
+        [Unescape.unescape(l).tap {|str| str.quote_style = (m == "'" ? :squote : :dquote)}, s]
       when '[' # RANGE, O_RANGE
         # Includes RANGE and O_RANGE which can't include a ']'
         l, s = s[1..-1].split(']', 2)
-        [[:range, Unescape.unescape_string(l)], s]
+        [[:range, Unescape.unescape(l)], s]
       when '#' # HEX
         s.match(/(#x\h+)(.*)$/)
         l, s = $1, $2

data/lib/ebnf/parser.rb

@@ -63,14 +63,16 @@ module EBNF
     #
     #     [16] STRING1    ::= '"' (CHAR - '"')* '"'
     terminal(:STRING1, STRING1) do |value|
-      value[1..-2]
+      using ::EBNF
+      value[1..-2].tap {|s| s.quote_style = :dquote}
     end
 
     # Match single quote string
     #
     #     [17] STRING2    ::= "'" (CHAR - "'")* "'"
     terminal(:STRING2, STRING2) do |value|
-      value[1..-2]
+      using ::EBNF
+      value[1..-2].tap {|s| s.quote_style = :squote}
     end
 
     # The `CHAR` and `R_CHAR` productions are not used explicitly

data/lib/ebnf/rule.rb

@@ -1,5 +1,6 @@
 require 'scanf'
 require 'strscan'
+require 'sxp' unless defined?(SXP)
 
 module EBNF
   # Represent individual parsed rules
@@ -158,7 +159,6 @@ module EBNF
     # @return [Rule]
     def self.from_sxp(sxp)
       if sxp.is_a?(String)
-        require 'sxp' unless defined?(SXP)
         sxp = SXP.parse(sxp)
       end
       expr = sxp.detect {|e| e.is_a?(Array) && ![:first, :follow, :start].include?(e.first.to_sym)}
@@ -209,7 +209,6 @@ module EBNF
     #
     # @return [String]
     def to_sxp(**options)
-      require 'sxp' unless defined?(SXP)
       for_sxp.to_sxp(**options)
     end
 

data/lib/ebnf/unescape.rb

@@ -48,7 +48,7 @@ module EBNF::Unescape
   # @return [String]
   # @see    https://www.w3.org/TR/rdf-sparql-query/#grammarEscapes
   def unescape_string(input)
-    input.gsub(ECHAR) { |escaped| ESCAPE_CHARS[escaped] || escaped[1..-1]}
+    input.gsub(ECHAR) {|escaped| ESCAPE_CHARS[escaped] || escaped}
   end
   module_function :unescape_string
 

data/lib/ebnf/writer.rb

@@ -243,9 +243,9 @@ module EBNF
       # Format each rule, considering the available rhs size
       rules.each do |rule|
         buffer = if rule.pass?
-          "\n%-#{lhs_length-2}s      " % "@pass"
+          "\n%-#{lhs_length-2}s      " % '@pass'
         elsif rule.kind == :terminals
-          "\n%-#{lhs_length-2}s" % "@terminals"
+          "\n%-#{lhs_length-2}s" % '@terminals'
         else
           lhs_fmt % {id: "[#{rule.id}]", sym: rule.sym}
         end
@@ -285,7 +285,7 @@ module EBNF
       if expr.is_a?(String)
         return expr.length == 1 ?
           format_ebnf_char(expr) :
-          format_ebnf_string(expr, expr.include?('"') ? "'" : '"')
+          format_ebnf_string(expr)
       end
       parts = {
         alt:    (@options[:html] ? %(<code class="grammar-alt">|</code> ) : "| "),
@@ -354,11 +354,12 @@ module EBNF
 
     # Format a single-character string, prefering hex for non-main ASCII
     def format_ebnf_char(c)
+      quote = c.as_dquote? ? '"' : "'"
       case c.ord
-      when (0x21)         then (@options[:html] ? %("<code class="grammar-literal">#{@coder.encode c}</code>") : %{"#{c}"})
+      when 0x21           then (@options[:html] ? %("<code class="grammar-literal">#{@coder.encode c}</code>") : %{"#{c}"})
       when 0x22           then (@options[:html] ? %('<code class="grammar-literal">&quot;</code>') : %{'"'})
-      when (0x23..0x7e)   then (@options[:html] ? %("<code class="grammar-literal">#{@coder.encode c}</code>") : %{"#{c}"})
-      when (0x80..0xFFFD) then (@options[:html] ? %("<code class="grammar-literal">#{@coder.encode c}</code>") : %{"#{c}"})
+      when (0x23..0x7e)   then (@options[:html] ? %(#{quote}<code class="grammar-literal">#{@coder.encode c}</code>#{quote}) : %{#{quote}#{c}#{quote}})
+      when (0x80..0xFFFD) then (@options[:html] ? %(#{quote}<code class="grammar-literal">#{@coder.encode c}</code>#{quote}) : %{#{quote}#{c}#{quote}})
       else                     escape_ebnf_hex(c)
       end
     end
@@ -384,7 +385,8 @@ module EBNF
     end
 
     # Escape a string, using as many UTF-8 characters as possible
-    def format_ebnf_string(string, quote = '"')
+    def format_ebnf_string(string)
+      quote = string.as_dquote? ? '"' : "'"
       string.each_char do |c|
         case c.ord
         when 0x00..0x19, quote.ord

data/lib/ebnf.rb

@@ -1,3 +1,5 @@
+require 'sxp' unless defined?(SXP)
+
 module EBNF
   autoload :ABNF,     "ebnf/abnf"
   autoload :Base,     "ebnf/base"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ebnf
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-01 00:00:00.000000000 Z
+date: 2023-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sxp
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: scanf
   requirement: !ruby/object:Gem::Requirement
@@ -242,16 +242,9 @@ files:
 - etc/iso-ebnf.isoebnf
 - etc/iso-ebnf.sxp
 - etc/sparql.ebnf
-- etc/sparql.html
-- etc/sparql.ll1.sxp
-- etc/sparql.peg.rb
-- etc/sparql.peg.sxp
 - etc/sparql.sxp
 - etc/turtle.ebnf
 - etc/turtle.html
-- etc/turtle.ll1.rb
-- etc/turtle.ll1.sxp
-- etc/turtle.peg.rb
 - etc/turtle.peg.sxp
 - etc/turtle.sxp
 - lib/ebnf.rb
@@ -300,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: EBNF parser and parser generator in Ruby.