cbor-diag 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56baddf10e207846f9ef83665454cf578d5ba570523d62f56a5912138096fded
-  data.tar.gz: 19f2e413f8be97389c6663c225d0ba3a5152e1732d600a26beb81a140b9ba346
+  metadata.gz: 23a24a03600aade04721f48ff64a5b1dc708bb23f52e9c579072ddeb25f14dab
+  data.tar.gz: ffd756ef269c0176c07ec8570e098adcee32fa7f505a25bf2e87bfee1007a7a9
 SHA512:
-  metadata.gz: 94ec9f6276a20a619ccc9e6453e342738ce856ab6d7cba72f9a9d5f16c1b75ce91d7438dbace16ebca9636838e78a5477c764ec65bd0d2ad4f60e2a994d1dee1
-  data.tar.gz: 37c410853afacedda5b238d83c4792781a4bf7a7007f5792222cf64a37beb9000b3375b79d9022ec69ff534ec1f8151ea06155f352b435ad2eab5ba8d3ba0945
+  metadata.gz: 85030b510f22cd8d78259dadba6af46be60de6ec95a61b1b8dfaded0a9efaa42ba6bd33f4c4edbf8f5856bbbd59510366c4b196f6adf6109f6129b450f28fdf0
+  data.tar.gz: c71f5e097c5891f0bfe21f1540e0b329e40c56b14baf381aff4da47dcc5d4676f6e9074d544f95e33619c5c8837c3685f16121dd9717da3d7367785400e32bdc

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.2"
   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
 
@@ -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]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 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.6.9
 specification_version: 4
 summary: CBOR (Concise Binary Object Representation) diagnostic notation
 test_files: []