edn-abnf 0.5.33 → 0.5.36pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc4cf907d32b47cc51a4326a110558a79a25ba4733873a5d6d84fd52f4e54903
-  data.tar.gz: 5424613f24e9fb8defca526961a428bba49832c57e952e848d8cbdd1b7a06f99
+  metadata.gz: f549feee42c4a286feacc2cc626e56139e091e7a65dd3f2826f501ff07da6029
+  data.tar.gz: bb13aa04a7262d1a6663cd0d97f634606f9110b4dff40aaf1b79ed766e885ce4
 SHA512:
-  metadata.gz: a0b733fbad7e31b0f371fb832c86e958476ee29da4a83d06673b216829cca62a7262f719d378480a9f315997554883df44b1fddbe47082c4af28c14727e630d1
-  data.tar.gz: 54abb14762231cfb8dbfd87a21b4f86594f0cbcc666f3333920dd2922f104f41a4cb9fc9277376dee952b831a92c563a056c6485dbf79e3a6e7e088272d1e39e
+  metadata.gz: c4141b3a4ee8d0237b54a8b5c19633b9e9bc821d05b38a68ed8d24253a00366a86d7aba1a6cc154d514d4bdfd60aa20cee997493bf0dbac0d82eab65645ee783
+  data.tar.gz: 7f182c39e9d865c23ed0fd4d204dfef437d3ab1a357fcb220536d5cef80ccf1f33f3cb1188e6dbe993151ee4681f14db2fd0ca88ac7a7963617340b996ff4acc

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.5.33"
+  s.version = "0.5.36pre1"
   s.summary = "CBOR Extended Diagnostic Notation (EDN) implemented in ABNF"
   s.description = %q{edn-abnf implements converters and miscellaneous tools for CBOR EDN's ABNF}
   s.author = "Carsten Bormann"

data/lib/cbor-diag-support.rb

@@ -12,7 +12,7 @@ module CBOR
     def inspect
       "#<CBOR::Box #{self.class} value=#{value.inspect}, options=#{options.inspect}>"
     end
-    def self.from_number(n, options={})
+    def self.from_instance(n, options={})
       case n
       when Box
         n.class.new(n.value, n.options.merge(options))
@@ -20,23 +20,13 @@ module CBOR
         Ibox.new(n, options.dup)
       when ::Float
         Fbox.new(n, options.dup)
+      when ::String, ::Array, ::Hash, ::CBOR::Tagged
+        Xbox.new(n, options.dup)
       else
         raise ArgumentError, "cbor-diagnostic: can't box number from #{n.inspect}':\n"
       end
     end
-    def to_cbor
-      CBOR.encode(value)
-    end
-    def cbor_diagnostic(opts = {})
-      ret = value.cbor_diagnostic(opts)
-      if ei = options[:ei]
-        ret << "_#{ei}"
-      end
-      ret
-    end
-  end
 
-  class Ibox < Box
     INTEGER_EI = {
       "i" => [23, 0],
       "0" => [0xFF, 1],
@@ -44,7 +34,7 @@ module CBOR
       "2" => [0xFFFFFFFF, 4],
       "3" => [0xFFFFFFFFFFFFFFFF, 8]
     }
-    def make_head(ib, plusbytes, d)
+    def self.make_head(ib, plusbytes, d)
       case plusbytes
       when 0
         [ib + d].pack("C")
@@ -61,6 +51,52 @@ module CBOR
       end
     end
 
+    def to_cbor
+      CBOR.encode(value)
+    end
+    def cbor_diagnostic(opts = {})
+      ret = value.cbor_diagnostic(opts)
+      if ei = options[:ei]
+        ret << "_#{ei}"
+      end
+      ret
+    end
+  end
+
+  class Xbox < Box
+    def to_cbor
+      enc = CBOR.encode(value)
+      if ei = options[:ei]
+        maxval, plusbytes = INTEGER_EI[ei]
+        if maxval
+          ib = enc.getbyte(0) & 0xE0
+          ai = enc.getbyte(0) & 0x1F
+          d, replacement = case ai
+                           when 0...24; [ai, 0]
+                           when 24; [enc[1..1].ord, 1]
+                           when 25; [enc[1..2].unpack1("n"), 2]
+                           when 26; [enc[1..4].unpack1("N"), 4]
+                           when 27; [enc[1..8].unpack1("Q>"), 8]
+                           # when 31; XXX conflicting EI information
+                           else raise "unknown additional information #{ai} in ib #{ib}"
+                           end
+          raise ArgumentError, "cbor-diagnostic: #{value} doesn't fit into encoding indicator _#{ei}':\n" unless d <= maxval
+          ib = enc.getbyte(0) & 0xE0
+          new_head = CBOR::Ibox.make_head(ib, plusbytes, d)
+          enc[0..replacement] = new_head
+        else
+          if ei == "" && value == ""
+            enc = CBOR.encode(value.cbor_stream!([]))
+          else
+            warn "*** cbor-diagnostic: ignoring unsupported encoding indicator _#{ei} for #{value.inspect}"
+          end
+        end
+      end
+      enc
+    end
+  end
+
+  class Ibox < Box
     def to_cbor
       if ei = options[:ei]
         maxval, plusbytes = INTEGER_EI[ei]
@@ -74,7 +110,7 @@ module CBOR
              end
         raise ArgumentError, "cbor-diagnostic: #{value} doesn't fit into encoding indicator _#{ei}':\n" unless d <= maxval
 
-        make_head(ib, plusbytes, d)
+        CBOR::Ibox.make_head(ib, plusbytes, d)
 
         # s = bignum_to_bytes(d)
         # head(0xc0, TAG_BIGNUM_BASE + (ib >> 5))

data/lib/parser/edngrammar.rb

@@ -197,10 +197,12 @@ module EDNGRAMMAR
 
   module String11
     def ast
+      val = elements[0].ast
       if ei = spec.text_value[1..-1]
-         warn "*** ignoring unimplemented encoding indicator #{ei.inspect} for #{elements[0].text_value}"
+         # warn "*** implementing encoding indicator #{ei.inspect} for #{elements[0].text_value}"
+         val = CBOR::Box.from_instance(val, {ei: ei})
       end
-      elements[0].ast
+      val
     end
   end
 
@@ -452,7 +454,7 @@ module EDNGRAMMAR
   
       if ei = spec.text_value[1..-1]
          # warn "*** implementing encoding indicator #{ei.inspect} for #{elements[0].text_value}"
-         val = CBOR::Box.from_number(val, {ei: ei})
+         val = CBOR::Box.from_instance(val, {ei: ei})
       end
       val
     end
@@ -1800,10 +1802,12 @@ module EDNGRAMMAR
 
   module Tagged1
     def ast
+      val = CBOR::Tagged.new(uint.text_value.to_i, item.ast)
       if ei = spec.text_value[1..-1]
-         warn "*** ignoring unimplemented encoding indicator #{ei.inspect} after tag number #{uint.text_value}"
+        val = CBOR::Box.from_instance(val, {ei: ei})
+        # warn "*** implementing encoding indicator #{ei.inspect} after tag number #{uint.text_value}"
       end
-      CBOR::Tagged.new(uint.text_value.to_i, item.ast)
+      val
     end
   end
 
@@ -2105,7 +2109,7 @@ module EDNGRAMMAR
       begin
         ::EDNGRAMMAR::APPS[app].decode(app, data)
       rescue CBOR_DIAG::AppParseError => e
-        app_parser_level1_raw_diagnostics(e, rawstring.rawcontent)
+        app_parser_level1_raw_diagnostics(e, elements[1].elements[1])
         raise e
       end
     end
@@ -2144,25 +2148,30 @@ module EDNGRAMMAR
   end
 
   module Rawstring0
-    def startrawdelim
-      elements[0]
+    def rawcontent0
+      elements[1]
     end
 
+  end
+
+  module Rawstring1
     def rawcontent
-      elements[2]
+      elements[1]
     end
+  end
 
-    def matchrawdelim
-      elements[3]
+  module Rawstring2
+    def startrawdelim
+      elements[0]
+    end
+
+    def alikerawdelim
+      elements[2]
     end
   end
 
-  module Rawstring1
-    def ast
-                          rawcontent.text_value.gsub("\r", "") + (
-                          tv = matchrawdelim.text_value
-                          dv = startrawdelim.text_value.length
-                          tv[dv..]) end
+  module Rawstring3
+    def ast; elements[1].elements[1].text_value.gsub("\r", "") end
   end
 
   def _nt_rawstring
@@ -2180,26 +2189,78 @@ module EDNGRAMMAR
     r1 = _nt_startrawdelim
     s0 << r1
     if r1
-      r3 = _nt_newline
+      i2 = index
+      i3, s3 = index, []
+      if (match_len = has_terminal?(" ", false, index))
+        r4 = true
+        @index += match_len
+      else
+        terminal_parse_failure('" "')
+        r4 = nil
+      end
+      s3 << r4
+      if r4
+        r5 = _nt_rawcontent0
+        s3 << r5
+        if r5
+          if (match_len = has_terminal?(" ", false, index))
+            r6 = true
+            @index += match_len
+          else
+            terminal_parse_failure('" "')
+            r6 = nil
+          end
+          s3 << r6
+        end
+      end
+      if s3.last
+        r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+        r3.extend(Rawstring0)
+      else
+        @index = i3
+        r3 = nil
+      end
       if r3
+        r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
         r2 = r3
       else
-        r2 = instantiate_node(SyntaxNode,input, index...index)
+        i7, s7 = index, []
+        r9 = _nt_newline
+        if r9
+          r8 = r9
+        else
+          r8 = instantiate_node(SyntaxNode,input, index...index)
+        end
+        s7 << r8
+        if r8
+          r10 = _nt_rawcontent
+          s7 << r10
+        end
+        if s7.last
+          r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
+          r7.extend(Rawstring1)
+        else
+          @index = i7
+          r7 = nil
+        end
+        if r7
+          r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
+          r2 = r7
+        else
+          @index = i2
+          r2 = nil
+        end
       end
       s0 << r2
       if r2
-        r4 = _nt_rawcontent
-        s0 << r4
-        if r4
-          r5 = _nt_matchrawdelim
-          s0 << r5
-        end
+        r11 = _nt_alikerawdelim
+        s0 << r11
       end
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Rawstring0)
-      r0.extend(Rawstring1)
+      r0.extend(Rawstring2)
+      r0.extend(Rawstring3)
     else
       @index = i0
       r0 = nil
@@ -2297,19 +2358,19 @@ module EDNGRAMMAR
     r0
   end
 
-  module Matchrawdelim0
+  module Alikerawdelim0
     def rawdelim
       elements[0]
     end
 
   end
 
-  def _nt_matchrawdelim
+  def _nt_alikerawdelim
     start_index = index
-    if node_cache[:matchrawdelim].has_key?(index)
-      cached = node_cache[:matchrawdelim][index]
+    if node_cache[:alikerawdelim].has_key?(index)
+      cached = node_cache[:alikerawdelim][index]
       if cached
-        node_cache[:matchrawdelim][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:alikerawdelim][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -2320,7 +2381,7 @@ module EDNGRAMMAR
     s0 << r1
     if r1
       i2 = index
-      r3 = lambda {|(rd)|rd.text_value.length >= @rawdelimlength}.call(s0)
+      r3 = lambda {|(rd)|rd.text_value.length == @rawdelimlength}.call(s0)
       if !r3
         terminal_parse_failure("<semantic predicate>")
       end
@@ -2335,13 +2396,13 @@ module EDNGRAMMAR
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Matchrawdelim0)
+      r0.extend(Alikerawdelim0)
     else
       @index = i0
       r0 = nil
     end
 
-    node_cache[:matchrawdelim][start_index] = r0
+    node_cache[:alikerawdelim][start_index] = r0
 
     r0
   end
@@ -2483,6 +2544,94 @@ module EDNGRAMMAR
     r0
   end
 
+  def _nt_rawchars0
+    start_index = index
+    if node_cache[:rawchars0].has_key?(index)
+      cached = node_cache[:rawchars0][index]
+      if cached
+        node_cache[:rawchars0][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    s0, i0 = [], index
+    loop do
+      i1 = index
+      if (match_len = has_terminal?("\n", false, index))
+        r2 = true
+        @index += match_len
+      else
+        terminal_parse_failure('"\\n"')
+        r2 = nil
+      end
+      if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+        r1 = r2
+      else
+        if (match_len = has_terminal?("\r", false, index))
+          r3 = true
+          @index += match_len
+        else
+          terminal_parse_failure('"\\r"')
+          r3 = nil
+        end
+        if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+          r1 = 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
+            r1 = r4
+          else
+            if has_terminal?(@regexps[gr = '\A[a-~]'] ||= Regexp.new(gr), :regexp, index)
+              r5 = true
+              @index += 1
+            else
+              terminal_parse_failure('[a-~]')
+              r5 = nil
+            end
+            if r5
+              r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
+              r1 = r5
+            else
+              r6 = _nt_NONASCII
+              if r6
+                r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
+                r1 = r6
+              else
+                @index = i1
+                r1 = nil
+              end
+            end
+          end
+        end
+      end
+      if r1
+        s0 << r1
+      else
+        break
+      end
+    end
+    if s0.empty?
+      @index = i0
+      r0 = nil
+    else
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+    end
+
+    node_cache[:rawchars0][start_index] = r0
+
+    r0
+  end
+
   def _nt_rawcontent
     start_index = index
     if node_cache[:rawcontent].has_key?(index)
@@ -2529,6 +2678,111 @@ module EDNGRAMMAR
     r0
   end
 
+  module Rawcontent00
+    def shortrawdelim
+      elements[1]
+    end
+  end
+
+  module Rawcontent01
+  end
+
+  def _nt_rawcontent0
+    start_index = index
+    if node_cache[:rawcontent0].has_key?(index)
+      cached = node_cache[:rawcontent0][index]
+      if cached
+        node_cache[:rawcontent0][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    s0, i0 = [], index
+    loop do
+      i1 = index
+      r2 = _nt_rawchars0
+      if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+        r1 = r2
+      else
+        i3, s3 = index, []
+        s4, i4 = [], index
+        loop do
+          r5 = _nt_rawchars
+          if r5
+            s4 << r5
+          else
+            break
+          end
+        end
+        r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+        s3 << r4
+        if r4
+          r6 = _nt_shortrawdelim
+          s3 << r6
+        end
+        if s3.last
+          r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+          r3.extend(Rawcontent00)
+        else
+          @index = i3
+          r3 = nil
+        end
+        if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+          r1 = r3
+        else
+          i7, s7 = index, []
+          if (match_len = has_terminal?(" ", false, index))
+            r8 = true
+            @index += match_len
+          else
+            terminal_parse_failure('" "')
+            r8 = nil
+          end
+          s7 << r8
+          if r8
+            i9 = index
+            r10 = _nt_alikerawdelim
+            if r10
+              @index = i9
+              r9 = nil
+            else
+              @index = i9
+              r9 = instantiate_node(SyntaxNode,input, index...index)
+            end
+            s7 << r9
+          end
+          if s7.last
+            r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
+            r7.extend(Rawcontent01)
+          else
+            @index = i7
+            r7 = nil
+          end
+          if r7
+            r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
+            r1 = r7
+          else
+            @index = i1
+            r1 = nil
+          end
+        end
+      end
+      if r1
+        s0 << r1
+      else
+        break
+      end
+    end
+    r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+
+    node_cache[:rawcontent0][start_index] = r0
+
+    r0
+  end
+
   module Sqstr0
     def SQUOTE1
       elements[0]
@@ -3084,7 +3338,8 @@ module EDNGRAMMAR
       if ei == ""
         r.cbor_stream!
       elsif ei
-        warn "*** ignoring unimplemented encoding indicator #{ei.inspect} after ["
+        r = CBOR::Box.from_instance(r, {ei: ei})
+        # warn "*** implementing XXX encoding indicator #{ei.inspect} after ["
       end
       r
     end
@@ -3271,7 +3526,8 @@ module EDNGRAMMAR
       if ei == ""
         r.cbor_stream!
       elsif ei
-        warn "*** ignoring unimplemented encoding indicator #{ei.inspect} after {" # }
+        r = CBOR::Box.from_instance(r, {ei: ei})
+        # warn "*** implementing encoding indicator #{ei.inspect} after {" # }
       end
       r
     end
@@ -10417,7 +10673,7 @@ module EDNGRAMMAR
       elements[0]
     end
 
-    def matchrawdelim
+    def alikerawdelim
       elements[2]
     end
   end
@@ -10554,7 +10810,7 @@ module EDNGRAMMAR
           r15 = instantiate_node(SyntaxNode,input, i15...index, s15)
           s13 << r15
           if r15
-            r17 = _nt_matchrawdelim
+            r17 = _nt_alikerawdelim
             s13 << r17
           end
         end
@@ -11281,7 +11537,7 @@ module EDNGRAMMAR
   end
 
   module RAppStringB644
-    def matchrawdelim
+    def alikerawdelim
       elements[2]
     end
   end
@@ -11505,7 +11761,7 @@ module EDNGRAMMAR
             r28 = instantiate_node(SyntaxNode,input, i28...index, s28)
             s26 << r28
             if r28
-              r30 = _nt_matchrawdelim
+              r30 = _nt_alikerawdelim
               s26 << r30
             end
           end

metadata

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