abnftt 0.2.8 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e6933b3f5ea91221735a98fe3546dd85b0f6518f7c9d679b05a2cb110da886d
-  data.tar.gz: f4a5e5a932367c09c0d50fd07e06880917b5cac56a3ff0414e7a1660a97f21dd
+  metadata.gz: 9a087059291d32ed775f03eb1c32af6b495f84ecbaa5769fb6063f8ec649e67d
+  data.tar.gz: b3fc37446f104478bee6dfc52e762ea173368c00a3b4d11a677259b05cd29bb1
 SHA512:
-  metadata.gz: 9c2ee28b5a7d49da94691310541782e4e227432f1c1cd5690b0cccd48dad6c4c2d0cfb4a113784fb043bab1ca95c8569b10c315483abe05b59fd58d8a26a4197
-  data.tar.gz: f9ba70bcc72a526da42c94917ca21a768479e5de8127982c5d61c832901a7ff9868285d63bbd23fb4c8fee6c9e0f2cfbf09a708da47b5f982461ea613e76c2a4
+  metadata.gz: eaab019ed235a73be1f8089d7764b43295ff94c95ff90bc81689b513a922f5a245c089a985309bb68911c2555c1411a977f943b663340bc8853ded08c01251d3
+  data.tar.gz: 6476cb791739a7345468ba71d379924712bb94331a987104ee5d24551f8e0ea0b54b624a037c107524b18455bb5d4628dd0546bacf82fe0479f885536b533986

data/abnftt.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "abnftt"
-  s.version = "0.2.8"
+  s.version = "0.2.10"
   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/abnfgrammar.rb

@@ -2530,10 +2530,16 @@ module ABNFGrammar
   end
 
   module InlineModule0
-    def ast_wrap(a) ["im", a, text_value] end
+    def inline_module1
+      elements[1]
+    end
   end
 
   module InlineModule1
+    def ast_wrap(a) ["im", a, text_value] end
+  end
+
+  module InlineModule2
     def ast_wrap(a) a end
   end
 
@@ -2549,24 +2555,47 @@ module ABNFGrammar
     end
 
     i0 = index
-    r1 = _nt_inline_module1
-    r1.extend(InlineModule0)
-    r1.extend(InlineModule0)
+    i1, s1 = index, []
+    if (match_len = has_terminal?('&', false, index))
+      r3 = true
+      @index += match_len
+    else
+      terminal_parse_failure('\'&\'')
+      r3 = nil
+    end
+    if r3
+      r2 = r3
+    else
+      r2 = instantiate_node(SyntaxNode,input, index...index)
+    end
+    s1 << r2
+    if r2
+      r4 = _nt_inline_module1
+      s1 << r4
+    end
+    if s1.last
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+      r1.extend(InlineModule0)
+      r1.extend(InlineModule1)
+    else
+      @index = i1
+      r1 = nil
+    end
     if r1
       r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
       if (match_len = has_terminal?('', false, index))
-        r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
-        r2.extend(InlineModule1)
+        r5 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+        r5.extend(InlineModule2)
         @index += match_len
       else
         terminal_parse_failure('\'\'')
-        r2 = nil
+        r5 = nil
       end
-      if r2
-        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
-        r0 = r2
+      if r5
+        r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
+        r0 = r5
       else
         @index = i0
         r0 = nil
@@ -2578,10 +2607,12 @@ module ABNFGrammar
     r0
   end
 
-end
 
-class ABNFGrammarParser < Treetop::Runtime::CompiledParser
-  include ABNFGrammar
+  class Parser < Treetop::Runtime::CompiledParser
+    include ABNFGrammar
+  end
 end
 
+ABNFGrammarParser = ABNFGrammar::Parser
+
 

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,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: abnftt
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.10
 platform: ruby
 authors:
 - Carsten Bormann
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-11 00:00:00.000000000 Z
+date: 2025-04-29 00:00:00.000000000 Z
 dependencies: []
 description: Less shifty support for tools based on IETF's ABNF
 email: cabo@tzi.org
@@ -34,7 +33,6 @@ homepage: http://github.com/cabo/abnftt
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -49,8 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.14
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: RFC 5234+7405 ABNF to Treetop
 test_files: []