abnftt 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e6933b3f5ea91221735a98fe3546dd85b0f6518f7c9d679b05a2cb110da886d
-  data.tar.gz: f4a5e5a932367c09c0d50fd07e06880917b5cac56a3ff0414e7a1660a97f21dd
+  metadata.gz: 04255d41adaa0533aee35d5a8801909406f679e1e9d3b353c7648dc1dace1836
+  data.tar.gz: 460fa154e1d99877e444177a5f4df9fd91f6b811b91175dc84dc3bc57c55dd4e
 SHA512:
-  metadata.gz: 9c2ee28b5a7d49da94691310541782e4e227432f1c1cd5690b0cccd48dad6c4c2d0cfb4a113784fb043bab1ca95c8569b10c315483abe05b59fd58d8a26a4197
-  data.tar.gz: f9ba70bcc72a526da42c94917ca21a768479e5de8127982c5d61c832901a7ff9868285d63bbd23fb4c8fee6c9e0f2cfbf09a708da47b5f982461ea613e76c2a4
+  metadata.gz: 9850c97066a8320430de8c74fcac0aced968c6abde74f5a4ae260396de2219fa3e1c56d9a770ddac379a94a0b59e1f5d8d47ed1e0f835bf37c42bc18b35c036a
+  data.tar.gz: ab886d8248c6ce0b480d0540e86c67edc6120a475bdca94fa80f0aabe6b3db39d24454776c1bec9939bdb3404e67378800ab0dd5600842ac618140f5a2ffa0a6

data/abnftt.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "abnftt"
-  s.version = "0.2.8"
+  s.version = "0.2.9"
   s.summary = "RFC 5234+7405 ABNF to Treetop"
   s.description = %q{Less shifty support for tools based on IETF's ABNF}
   s.author = "Carsten Bormann"

data/lib/abnftt/abnf-util.rb

@@ -253,6 +253,21 @@ class ABNF
         case here
         in ["alt", ["cs", c1], ["cs", c2]] if c1.downcase == c2 && c2.upcase == c1
           [true, ["ci", c1]]
+        in [*rest1, ["cs", c1], ["cs", c2], *rest2] if c1.downcase == c2 && c2.upcase == c1
+          # warn [:PEEP, rest1, c1, c2, rest2].inspect
+          if rest1[0] == "alt"
+            [true, detect_ci([*rest1, ["ci", c1], *rest2])]
+          else
+            false
+          end
+        # This isn't complete...
+        in [*rest1, ["cs", c0], ["cs", c1], ["cs", c2], *rest2] if c1.downcase == c2 && c2.upcase == c1
+          # warn [:PEEP2, rest1, c0, c1, c2, rest2].inspect
+          if rest1[0] == "alt"
+            [true, detect_ci([*rest1, ["cs", c0], ["ci", c1], *rest2])]
+          else
+            false
+          end
         else
           false
         end
@@ -347,6 +362,40 @@ class ABNF
                        end
                      end)]
                   end])
+    replacements = Hash[
+      rules.map{|k, v|
+        [v, k] if String === v && /^sq-a\d+$/ === v
+      }.compact]
+    # warn [:REPLA, replacements].inspect
+    used = {}
+    used[rules.first.first] = true
+    rules.each do |k, v|
+      visit(v) do |here|
+        if String === here
+          if r = replacements[here]
+            used[r] = true
+          else
+            used[here] = true
+          end
+        end
+      end
+    end
+    # TODO: Should not do a h-x09
+    # warn [:USED, used].inspect
+    rules.replace(Hash[rules.map {|k, v|
+                         unless replacements[k] || !used[k]
+                           if r = replacements[v]
+                             v = rules[v]
+                           end
+                           v = visit(v) do |here|
+                             if String === here && (r = replacements[here])
+                               # warn [:R, v, r].inspect
+                               [true, r]
+                             end
+                           end
+                           [k, v]
+                         end
+                       }.compact])
   end
 
   def share_hex_1(prod, rules)
@@ -368,12 +417,13 @@ class ABNF
         name = "x#{c6l}#{c6r}"
         rules[name] ||= here
         [true, name]
-      in ["char-range", l, r] if l >= "0" && r <= "9"
-        name = "x#{l}#{r}"
-        rules[name] ||= here
-        [true, name]
+      # in ["char-range", l, r] if l >= "0" && r <= "9"
+      #   name = "x#{l}#{r}"
+      #   rules[name] ||= here
+      #   [true, name]
       in ["seq", ["cs", "\\u"], *rest]
         suff = "0"
+        rest = rest.map {|r| share_hex_1(r, rules) }
         case rest
         in [["alt", [/^c./, hex], *], *]
           name = "u-#{hex}"

data/lib/abnftt/abnf-writer.rb

@@ -93,6 +93,11 @@ class ABNF
       while l[-1].size > col
         breakpoint = l[-1][0...col].rindex(' ')
         break unless breakpoint && breakpoint > 4
+        while (partial = l[-1][0...breakpoint]).count('"').odd?
+          break1 = partial.rindex('"')
+          breakpoint = l[-1][0...break1].rindex(' ')
+          break unless breakpoint && breakpoint > 4
+        end
         l[-1..-1] = [
           l[-1][0...breakpoint],
           "    " << l[-1][breakpoint+1..-1]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: abnftt
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Carsten Bormann