cddlc 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1b9a4aa1c2c8b9ba3310cdca0201947f6bd08c7d229443d462ac2881e3d0768
-  data.tar.gz: 7873a339b9f98917635e0d9e5bd6a1a62ce096b2ba6fb39d1daced9eb328209b
+  metadata.gz: 441f617191e302fe38e2a0622ab0cc7e218ab88b5753565b7d156e0d4648da8e
+  data.tar.gz: 4a79ff5132f0a0c92a011a50ea238f9c58472cea52f27c7edd502e057f4dd570
 SHA512:
-  metadata.gz: ac5068f18dc4881e9b52edeb0e262d806f788d72835ca3bfd020911f1414bc60a8a35fe18b7ede71d56bee3c25e263afa16e81f7d8fabee349fe9c0e9c57218a
-  data.tar.gz: 3676274ba515d3ec01677a2e0db3e988659e692c9457e01566122dc672f00ec0d1490d602139d13e962ebd31544a6d90ae88842f466edbc65d3c2373d2b9a948
+  metadata.gz: 631b1d41853d7b8f6a1df2a0ba47c8a474d3142daa8282bb83dbc86434a824b188a033cebdb892b8e7e5b4c08fec7e24dd88933e6de11e210b077a5ff666ce88
+  data.tar.gz: 1c2f44dbc2a98c1716b0758be614f8872b8a1921a2ffd9061099425d5e84d8861785204f1c80d1f9dd5f77f8583138a95d44489978834e0df83e4dacd7686624

data/cddlc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cddlc"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
   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/parser/cddlgrammar.rb

@@ -3106,9 +3106,15 @@ module CDDLGRAMMAR
   end
 
   module SESC0
+    def hexchar
+      elements[1]
+    end
   end
 
   module SESC1
+  end
+
+  module SESC2
     def ast() JSON.load("\"\\#{elements[1].text_value}\"") end
   end
 
@@ -3134,38 +3140,135 @@ module CDDLGRAMMAR
     s0 << r1
     if r1
       i2 = index
-      if has_terminal?(@regexps[gr = '\A[\\ -~]'] ||= Regexp.new(gr), :regexp, index)
+      if (match_len = has_terminal?("\"", false, index))
         r3 = true
-        @index += 1
+        @index += match_len
       else
-        terminal_parse_failure('[\\ -~]')
+        terminal_parse_failure('"\\""')
         r3 = nil
       end
       if r3
         r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
         r2 = r3
       else
-        if has_terminal?(@regexps[gr = '\A[€-􏿽]'] ||= Regexp.new(gr), :regexp, index)
+        if (match_len = has_terminal?("/", false, index))
           r4 = true
-          @index += 1
+          @index += match_len
         else
-          terminal_parse_failure('[€-􏿽]')
+          terminal_parse_failure('"/"')
           r4 = nil
         end
         if r4
           r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
           r2 = r4
         else
-          @index = i2
-          r2 = nil
+          if (match_len = has_terminal?("\\", false, index))
+            r5 = true
+            @index += match_len
+          else
+            terminal_parse_failure('"\\\\"')
+            r5 = nil
+          end
+          if r5
+            r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
+            r2 = r5
+          else
+            if (match_len = has_terminal?("b", false, index))
+              r6 = true
+              @index += match_len
+            else
+              terminal_parse_failure('"b"')
+              r6 = nil
+            end
+            if r6
+              r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
+              r2 = r6
+            else
+              if (match_len = has_terminal?("f", false, index))
+                r7 = true
+                @index += match_len
+              else
+                terminal_parse_failure('"f"')
+                r7 = nil
+              end
+              if r7
+                r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
+                r2 = r7
+              else
+                if (match_len = has_terminal?("n", false, index))
+                  r8 = true
+                  @index += match_len
+                else
+                  terminal_parse_failure('"n"')
+                  r8 = nil
+                end
+                if r8
+                  r8 = SyntaxNode.new(input, (index-1)...index) if r8 == true
+                  r2 = r8
+                else
+                  if (match_len = has_terminal?("r", false, index))
+                    r9 = true
+                    @index += match_len
+                  else
+                    terminal_parse_failure('"r"')
+                    r9 = nil
+                  end
+                  if r9
+                    r9 = SyntaxNode.new(input, (index-1)...index) if r9 == true
+                    r2 = r9
+                  else
+                    if (match_len = has_terminal?("t", false, index))
+                      r10 = true
+                      @index += match_len
+                    else
+                      terminal_parse_failure('"t"')
+                      r10 = nil
+                    end
+                    if r10
+                      r10 = SyntaxNode.new(input, (index-1)...index) if r10 == true
+                      r2 = r10
+                    else
+                      i11, s11 = index, []
+                      if (match_len = has_terminal?("u", false, index))
+                        r12 = true
+                        @index += match_len
+                      else
+                        terminal_parse_failure('"u"')
+                        r12 = nil
+                      end
+                      s11 << r12
+                      if r12
+                        r13 = _nt_hexchar
+                        s11 << r13
+                      end
+                      if s11.last
+                        r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
+                        r11.extend(SESC0)
+                      else
+                        @index = i11
+                        r11 = nil
+                      end
+                      if r11
+                        r11 = SyntaxNode.new(input, (index-1)...index) if r11 == true
+                        r2 = r11
+                      else
+                        @index = i2
+                        r2 = nil
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
         end
       end
       s0 << r2
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(SESC0)
       r0.extend(SESC1)
+      r0.extend(SESC2)
     else
       @index = i0
       r0 = nil
@@ -3176,6 +3279,414 @@ module CDDLGRAMMAR
     r0
   end
 
+  module Hexchar0
+  end
+
+  module Hexchar1
+  end
+
+  module Hexchar2
+  end
+
+  module Hexchar3
+  end
+
+  def _nt_hexchar
+    start_index = index
+    if node_cache[:hexchar].has_key?(index)
+      cached = node_cache[:hexchar][index]
+      if cached
+        node_cache[:hexchar][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    i1, s1 = index, []
+    i2 = index
+    r3 = _nt_DIGIT
+    if r3
+      r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+      r2 = r3
+    else
+      if (match_len = has_terminal?("a", :insens, index))
+        r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+        @index += match_len
+      else
+        terminal_parse_failure('"A"')
+        r4 = nil
+      end
+      if r4
+        r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+        r2 = r4
+      else
+        if (match_len = has_terminal?("b", :insens, index))
+          r5 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
+        else
+          terminal_parse_failure('"B"')
+          r5 = nil
+        end
+        if r5
+          r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
+          r2 = r5
+        else
+          if (match_len = has_terminal?("c", :insens, index))
+            r6 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+            @index += match_len
+          else
+            terminal_parse_failure('"C"')
+            r6 = nil
+          end
+          if r6
+            r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
+            r2 = r6
+          else
+            if (match_len = has_terminal?("e", :insens, index))
+              r7 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+              @index += match_len
+            else
+              terminal_parse_failure('"E"')
+              r7 = nil
+            end
+            if r7
+              r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
+              r2 = r7
+            else
+              if (match_len = has_terminal?("f", :insens, index))
+                r8 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                @index += match_len
+              else
+                terminal_parse_failure('"F"')
+                r8 = nil
+              end
+              if r8
+                r8 = SyntaxNode.new(input, (index-1)...index) if r8 == true
+                r2 = r8
+              else
+                @index = i2
+                r2 = nil
+              end
+            end
+          end
+        end
+      end
+    end
+    s1 << r2
+    if r2
+      s9, i9 = [], index
+      loop do
+        r10 = _nt_HEXDIG
+        if r10
+          s9 << r10
+        else
+          break
+        end
+        if s9.size == 3
+          break
+        end
+      end
+      if s9.size < 3
+        @index = i9
+        r9 = nil
+      else
+        if s9.size < 3
+          @terminal_failures.pop
+        end
+        r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
+      end
+      s1 << r9
+    end
+    if s1.last
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+      r1.extend(Hexchar0)
+    else
+      @index = i1
+      r1 = nil
+    end
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      i11, s11 = index, []
+      if (match_len = has_terminal?("d", :insens, index))
+        r12 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+        @index += match_len
+      else
+        terminal_parse_failure('"D"')
+        r12 = nil
+      end
+      s11 << r12
+      if r12
+        i13 = index
+        i14, s14 = index, []
+        if has_terminal?(@regexps[gr = '\A[0-7]'] ||= Regexp.new(gr), :regexp, index)
+          r15 = true
+          @index += 1
+        else
+          terminal_parse_failure('[0-7]')
+          r15 = nil
+        end
+        s14 << r15
+        if r15
+          s16, i16 = [], index
+          loop do
+            r17 = _nt_HEXDIG
+            if r17
+              s16 << r17
+            else
+              break
+            end
+            if s16.size == 2
+              break
+            end
+          end
+          if s16.size < 2
+            @index = i16
+            r16 = nil
+          else
+            if s16.size < 2
+              @terminal_failures.pop
+            end
+            r16 = instantiate_node(SyntaxNode,input, i16...index, s16)
+          end
+          s14 << r16
+        end
+        if s14.last
+          r14 = instantiate_node(SyntaxNode,input, i14...index, s14)
+          r14.extend(Hexchar1)
+        else
+          @index = i14
+          r14 = nil
+        end
+        if r14
+          r14 = SyntaxNode.new(input, (index-1)...index) if r14 == true
+          r13 = r14
+        else
+          i18, s18 = index, []
+          i19 = index
+          if (match_len = has_terminal?("8", false, index))
+            r20 = true
+            @index += match_len
+          else
+            terminal_parse_failure('"8"')
+            r20 = nil
+          end
+          if r20
+            r20 = SyntaxNode.new(input, (index-1)...index) if r20 == true
+            r19 = r20
+          else
+            if (match_len = has_terminal?("9", false, index))
+              r21 = true
+              @index += match_len
+            else
+              terminal_parse_failure('"9"')
+              r21 = nil
+            end
+            if r21
+              r21 = SyntaxNode.new(input, (index-1)...index) if r21 == true
+              r19 = r21
+            else
+              if (match_len = has_terminal?("a", :insens, index))
+                r22 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                @index += match_len
+              else
+                terminal_parse_failure('"A"')
+                r22 = nil
+              end
+              if r22
+                r22 = SyntaxNode.new(input, (index-1)...index) if r22 == true
+                r19 = r22
+              else
+                if (match_len = has_terminal?("b", :insens, index))
+                  r23 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                  @index += match_len
+                else
+                  terminal_parse_failure('"B"')
+                  r23 = nil
+                end
+                if r23
+                  r23 = SyntaxNode.new(input, (index-1)...index) if r23 == true
+                  r19 = r23
+                else
+                  @index = i19
+                  r19 = nil
+                end
+              end
+            end
+          end
+          s18 << r19
+          if r19
+            s24, i24 = [], index
+            loop do
+              r25 = _nt_HEXDIG
+              if r25
+                s24 << r25
+              else
+                break
+              end
+              if s24.size == 2
+                break
+              end
+            end
+            if s24.size < 2
+              @index = i24
+              r24 = nil
+            else
+              if s24.size < 2
+                @terminal_failures.pop
+              end
+              r24 = instantiate_node(SyntaxNode,input, i24...index, s24)
+            end
+            s18 << r24
+            if r24
+              if (match_len = has_terminal?("\\", false, index))
+                r26 = true
+                @index += match_len
+              else
+                terminal_parse_failure('"\\\\"')
+                r26 = nil
+              end
+              s18 << r26
+              if r26
+                if (match_len = has_terminal?("u", false, index))
+                  r27 = true
+                  @index += match_len
+                else
+                  terminal_parse_failure('"u"')
+                  r27 = nil
+                end
+                s18 << r27
+                if r27
+                  if (match_len = has_terminal?("d", :insens, index))
+                    r28 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                    @index += match_len
+                  else
+                    terminal_parse_failure('"D"')
+                    r28 = nil
+                  end
+                  s18 << r28
+                  if r28
+                    i29 = index
+                    if (match_len = has_terminal?("c", :insens, index))
+                      r30 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                      @index += match_len
+                    else
+                      terminal_parse_failure('"C"')
+                      r30 = nil
+                    end
+                    if r30
+                      r30 = SyntaxNode.new(input, (index-1)...index) if r30 == true
+                      r29 = r30
+                    else
+                      if (match_len = has_terminal?("d", :insens, index))
+                        r31 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                        @index += match_len
+                      else
+                        terminal_parse_failure('"D"')
+                        r31 = nil
+                      end
+                      if r31
+                        r31 = SyntaxNode.new(input, (index-1)...index) if r31 == true
+                        r29 = r31
+                      else
+                        if (match_len = has_terminal?("e", :insens, index))
+                          r32 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                          @index += match_len
+                        else
+                          terminal_parse_failure('"E"')
+                          r32 = nil
+                        end
+                        if r32
+                          r32 = SyntaxNode.new(input, (index-1)...index) if r32 == true
+                          r29 = r32
+                        else
+                          if (match_len = has_terminal?("f", :insens, index))
+                            r33 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                            @index += match_len
+                          else
+                            terminal_parse_failure('"F"')
+                            r33 = nil
+                          end
+                          if r33
+                            r33 = SyntaxNode.new(input, (index-1)...index) if r33 == true
+                            r29 = r33
+                          else
+                            @index = i29
+                            r29 = nil
+                          end
+                        end
+                      end
+                    end
+                    s18 << r29
+                    if r29
+                      s34, i34 = [], index
+                      loop do
+                        r35 = _nt_HEXDIG
+                        if r35
+                          s34 << r35
+                        else
+                          break
+                        end
+                        if s34.size == 2
+                          break
+                        end
+                      end
+                      if s34.size < 2
+                        @index = i34
+                        r34 = nil
+                      else
+                        if s34.size < 2
+                          @terminal_failures.pop
+                        end
+                        r34 = instantiate_node(SyntaxNode,input, i34...index, s34)
+                      end
+                      s18 << r34
+                    end
+                  end
+                end
+              end
+            end
+          end
+          if s18.last
+            r18 = instantiate_node(SyntaxNode,input, i18...index, s18)
+            r18.extend(Hexchar2)
+          else
+            @index = i18
+            r18 = nil
+          end
+          if r18
+            r18 = SyntaxNode.new(input, (index-1)...index) if r18 == true
+            r13 = r18
+          else
+            @index = i13
+            r13 = nil
+          end
+        end
+        s11 << r13
+      end
+      if s11.last
+        r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
+        r11.extend(Hexchar3)
+      else
+        @index = i11
+        r11 = nil
+      end
+      if r11
+        r11 = SyntaxNode.new(input, (index-1)...index) if r11 == true
+        r0 = r11
+      else
+        @index = i0
+        r0 = nil
+      end
+    end
+
+    node_cache[:hexchar][start_index] = r0
+
+    r0
+  end
+
   module Bytes0
   end
 
@@ -3299,13 +3810,25 @@ module CDDLGRAMMAR
             r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
           else
-            r5 = _nt_CRLF
+            if (match_len = has_terminal?("\\'", false, index))
+              r5 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+              @index += match_len
+            else
+              terminal_parse_failure('"\\\\\'"')
+              r5 = nil
+            end
             if r5
               r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
               r0 = r5
             else
-              @index = i0
-              r0 = nil
+              r6 = _nt_CRLF
+              if r6
+                r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
+                r0 = r6
+              else
+                @index = i0
+                r0 = nil
+              end
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddlc
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler