cddlc 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f35079da2cf258708ed948eb0c9b11bddff20f5a37c5967f0eed5bbc24d37821
-  data.tar.gz: cb4a9ac9618a27734cb1ab088b493f852e323227e19362b7012ab7b16c48b714
+  metadata.gz: dcc0bfbc969c582b8e4e40d841a908e514a9255b98215a0b90a658bcde763737
+  data.tar.gz: 82399e691f628b544bc236c1a4648ff36e977f075501235f1e07cfeac3cee6ed
 SHA512:
-  metadata.gz: 7edb8b482557190e6b7a79f0646183f7b32308fc5574931ae9d6e281af11cfa66640395057e6611c308ac713aac2958dde5d0f609bc405c6467ff86db64f47a2
-  data.tar.gz: c51b2735ae93b9ba9ca3671bec546e46345498829c14c0ed338fa782e8d95d7999ac0afcf97c7eabc5a11f564108cf816e975a1ee72c66f9244685f2eb82fa95
+  metadata.gz: e07d69bb1e25bbcf081cc8693429e489ed537712ace54ad14fcec31fb852ca630337d8617e00d380a0a2930ab1f9443feb02294e38e4d63c5af737960bf4e59e
+  data.tar.gz: 22ccbe0f63ee9675522c3303463d28e30381e535eee4431ca1696412b24b576580705ef3e6fc84c4978bc868367014aa9d33c71574f4b00e4cc7f60d0ac904f9

data/cddlc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cddlc"
-  s.version = "0.2.3"
+  s.version = "0.2.5"
   s.summary = "CDDL (Concise Data Definition Language) converters and miscellaneous tools"
   s.description = %q{cddlc implements converters and miscellaneous tools for CDDL, RFC 8610}
   s.author = "Carsten Bormann"

data/lib/cddlc.rb

@@ -162,8 +162,12 @@ class CDDL
             end
           end
           break unless got_more
+          recently_imported = to_be_imported
           to_be_imported = cddl_undefined # XXX square...
           warn "TO IMPORT #{to_be_imported.inspect}" if $options.verbose
+          if to_be_imported == recently_imported
+            fail "No progress importing #{to_be_imported.inspect} from #{fn} (generics issue?)"
+          end
           must_be_found = false
         end
         if preferred_tag

data/lib/parser/cddlgrammar.rb

@@ -3185,7 +3185,14 @@ module CDDLGRAMMAR
   end
 
   module SESC2
-    def ast() JSON.load("\"\\#{elements[1].text_value}\"") end
+    def ast
+                    tv = elements[1].text_value
+                    if /\Au\{(\h+)\}/ =~ tv
+                      $1.hex.chr(Encoding::UTF_8)
+                    else
+                      JSON.load("\"\\#{tv}\"")
+                    end
+                  end
   end
 
   def _nt_SESC
@@ -3350,6 +3357,12 @@ module CDDLGRAMMAR
   end
 
   module Hexchar0
+  end
+
+  module Hexchar1
+  end
+
+  module Hexchar2
     def high_surrogate
       elements[0]
     end
@@ -3371,51 +3384,138 @@ module CDDLGRAMMAR
     end
 
     i0 = index
-    r1 = _nt_non_surrogate
-    if r1
-      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
-      r0 = r1
+    i1, s1 = index, []
+    if (match_len = has_terminal?("{", false, index))
+      r2 = true
+      @index += match_len
     else
-      i2, s2 = index, []
-      r3 = _nt_high_surrogate
-      s2 << r3
+      terminal_parse_failure('"{"')
+      r2 = nil
+    end
+    s1 << r2
+    if r2
+      i3 = index
+      i4, s4 = index, []
+      s5, i5 = [], index
+      loop do
+        if (match_len = has_terminal?("0", false, index))
+          r6 = true
+          @index += match_len
+        else
+          terminal_parse_failure('"0"')
+          r6 = nil
+        end
+        if r6
+          s5 << r6
+        else
+          break
+        end
+      end
+      if s5.empty?
+        @index = i5
+        r5 = nil
+      else
+        r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+      end
+      s4 << r5
+      if r5
+        r8 = _nt_hexscalar
+        if r8
+          r7 = r8
+        else
+          r7 = instantiate_node(SyntaxNode,input, index...index)
+        end
+        s4 << r7
+      end
+      if s4.last
+        r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+        r4.extend(Hexchar0)
+      else
+        @index = i4
+        r4 = nil
+      end
+      if r4
+        r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+        r3 = r4
+      else
+        r9 = _nt_hexscalar
+        if r9
+          r9 = SyntaxNode.new(input, (index-1)...index) if r9 == true
+          r3 = r9
+        else
+          @index = i3
+          r3 = nil
+        end
+      end
+      s1 << r3
       if r3
-        if (match_len = has_terminal?("\\", false, index))
-          r4 = true
+        if (match_len = has_terminal?("}", false, index))
+          r10 = true
           @index += match_len
         else
-          terminal_parse_failure('"\\\\"')
-          r4 = nil
+          terminal_parse_failure('"}"')
+          r10 = nil
         end
-        s2 << r4
-        if r4
-          if (match_len = has_terminal?("u", false, index))
-            r5 = true
+        s1 << r10
+      end
+    end
+    if s1.last
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+      r1.extend(Hexchar1)
+    else
+      @index = i1
+      r1 = nil
+    end
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      r11 = _nt_non_surrogate
+      if r11
+        r11 = SyntaxNode.new(input, (index-1)...index) if r11 == true
+        r0 = r11
+      else
+        i12, s12 = index, []
+        r13 = _nt_high_surrogate
+        s12 << r13
+        if r13
+          if (match_len = has_terminal?("\\", false, index))
+            r14 = true
             @index += match_len
           else
-            terminal_parse_failure('"u"')
-            r5 = nil
+            terminal_parse_failure('"\\\\"')
+            r14 = nil
           end
-          s2 << r5
-          if r5
-            r6 = _nt_low_surrogate
-            s2 << r6
+          s12 << r14
+          if r14
+            if (match_len = has_terminal?("u", false, index))
+              r15 = true
+              @index += match_len
+            else
+              terminal_parse_failure('"u"')
+              r15 = nil
+            end
+            s12 << r15
+            if r15
+              r16 = _nt_low_surrogate
+              s12 << r16
+            end
           end
         end
-      end
-      if s2.last
-        r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-        r2.extend(Hexchar0)
-      else
-        @index = i2
-        r2 = nil
-      end
-      if r2
-        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
-        r0 = r2
-      else
-        @index = i0
-        r0 = nil
+        if s12.last
+          r12 = instantiate_node(SyntaxNode,input, i12...index, s12)
+          r12.extend(Hexchar2)
+        else
+          @index = i12
+          r12 = nil
+        end
+        if r12
+          r12 = SyntaxNode.new(input, (index-1)...index) if r12 == true
+          r0 = r12
+        else
+          @index = i0
+          r0 = nil
+        end
       end
     end
 
@@ -3840,6 +3940,152 @@ module CDDLGRAMMAR
     r0
   end
 
+  module Hexscalar0
+  end
+
+  module Hexscalar1
+    def HEXDIG1
+      elements[0]
+    end
+
+  end
+
+  def _nt_hexscalar
+    start_index = index
+    if node_cache[:hexscalar].has_key?(index)
+      cached = node_cache[:hexscalar][index]
+      if cached
+        node_cache[:hexscalar][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?("10", false, index))
+      r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
+    else
+      terminal_parse_failure('"10"')
+      r2 = nil
+    end
+    s1 << r2
+    if r2
+      s3, i3 = [], index
+      loop do
+        r4 = _nt_HEXDIG
+        if r4
+          s3 << r4
+        else
+          break
+        end
+        if s3.size == 4
+          break
+        end
+      end
+      if s3.size < 4
+        @index = i3
+        r3 = nil
+      else
+        if s3.size < 4
+          @terminal_failures.pop
+        end
+        r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+      end
+      s1 << r3
+    end
+    if s1.last
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+      r1.extend(Hexscalar0)
+    else
+      @index = i1
+      r1 = nil
+    end
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      i5, s5 = index, []
+      r6 = _nt_HEXDIG1
+      s5 << r6
+      if r6
+        s7, i7 = [], index
+        loop do
+          r8 = _nt_HEXDIG
+          if r8
+            s7 << r8
+          else
+            break
+          end
+          if s7.size == 4
+            break
+          end
+        end
+        if s7.size < 4
+          @index = i7
+          r7 = nil
+        else
+          if s7.size < 4
+            @terminal_failures.pop
+          end
+          r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
+        end
+        s5 << r7
+      end
+      if s5.last
+        r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+        r5.extend(Hexscalar1)
+      else
+        @index = i5
+        r5 = nil
+      end
+      if r5
+        r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
+        r0 = r5
+      else
+        r9 = _nt_non_surrogate
+        if r9
+          r9 = SyntaxNode.new(input, (index-1)...index) if r9 == true
+          r0 = r9
+        else
+          s10, i10 = [], index
+          loop do
+            r11 = _nt_HEXDIG
+            if r11
+              s10 << r11
+            else
+              break
+            end
+            if s10.size == 3
+              break
+            end
+          end
+          if s10.size < 1
+            @index = i10
+            r10 = nil
+          else
+            if s10.size < 3
+              @terminal_failures.pop
+            end
+            r10 = instantiate_node(SyntaxNode,input, i10...index, s10)
+          end
+          if r10
+            r10 = SyntaxNode.new(input, (index-1)...index) if r10 == true
+            r0 = r10
+          else
+            @index = i0
+            r0 = nil
+          end
+        end
+      end
+    end
+
+    node_cache[:hexscalar][start_index] = r0
+
+    r0
+  end
+
   module Bytes0
   end
 
@@ -4407,6 +4653,104 @@ module CDDLGRAMMAR
     r0
   end
 
+  def _nt_HEXDIG1
+    start_index = index
+    if node_cache[:HEXDIG1].has_key?(index)
+      cached = node_cache[:HEXDIG1][index]
+      if cached
+        node_cache[:HEXDIG1][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    r1 = _nt_DIGIT1
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      if (match_len = has_terminal?("a", :insens, index))
+        r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+        @index += match_len
+      else
+        terminal_parse_failure('"A"')
+        r2 = nil
+      end
+      if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+        r0 = r2
+      else
+        if (match_len = has_terminal?("b", :insens, index))
+          r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
+        else
+          terminal_parse_failure('"B"')
+          r3 = nil
+        end
+        if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+          r0 = r3
+        else
+          if (match_len = has_terminal?("c", :insens, index))
+            r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+            @index += match_len
+          else
+            terminal_parse_failure('"C"')
+            r4 = nil
+          end
+          if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+            r0 = r4
+          else
+            if (match_len = has_terminal?("d", :insens, index))
+              r5 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+              @index += match_len
+            else
+              terminal_parse_failure('"D"')
+              r5 = nil
+            end
+            if r5
+              r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
+              r0 = r5
+            else
+              if (match_len = has_terminal?("e", :insens, index))
+                r6 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                @index += match_len
+              else
+                terminal_parse_failure('"E"')
+                r6 = nil
+              end
+              if r6
+                r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
+                r0 = r6
+              else
+                if (match_len = has_terminal?("f", :insens, index))
+                  r7 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                  @index += match_len
+                else
+                  terminal_parse_failure('"F"')
+                  r7 = nil
+                end
+                if r7
+                  r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
+                  r0 = r7
+                else
+                  @index = i0
+                  r0 = nil
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+
+    node_cache[:HEXDIG1][start_index] = r0
+
+    r0
+  end
+
   def _nt_BINDIG
     start_index = index
     if node_cache[:BINDIG].has_key?(index)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddlc
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-13 00:00:00.000000000 Z
+date: 2024-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler