edn-abnf 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 932c447340ccec81fa10c0b51f802906872bdbd544473aa6301f98b490ef8aef
-  data.tar.gz: fa2e2062c8eb6243029011b790e519dd5d24b3fe61960e12cefc4d253d92dd1f
+  metadata.gz: 4dd67fd4813a8adf98e4bbffd069e9d9e40a9c8d4c51c9f1ef1226497d3e7e9b
+  data.tar.gz: 524e68b7bb39b5acb883ddcbbbf3afd6531dfbc3892abfdf7346e8a97452e51d
 SHA512:
-  metadata.gz: df16c6657287cdd6c3c1a717dd7e2e6ab20e64d53a910dc77b9b8f3b7a6dd9a20c3c9330e4d272ce3230f497ef1a936de184a41b35105af15c7a6d27f50c4c90
-  data.tar.gz: 0ea2cd3c43c44d3ec0c6881558f407fbf0368abceeb66f022f121a45be16aa49d7e23b64f5c66479b9ad804dc07ba36fce78952de603a17f6bc2185ed3fac69d
+  metadata.gz: 132445c4a4c05bd1ce60d552c0c6809df5c92cb850c79243cd26fd5552f5db73e3a1b93dbce1585cddec77ff764d33b1bfb7a868d1907dfa37145a1762530729
+  data.tar.gz: e399041d7bf61d00d80fe824daeb72e8d008927cd8cd5958aedce23f100e53ecef2887393d0aca753bafc9fed1c4330bd8696ffdcd6a6e69829331efd28e8e22

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.0.10"
+  s.version = "0.0.11"
   s.summary = "CDDL (Concise Data Definition Language) converters and miscellaneous tools"
   s.description = %q{edn-abnf implements converters and miscellaneous tools for CBOR EDN's ABNF}
   s.author = "Carsten Bormann"

data/lib/parser/edngrammar.rb

@@ -289,13 +289,13 @@ module EDNGRAMMAR
     r0
   end
 
-  module String0
+  module String10
     def spec
       elements[1]
     end
   end
 
-  module String1
+  module String11
     def ast
       if ei = spec.text_value[1..-1]
          warn "*** ignoring unimplemented encoding indicator #{ei.inspect} for #{elements[0].text_value}"
@@ -304,12 +304,12 @@ module EDNGRAMMAR
     end
   end
 
-  def _nt_string
+  def _nt_string1
     start_index = index
-    if node_cache[:string].has_key?(index)
-      cached = node_cache[:string][index]
+    if node_cache[:string1].has_key?(index)
+      cached = node_cache[:string1][index]
       if cached
-        node_cache[:string][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:string1][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -338,8 +338,180 @@ module EDNGRAMMAR
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(String0)
+      r0.extend(String10)
+      r0.extend(String11)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:string1][start_index] = r0
+
+    r0
+  end
+
+  def _nt_string1e
+    start_index = index
+    if node_cache[:string1e].has_key?(index)
+      cached = node_cache[:string1e][index]
+      if cached
+        node_cache[:string1e][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    r1 = _nt_string1
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      r2 = _nt_ellipsis
+      if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+        r0 = r2
+      else
+        @index = i0
+        r0 = nil
+      end
+    end
+
+    node_cache[:string1e][start_index] = r0
+
+    r0
+  end
+
+  module Ellipsis0
+    def ast; CBOR::Tagged.new(888, nil) end
+  end
+
+  def _nt_ellipsis
+    start_index = index
+    if node_cache[:ellipsis].has_key?(index)
+      cached = node_cache[:ellipsis][index]
+      if cached
+        node_cache[:ellipsis][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    s0, i0 = [], index
+    loop do
+      if (match_len = has_terminal?(".", false, index))
+        r1 = true
+        @index += match_len
+      else
+        terminal_parse_failure('"."')
+        r1 = nil
+      end
+      if r1
+        s0 << r1
+      else
+        break
+      end
+    end
+    if s0.size < 3
+      @index = i0
+      r0 = nil
+    else
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(Ellipsis0)
+      r0.extend(Ellipsis0)
+    end
+
+    node_cache[:ellipsis][start_index] = r0
+
+    r0
+  end
+
+  module String0
+    def S
+      elements[0]
+    end
+
+    def string1e
+      elements[1]
+    end
+  end
+
+  module String1
+    def string1e
+      elements[0]
+    end
+
+  end
+
+  module String2
+    def join1(s)
+      s.join # XXX -- look at encoding and ei
+    end
+    def unpack_chunk(c, s)
+      if c == String
+        join1(s)
+      else
+        unless c == CBOR::Tagged && s.first.tag == 888 && s.first.value == nil # XXX check all values?
+          raise "*** unjoinable chunks #{c.inspect} #{s.inspect}" if s.size != 1
+        end
+        s.first
+      end
+    end
+    def ast
+      arr = [elements[0].ast] + elements[1].elements.map {|x| x.elements[1].ast}
+      charr = arr.chunk(&:class).to_a
+      if charr.size == 1
+        unpack_chunk(*charr.first)
+      else
+        CBOR::Tagged.new(888, charr.map {|x| unpack_chunk(*x)})
+      end
+    end
+  end
+
+  def _nt_string
+    start_index = index
+    if node_cache[:string].has_key?(index)
+      cached = node_cache[:string][index]
+      if cached
+        node_cache[:string][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    r1 = _nt_string1e
+    s0 << r1
+    if r1
+      s2, i2 = [], index
+      loop do
+        i3, s3 = index, []
+        r4 = _nt_S
+        s3 << r4
+        if r4
+          r5 = _nt_string1e
+          s3 << r5
+        end
+        if s3.last
+          r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+          r3.extend(String0)
+        else
+          @index = i3
+          r3 = nil
+        end
+        if r3
+          s2 << r3
+        else
+          break
+        end
+      end
+      r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+      s0 << r2
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
       r0.extend(String1)
+      r0.extend(String2)
     else
       @index = i0
       r0 = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Carsten Bormann