abnftt 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 267bcebab4bd13c22da536e87b6ccd3444b214db589a5e9d4b054a56ffe3a686
-  data.tar.gz: cf4c222a9825e210e635989837ba43432e87661ba6e5e98a9a52aedcfbdad055
+  metadata.gz: 436afd21fea00a7369bf5dfdfdcc0a61b33ee0b14f482a6d1c00488a520c93c1
+  data.tar.gz: 93cb2255e048e4482c4245e9beb6bf635a79b253124359a8c0debbd2abb204b2
 SHA512:
-  metadata.gz: 28fe16c851f050e8072bdf939b45569fde9233fbeb26a2e43169fa04b1c66e85e43e893056faab3b87a4e5c49f2f7cea08274dd852c26f8d42688a85198eab57
-  data.tar.gz: 0f4977a6b13b8b4a621b594a31ad87d6759b5780bb59b98f7afc3ab4ac3e70fd2f9ee5cb9f710b8db1ce79e8f411734ec1517ad829456f3cd0f4a383f683d721
+  metadata.gz: '09621b3970222f8de758894c6fa6c58821fca89980612234ca31cdedae11fcc1c2c9b2e1fd9edb873865169b640926e049388888a82da7baa4b1dfa972f37dde'
+  data.tar.gz: 4f77b32132f12ae7a2f6c91b250df5213fdb386c21ecd6fe02c6470115be7996448eefbd94f0e9cd833cc446a7a451c7ff65567069cd15695e6093c11505bd43

data/abnftt.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "abnftt"
-  s.version = "0.2.6"
+  s.version = "0.2.7"
   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/bin/abnfrob

@@ -26,6 +26,9 @@ begin
     opts.on("-a", "--asr33", "Line-break to fit on teletype") do |v|
       $options.asr33 = v
     end
+    opts.on("--ascii", "No escaping of ASCII printables %x20-7e") do |v|
+      $options.ascii = v
+    end
     opts.on("--squash=PREFIX", String, "Squash to app-prefix") do |v|
       $options.squash = v
     end
@@ -78,7 +81,7 @@ if $options.squash
   abnf.flatten_ops
   abnf.flatten_strings
 
-  abnf.squash_edn_levels
+  abnf.squash_edn_levels(ascii: $options.ascii)
   abnf.char_range_to_string
 
   abnf.share_hex("sq")

data/lib/abnftt/abnf-squasher.rb

@@ -24,7 +24,7 @@ class ABNF
     ["\x2F", "/"],
     ["\x5C", "\\"]]
 
-  def squash_edn_levels_1(prod)
+  def squash_edn_levels_1(prod, **options)
     f1 = visit(prod) do |here|
       case here
       in ["char-range", c1, c2]
@@ -35,12 +35,20 @@ class ABNF
             ["seq", ["char-range", "\\", "\\"], ["char-range", ev, ev]]
           end
         }.compact
-        old = alt_ranges_legacy(c1.ord, c2.ord)
-        new = alt_ranges_modern(c1.ord, c2.ord)
+        u_escapes = []
+        if options[:ascii]
+          do_ranges_outside(here, " ", "~") do |l, r|
+            u_escapes << alt_ranges_legacy(l, r) # old
+            u_escapes << alt_ranges_modern(l, r) # new
+          end
+        else
+          u_escapes << alt_ranges_legacy(c1.ord, c2.ord) # old
+          u_escapes << alt_ranges_modern(c1.ord, c2.ord) # new
+        end
         oldnew = ["seq",
                   ["cs", "\\u"],
-                  wrap_flat("alt", [old, new]) ]
-        [true, wrap_flat("alt", [*lit, *esc, oldnew].sort)]
+                  wrap_flat("alt", u_escapes) ] if u_escapes != []
+        [true, wrap_flat("alt", [*lit, *esc, oldnew].compact.sort)]
       else
         false
       end
@@ -48,9 +56,9 @@ class ABNF
     flatten_ops_1(f1)
   end
 
-  def squash_edn_levels
+  def squash_edn_levels(**options)
     rules.each do |name, prod|
-      rules[name] = squash_edn_levels_1(prod)
+      rules[name] = squash_edn_levels_1(prod, **options)
     end
   end
 

data/lib/abnftt/abnf-util.rb

@@ -32,6 +32,19 @@ class ABNF
     end
   end
 
+  def do_ranges_outside(cr, l, r)
+    if cr[2] < l || cr[1] > r # outside
+      yield cr[1].ord, cr[2].ord
+    else
+      if cr[1] < l
+        yield cr[1].ord, l.ord - 1
+      end
+      if cr[2] > r
+        yield r.ord + 1, cr[2].ord
+      end
+    end
+  end
+
   # Utilities for creating hexadecimal rules from unsigned integers
 
   def hexdig_range(l, r)
@@ -355,6 +368,10 @@ 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]
       else
         false
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abnftt
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-09 00:00:00.000000000 Z
+date: 2025-01-11 00:00:00.000000000 Z
 dependencies: []
 description: Less shifty support for tools based on IETF's ABNF
 email: cabo@tzi.org