cbor-diag 0.10.1 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56baddf10e207846f9ef83665454cf578d5ba570523d62f56a5912138096fded
-  data.tar.gz: 19f2e413f8be97389c6663c225d0ba3a5152e1732d600a26beb81a140b9ba346
+  metadata.gz: 38def274f572f92dcd5b6cfd02fc4e7b0bc2006f5339f5db046e1b9bb388fcaa
+  data.tar.gz: f8027b5da38f62e5b0411f55c182fae2025768be56ed978775e491273a19e150
 SHA512:
-  metadata.gz: 94ec9f6276a20a619ccc9e6453e342738ce856ab6d7cba72f9a9d5f16c1b75ce91d7438dbace16ebca9636838e78a5477c764ec65bd0d2ad4f60e2a994d1dee1
-  data.tar.gz: 37c410853afacedda5b238d83c4792781a4bf7a7007f5792222cf64a37beb9000b3375b79d9022ec69ff534ec1f8151ea06155f352b435ad2eab5ba8d3ba0945
+  metadata.gz: 8ad0cd6b46dd03e2fd5457a440bea503ece1e4dc293dde4a701f41f9434092d26e4576711afc321ceddf9a661e81e7b4ada743f37a0c25f4e04c475bbfd9fed0
+  data.tar.gz: 8a55d75ba512cbceeed3f995d10615a0666d892449c13c1b729d69858fe3180b4fe4eee2ac06dca4bb8a31787a40d0b687f0205df77bd6fae5b6226e194e18cd

data/cbor-diag.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cbor-diag"
-  s.version = "0.10.1"
+  s.version = "0.10.3"
   s.summary = "CBOR (Concise Binary Object Representation) diagnostic notation"
   s.description = %q{cbor-diag implements diagnostic notation for CBOR, RFC 8949 and RFC 8742}
   s.author = "Carsten Bormann"

data/lib/cbor-diag-parser.rb

@@ -9,16 +9,12 @@ module CBOR_DIAG
   end
 
   module Text0
-    def ows1
-      elements[1]
+    def soc
+      elements[0]
     end
 
     def value
-      elements[2]
-    end
-
-    def ows2
-      elements[3]
+      elements[1]
     end
   end
 
@@ -34,20 +30,20 @@ module CBOR_DIAG
     def an
       elements[2]
     end
+
+    def soc
+      elements[3]
+    end
   end
 
   module Text2
-    def ows1
+    def ows
       elements[0]
     end
 
     def a1
       elements[1]
     end
-
-    def ows2
-      elements[2]
-    end
   end
 
   module Text3
@@ -90,25 +86,11 @@ module CBOR_DIAG
           s6, i6 = [], index
           loop do
             i7, s7 = index, []
-            if (match_len = has_terminal?(',', false, index))
-              r8 = true
-              @index += match_len
-            else
-              terminal_parse_failure('\',\'')
-              r8 = nil
-            end
+            r8 = _nt_soc
             s7 << r8
             if r8
-              r9 = _nt_ows
+              r9 = _nt_value
               s7 << r9
-              if r9
-                r10 = _nt_value
-                s7 << r10
-                if r10
-                  r11 = _nt_ows
-                  s7 << r11
-                end
-              end
             end
             if s7.last
               r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
@@ -125,6 +107,10 @@ module CBOR_DIAG
           end
           r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
           s3 << r6
+          if r6
+            r10 = _nt_soc
+            s3 << r10
+          end
         end
       end
       if s3.last
@@ -140,10 +126,6 @@ module CBOR_DIAG
         r2 = instantiate_node(SyntaxNode,input, index...index)
       end
       s0 << r2
-      if r2
-        r12 = _nt_ows
-        s0 << r12
-      end
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
@@ -2554,16 +2536,12 @@ module CBOR_DIAG
   end
 
   module Array0
-    def ows1
-      elements[1]
+    def soc
+      elements[0]
     end
 
     def value
-      elements[2]
-    end
-
-    def ows2
-      elements[3]
+      elements[1]
     end
   end
 
@@ -2590,7 +2568,7 @@ module CBOR_DIAG
       elements[2]
     end
 
-    def ows
+    def soc
       elements[3]
     end
 
@@ -2644,25 +2622,11 @@ module CBOR_DIAG
             s7, i7 = [], index
             loop do
               i8, s8 = index, []
-              if (match_len = has_terminal?(',', false, index))
-                r9 = true
-                @index += match_len
-              else
-                terminal_parse_failure('\',\'')
-                r9 = nil
-              end
+              r9 = _nt_soc
               s8 << r9
               if r9
-                r10 = _nt_ows
+                r10 = _nt_value
                 s8 << r10
-                if r10
-                  r11 = _nt_value
-                  s8 << r11
-                  if r11
-                    r12 = _nt_ows
-                    s8 << r12
-                  end
-                end
               end
               if s8.last
                 r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
@@ -2695,17 +2659,17 @@ module CBOR_DIAG
         end
         s0 << r3
         if r3
-          r13 = _nt_ows
-          s0 << r13
-          if r13
+          r11 = _nt_soc
+          s0 << r11
+          if r11
             if (match_len = has_terminal?(']', false, index))
-              r14 = true
+              r12 = true
               @index += match_len
             else
               terminal_parse_failure('\']\'')
-              r14 = nil
+              r12 = nil
             end
-            s0 << r14
+            s0 << r12
           end
         end
       end
@@ -2725,16 +2689,12 @@ module CBOR_DIAG
   end
 
   module Map0
-    def ows1
-      elements[1]
+    def soc
+      elements[0]
     end
 
     def kp
-      elements[2]
-    end
-
-    def ows2
-      elements[3]
+      elements[1]
     end
   end
 
@@ -2761,7 +2721,7 @@ module CBOR_DIAG
       elements[2]
     end
 
-    def ows
+    def soc
       elements[3]
     end
 
@@ -2770,7 +2730,7 @@ module CBOR_DIAG
   module Map3
     def to_rb
       r = if e = a1.elements
-        Hash[ [e[0].to_rb] + e[2].elements.map {|x| x.kp.to_rb } ]
+        Hash.cbor_from_entries([e[0].to_rb] + e[2].elements.map {|x| x.kp.to_rb })
       else
         {}
       end
@@ -2815,25 +2775,11 @@ module CBOR_DIAG
             s7, i7 = [], index
             loop do
               i8, s8 = index, []
-              if (match_len = has_terminal?(',', false, index))
-                r9 = true
-                @index += match_len
-              else
-                terminal_parse_failure('\',\'')
-                r9 = nil
-              end
+              r9 = _nt_soc
               s8 << r9
               if r9
-                r10 = _nt_ows
+                r10 = _nt_kp
                 s8 << r10
-                if r10
-                  r11 = _nt_kp
-                  s8 << r11
-                  if r11
-                    r12 = _nt_ows
-                    s8 << r12
-                  end
-                end
               end
               if s8.last
                 r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
@@ -2866,17 +2812,17 @@ module CBOR_DIAG
         end
         s0 << r3
         if r3
-          r13 = _nt_ows
-          s0 << r13
-          if r13
+          r11 = _nt_soc
+          s0 << r11
+          if r11
             if (match_len = has_terminal?('}', false, index))
-              r14 = true
+              r12 = true
               @index += match_len
             else
               terminal_parse_failure('\'}\'')
-              r14 = nil
+              r12 = nil
             end
-            s0 << r14
+            s0 << r12
           end
         end
       end
@@ -3098,6 +3044,79 @@ module CBOR_DIAG
     r0
   end
 
+  module Soc0
+    def ows
+      elements[1]
+    end
+  end
+
+  module Soc1
+    def ows
+      elements[0]
+    end
+
+  end
+
+  module Soc2
+    def sval; "" end
+  end
+
+  def _nt_soc
+    start_index = index
+    if node_cache[:soc].has_key?(index)
+      cached = node_cache[:soc][index]
+      if cached
+        node_cache[:soc][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    r1 = _nt_ows
+    s0 << r1
+    if r1
+      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_ows
+        s3 << r5
+      end
+      if s3.last
+        r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+        r3.extend(Soc0)
+      else
+        @index = i3
+        r3 = nil
+      end
+      if r3
+        r2 = r3
+      else
+        r2 = instantiate_node(SyntaxNode,input, index...index)
+      end
+      s0 << r2
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(Soc1)
+      r0.extend(Soc2)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:soc][start_index] = r0
+
+    r0
+  end
+
   module Streamstring0
     def ows1
       elements[1]

data/lib/cbor-diagnostic.rb

@@ -109,7 +109,7 @@ end
 
 class Hash
   def cbor_diagnostic(options = {})
-    "{#{"_ " if cbor_stream?}#{map{ |k, v| %{#{k.cbor_diagnostic(options)}: #{v.cbor_diagnostic(options)}}}.join(", ")}}"
+    "{#{"_ " if cbor_stream?}#{map{ |k, v| %{#{k.cbor_diagnostic(options)}: #{v.cbor_diagnostic(options)}}}.join(", ")}#{cbor_map_lost_warning}}"
   end
 end
 

data/lib/cbor-pretty.rb

@@ -18,16 +18,22 @@ class String
     ret.encode(Encoding::UTF_16BE) # exception if bad
     ret
   end
+  attr_accessor :cbor_warnings
 end
 
 
 module CBOR
-  def self.pretty(s, indent = 0, max_target = 40)
-    Buffer.new(s).pretty_item_final(indent, max_target)
+  def self.pretty(s, indent = 0, max_target = 40, warnings: nil)
+    b = Buffer.new(s)
+    warnings ||= s.cbor_warnings
+    b.warnings = warnings if warnings
+    b.pretty_item_final(indent, max_target)
   end
 
-  def self.pretty_seq(s, indent = 0, max_target = 40)
+  def self.pretty_seq(s, indent = 0, max_target = 40, warnings: nil)
     b = Buffer.new(s)
+    warnings ||= s.cbor_warnings
+    b.warnings = warnings if warnings
     res = ''                    # XXX: not all indented the same
     while !b.empty?
       res << b.pretty_item_final(indent, max_target, true)
@@ -37,16 +43,24 @@ module CBOR
 
   class Buffer
 
+  attr_accessor :warnings
+
   def take_and_print(n, prefix = '')
     s = take(n)
     @out << prefix
     @out << s.hexbytes
     s
   end
-  
+
+  def warning_message
+    if warnings
+      warnings[@item_pos]
+    end
+  end
+
   def pretty_item_streaming(ib)
     res = nil
-    @out << " # #{MT_NAMES[ib >> 5]}(*)\n"
+    @out << " # #{MT_NAMES[ib >> 5]}(*)#{warning_message}\n"
     @indent += 1
     case ib >>= 5
     when 2, 3, 4, 5
@@ -62,6 +76,7 @@ module CBOR
   MT_NAMES = ["unsigned", "negative", "bytes", "text", "array", "map", "tag", "primitive"]
 
   def pretty_item
+    @item_pos = @pos
     ib = take_and_print(1, '   ' * @indent).ord
     ai = ib & 0x1F
     val = case ai
@@ -73,7 +88,7 @@ module CBOR
           when 31; return pretty_item_streaming(ib)
           else raise "unknown additional information #{ai} in ib #{ib}"
           end
-    @out << " # #{MT_NAMES[ib >> 5]}(#{val})\n"
+    @out << " # #{MT_NAMES[ib >> 5]}(#{val})#{warning_message}\n"
     @indent += 1
     case ib >>= 5
     when 6

data/lib/cbor-pure.rb

@@ -35,6 +35,31 @@ module CBOR
   end
   Object.send(:include, CoreExt)
 
+  class ::Hash
+    attr_accessor :cbor_entries
+    def self.cbor_from_entries(entries)
+      h = Hash[entries]
+      if h.size != entries.size   # dupkeys found
+        h.cbor_entries = entries
+      end
+      h
+    end
+    def cbor_map_push(key, value, entries)
+      entries << [key, value]
+      n = size
+      self[key] = value
+      if n == size # key was overwritten
+        self.cbor_entries = entries
+      end
+    end
+    def cbor_map_lost_warning
+      if cbor_entries
+        lost = cbor_entries.size - size
+        " / #{lost} DUP KEY#{"S" if lost > 1} LOST / "
+      end
+    end
+  end
+
   class Break
   end
   BREAK = Break.new.freeze
@@ -217,6 +242,9 @@ module CBOR
         d.each {|di| add(di)}
       end
     when Hash
+      if warning = d.cbor_map_lost_warning
+        (@buffer.cbor_warnings ||= {})[@buffer.bytesize] = warning
+      end
       if d.cbor_stream?
         @buffer << 0xbf
         d.each {|k, v| add(k); add(v)}
@@ -266,8 +294,10 @@ module CBOR
     when 5
       result = Hash.new
       result.cbor_stream!
+      entries = []
       while (key = decode_item(true)) != BREAK
-        result[key] = decode_item
+        value = decode_item
+        result.cbor_map_push(key, value, entries)
       end
       result
     when 7
@@ -327,7 +357,7 @@ module CBOR
     when 2; take(val).force_encoding(Encoding::BINARY)
     when 3; take(val).force_encoding(Encoding::UTF_8)
     when 4; atleast(val); Array.new(val) { decode_item }
-    when 5; atleast(val<<1); Hash[Array.new(val) {[decode_item, decode_item]}]
+    when 5; atleast(val<<1); Hash.cbor_from_entries(Array.new(val) {[decode_item, decode_item]})
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.3
 platform: ruby
 authors:
 - Carsten Bormann
 bindir: bin
 cert_chain: []
-date: 2025-08-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.7.2
 specification_version: 4
 summary: CBOR (Concise Binary Object Representation) diagnostic notation
 test_files: []