edn-abnf 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e4580b57714274ff5eb197811b5584c38537e43bf95b7a0add51171ed108db5
-  data.tar.gz: fc0240e0e1ef858a1f341c14e28bbba97f7108fef336f77e689a9369dc6aa5ea
+  metadata.gz: 4dd67fd4813a8adf98e4bbffd069e9d9e40a9c8d4c51c9f1ef1226497d3e7e9b
+  data.tar.gz: 524e68b7bb39b5acb883ddcbbbf3afd6531dfbc3892abfdf7346e8a97452e51d
 SHA512:
-  metadata.gz: ec376dbe72f63df3dcb2f34509e434b1d8f644369ac7a4e8e957072324b75146e50f4dd035669ec29c3f8199d2ae39a774751d1ac1657a7eccc36a801a483fb5
-  data.tar.gz: f603be649a4410de915c88109a7d3f5250868cb8ba02d4f2ca059358cdfd9a9bb93e76127c0b39344a3fceed326515d47b3dbc006821467645bef17551a18e0c
+  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.9"
+  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/cbor-diagnostic-app/hgrammar.rb

@@ -28,16 +28,60 @@ module HGRAMMAR
   end
 
   module AppStringH1
+    def ast
+      Integer(elements[0].text_value + elements[2].text_value, 16).chr("BINARY")
+    end
+  end
+
+  module AppStringH2
+    def ellipsis
+      elements[0]
+    end
+
+    def S
+      elements[1]
+    end
+  end
+
+  module AppStringH3
+    def ast; ellipsis.ast end
+  end
+
+  module AppStringH4
     def S
       elements[0]
     end
 
   end
 
-  module AppStringH2
+  module AppStringH5
+    def unpack_thread(s)
+      case s[0]
+      when CBOR::Tagged
+        s[0]
+      when String
+        s.join
+      else
+        raise "@@@ unpack_thread #{s.inspect}"
+      end
+    end
     def ast
-      e1 = elements[1].elements
-      e1.map {|e| Integer(e.elements[0].text_value + e.elements[2].text_value, 16).chr("BINARY")}.join.b
+      e1 = elements[1].elements.map {|e| e.ast}
+      out = []
+      curr = []
+      e1.each { |el|
+        if curr.size == 0 || curr[0].class == el.class
+          curr << el
+        else
+          out << curr
+          curr = [el]
+        end
+      }
+      if out.size == 0 && String === curr[0]
+        curr.join # unpack_thread(curr)
+      else
+        CBOR::Tagged.new(888, (out << curr).map {|x| unpack_thread(x)})
+      end
     end
   end
 
@@ -58,27 +102,56 @@ module HGRAMMAR
     if r1
       s2, i2 = [], index
       loop do
-        i3, s3 = index, []
-        r4 = _nt_HEXDIG
-        s3 << r4
-        if r4
-          r5 = _nt_S
-          s3 << r5
-          if r5
-            r6 = _nt_HEXDIG
-            s3 << r6
-            if r6
-              r7 = _nt_S
-              s3 << r7
+        i3 = index
+        i4, s4 = index, []
+        r5 = _nt_HEXDIG
+        s4 << r5
+        if r5
+          r6 = _nt_S
+          s4 << r6
+          if r6
+            r7 = _nt_HEXDIG
+            s4 << r7
+            if r7
+              r8 = _nt_S
+              s4 << r8
             end
           end
         end
-        if s3.last
-          r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
-          r3.extend(AppStringH0)
+        if s4.last
+          r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+          r4.extend(AppStringH0)
+          r4.extend(AppStringH1)
         else
-          @index = i3
-          r3 = nil
+          @index = i4
+          r4 = nil
+        end
+        if r4
+          r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+          r3 = r4
+        else
+          i9, s9 = index, []
+          r10 = _nt_ellipsis
+          s9 << r10
+          if r10
+            r11 = _nt_S
+            s9 << r11
+          end
+          if s9.last
+            r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
+            r9.extend(AppStringH2)
+            r9.extend(AppStringH3)
+          else
+            @index = i9
+            r9 = nil
+          end
+          if r9
+            r9 = SyntaxNode.new(input, (index-1)...index) if r9 == true
+            r3 = r9
+          else
+            @index = i3
+            r3 = nil
+          end
         end
         if r3
           s2 << r3
@@ -91,8 +164,8 @@ module HGRAMMAR
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(AppStringH1)
-      r0.extend(AppStringH2)
+      r0.extend(AppStringH4)
+      r0.extend(AppStringH5)
     else
       @index = i0
       r0 = nil
@@ -103,6 +176,50 @@ module HGRAMMAR
     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
+
   def _nt_HEXDIG
     start_index = index
     if node_cache[:HEXDIG].has_key?(index)
@@ -343,7 +460,79 @@ module HGRAMMAR
     r0
   end
 
+  def _nt_non_lf
+    start_index = index
+    if node_cache[:non_lf].has_key?(index)
+      cached = node_cache[:non_lf][index]
+      if cached
+        node_cache[:non_lf][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    if (match_len = has_terminal?("\t", false, index))
+      r1 = true
+      @index += match_len
+    else
+      terminal_parse_failure('"\\t"')
+      r1 = nil
+    end
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      if (match_len = has_terminal?("\r", false, index))
+        r2 = true
+        @index += match_len
+      else
+        terminal_parse_failure('"\\r"')
+        r2 = nil
+      end
+      if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+        r0 = r2
+      else
+        if has_terminal?(@regexps[gr = '\A[\\ -퟿]'] ||= Regexp.new(gr), :regexp, index)
+          r3 = true
+          @index += 1
+        else
+          terminal_parse_failure('[\\ -퟿]')
+          r3 = nil
+        end
+        if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+          r0 = r3
+        else
+          if has_terminal?(@regexps[gr = '\A[-􏿿]'] ||= Regexp.new(gr), :regexp, index)
+            r4 = true
+            @index += 1
+          else
+            terminal_parse_failure('[-􏿿]')
+            r4 = nil
+          end
+          if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+            r0 = r4
+          else
+            @index = i0
+            r0 = nil
+          end
+        end
+      end
+    end
+
+    node_cache[:non_lf][start_index] = r0
+
+    r0
+  end
+
   module S0
+    def comment
+      elements[0]
+    end
+
   end
 
   module S1
@@ -376,18 +565,12 @@ module HGRAMMAR
       s3, i3 = [], index
       loop do
         i4, s4 = index, []
-        if (match_len = has_terminal?("/", false, index))
-          r5 = true
-          @index += match_len
-        else
-          terminal_parse_failure('"/"')
-          r5 = nil
-        end
+        r5 = _nt_comment
         s4 << r5
         if r5
           s6, i6 = [], index
           loop do
-            r7 = _nt_non_slash
+            r7 = _nt_blank
             if r7
               s6 << r7
             else
@@ -396,29 +579,6 @@ module HGRAMMAR
           end
           r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
           s4 << r6
-          if r6
-            if (match_len = has_terminal?("/", false, index))
-              r8 = true
-              @index += match_len
-            else
-              terminal_parse_failure('"/"')
-              r8 = nil
-            end
-            s4 << r8
-            if r8
-              s9, i9 = [], index
-              loop do
-                r10 = _nt_blank
-                if r10
-                  s9 << r10
-                else
-                  break
-                end
-              end
-              r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
-              s4 << r9
-            end
-          end
         end
         if s4.last
           r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
@@ -449,6 +609,120 @@ module HGRAMMAR
     r0
   end
 
+  module Comment0
+  end
+
+  module Comment1
+  end
+
+  def _nt_comment
+    start_index = index
+    if node_cache[:comment].has_key?(index)
+      cached = node_cache[:comment][index]
+      if cached
+        node_cache[:comment][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    i1, s1 = index, []
+    if (match_len = has_terminal?("/", false, index))
+      r2 = true
+      @index += match_len
+    else
+      terminal_parse_failure('"/"')
+      r2 = nil
+    end
+    s1 << r2
+    if r2
+      s3, i3 = [], index
+      loop do
+        r4 = _nt_non_slash
+        if r4
+          s3 << r4
+        else
+          break
+        end
+      end
+      r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+      s1 << r3
+      if r3
+        if (match_len = has_terminal?("/", false, index))
+          r5 = true
+          @index += match_len
+        else
+          terminal_parse_failure('"/"')
+          r5 = nil
+        end
+        s1 << r5
+      end
+    end
+    if s1.last
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+      r1.extend(Comment0)
+    else
+      @index = i1
+      r1 = nil
+    end
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      i6, s6 = index, []
+      if (match_len = has_terminal?("#", false, index))
+        r7 = true
+        @index += match_len
+      else
+        terminal_parse_failure('"#"')
+        r7 = nil
+      end
+      s6 << r7
+      if r7
+        s8, i8 = [], index
+        loop do
+          r9 = _nt_non_lf
+          if r9
+            s8 << r9
+          else
+            break
+          end
+        end
+        r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
+        s6 << r8
+        if r8
+          if (match_len = has_terminal?("\n", false, index))
+            r10 = true
+            @index += match_len
+          else
+            terminal_parse_failure('"\\n"')
+            r10 = nil
+          end
+          s6 << r10
+        end
+      end
+      if s6.last
+        r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+        r6.extend(Comment1)
+      else
+        @index = i6
+        r6 = nil
+      end
+      if r6
+        r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
+        r0 = r6
+      else
+        @index = i0
+        r0 = nil
+      end
+    end
+
+    node_cache[:comment][start_index] = r0
+
+    r0
+  end
+
 end
 
 class HGRAMMARParser < Treetop::Runtime::CompiledParser

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-08 00:00:00.000000000 Z
+date: 2023-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler