abnftt 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6def221a1f39479205c5ae0941b016e8e9b264cbd22f3052d6d62efba94ec05
-  data.tar.gz: 9ff420d1bb6fae9272704bea9a77141d02cf70638831aa883a88bb4cdbbcf27b
+  metadata.gz: 152ef34be3428f0a7cda4f157ec08a1986f5cf295436be8186ee53d61eddb386
+  data.tar.gz: fdc3504304d4e9c5244dcfce7a2e103e2801d3f6087de307bcd976a099fe0b5d
 SHA512:
-  metadata.gz: b29184a28e14f98168290f3638c371d92448deff1fbd686d6016eee875c7b5943ac8b9a6aabfb16f23d482f2ec7ca7b1fa0210e754410ab8b26bf4937be9175d
-  data.tar.gz: 011fcd33ac63105e3a4f9ea247841611be6bf9b60430786fab5ad2a9f63c6988ca67b84aca0016428107874bd486989653710b1014384f4877dd9adc34ebeda5
+  metadata.gz: e5b786e95c96464bf516e2d6ba00f1363a6a720d0dfd01b83401fef3ade2dc51116fda365881fb770fa9756f0ec71a14e7c6e85e7e3a7bc3589a930e8b9e5381
+  data.tar.gz: '08eb748abf720cfdfe4a742e675e7b5b0144a60cdd2fce90f85783a2b7eac2d856e138f6536394dcccc123e72eb6fa8439b472b1e8ff26fff7630938445b2316'

data/abnftt.gemspec

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

@@ -24,7 +24,7 @@ if ast
   end
   # pp ast.ast
   File.open("#{outfn}.treetop", "w") do |f|
-    modname = File.basename(outfn).gsub("-", "_").gsub(/[^_a-zA-Z]/, "").upcase
+    modname = File.basename(outfn).gsub("-", "_").gsub(/[^_a-zA-Z0-9]/, "").upcase
     f.puts abnf.to_treetop(modname)
   end
   File.open("#{outfn}.abnf", "w") do |f|

data/lib/abnftt.rb

@@ -143,6 +143,7 @@ class ABNF
   FIXUP_NAMES = Hash.new {|h, k| k}
   FIXUP_NAMES.merge!({
                        "rule" => "r__rule",
+                       "end" => "r__end",
                      })
   def to_treetop1(ast)
     case ast
@@ -156,6 +157,9 @@ class ABNF
         "(#{ast[1..-1].map {|x| to_treetop1(x)}.join(" ")})"
       when "rep" # ["rep", s, e, a]
         t = to_treetop1(ast[3]) || "@@@"
+        if ast[3][0] == "rep"
+          t = "(#{t})"
+        end
         case [ast[1], ast[2]]
         when [0, 1]
           t + "?"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abnftt
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-26 00:00:00.000000000 Z
+date: 2023-08-26 00:00:00.000000000 Z
 dependencies: []
 description: Less shifty support for tools based on IETF's ABNF
 email: cabo@tzi.org
@@ -42,7 +42,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: RFC 5234+7405 ABNF to Treetop