abnftt 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 397c4ddc806faa5fcb39bc900acb4fb828289c2d639a24ff10158bd0d4712bab
-  data.tar.gz: d8e1904fc3a2310ba3ab986840cc57bac9bcca1479cda0939ebda3ae19baa36c
+  metadata.gz: b6def221a1f39479205c5ae0941b016e8e9b264cbd22f3052d6d62efba94ec05
+  data.tar.gz: 9ff420d1bb6fae9272704bea9a77141d02cf70638831aa883a88bb4cdbbcf27b
 SHA512:
-  metadata.gz: 280d0eaee9b999e7c9a9b7cac343e1653a6910ecba9e88cb3d8f44652dfd31b440fd2483d8ce4164440a50f15a61e76fa8dbbd4dd98d3cd9004916eb0fb1675a
-  data.tar.gz: b19f0ebe121e9156c2a3f0cec93fc9e20710e69450981a8f76271bb008f9e432f9b5c9b0605194282cda2ffb39ed6216e427ab6eee5e1a4fec7e5e4799ceef5c
+  metadata.gz: b29184a28e14f98168290f3638c371d92448deff1fbd686d6016eee875c7b5943ac8b9a6aabfb16f23d482f2ec7ca7b1fa0210e754410ab8b26bf4937be9175d
+  data.tar.gz: 011fcd33ac63105e3a4f9ea247841611be6bf9b60430786fab5ad2a9f63c6988ca67b84aca0016428107874bd486989653710b1014384f4877dd9adc34ebeda5

data/abnftt.gemspec

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

@@ -283,22 +283,22 @@ module ABNFGrammar
     s0 << r1
     if r1
       i3 = index
-      if (match_len = has_terminal?("=", false, index))
-        r4 = true
+      if (match_len = has_terminal?("=/", false, index))
+        r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
         @index += match_len
       else
-        terminal_parse_failure('"="')
+        terminal_parse_failure('"=/"')
         r4 = nil
       end
       if r4
         r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
         r3 = r4
       else
-        if (match_len = has_terminal?("=/", false, index))
-          r5 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+        if (match_len = has_terminal?("=", false, index))
+          r5 = true
           @index += match_len
         else
-          terminal_parse_failure('"=/"')
+          terminal_parse_failure('"="')
           r5 = nil
         end
         if r5

data/lib/abnftt.rb

@@ -61,12 +61,19 @@ class ABNF
     @tree.each do |x|
       op, name, val, rest = x
       fail rest if rest
-      fail op unless op == "="  # XXX
-      if @rules[name]
-        fail "duplicate rule for name #{name}"
-      end
-      @rules[name] = val
+      @rules[name] =
+        if old = @rules[name]
+          fail "duplicate rule for name #{name}" if op == "="
+          if Array === old && old[0] == "alt"
+            old.dup << val
+          else
+            ["alt", old, val]
+          end
+        else
+          val
+        end
     end
+    # warn "** rules #{rules.inspect}"
   end
 
   def generate
@@ -122,15 +129,14 @@ class ABNF
     <<~EOS
     # Encoding: UTF-8
     grammar #{modname}
-    #{tree.map {|x| to_treetop0(x)}.join}
+    #{rules.map {|k, v| to_treetop0(k, v)}.join}
     end
   EOS
   end
-  def to_treetop0(ast)
-    fail ast.inspect unless ast[0] == "="
+  def to_treetop0(k, v)
     <<~EOS
-    rule #{to_treetop1(ast[1])}
-    #{to_treetop1(ast[2])}
+    rule #{to_treetop1(k)}
+    #{to_treetop1(v)}
     end
   EOS
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abnftt
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies: []
 description: Less shifty support for tools based on IETF's ABNF
 email: cabo@tzi.org