edn-abnf 0.5.39 → 0.5.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17c5fde6eec17c35da2e94196c5eb582ef05e8586c997c38b989f044460c9a03
-  data.tar.gz: 964e47d82a247a6b17a0b479a8b2ac1dacf284baa5068a4458938726980de944
+  metadata.gz: de28a614a741d47c75211e7ce766b896eebba945650b50064c1396113ebedab5
+  data.tar.gz: d41d07de68ab73180ce660292ec6de440611f77053606a4d9288decd833b0190
 SHA512:
-  metadata.gz: 1d1b16c8fcc99e5cad651830b0ddb515b1321b2f177951376128fc26fc62fd5afbf1848a119876ad54557042192dea72a679bffc3b4d1bd515bc41b2520c4558
-  data.tar.gz: 8bc3c115e0b0576c4796d65846064747a7254fd9e9082ca4a99048d3130f485134a8fdd5a40d677a2239b50acb7b3a9d69c69c0a0c52609f43ecbc8a71881a4e
+  metadata.gz: 584bd20fd1b50db4a40e8cef5200ad70957e4420cb2c593ea228e309102c4ae25c00632246f411c0bb9046571206239b1360180b5b7d467f9ef0f6eee9ad14f4
+  data.tar.gz: e8bdb98fcf3be1ef80d67738154cc4428e8420964e3f3492dcf478c4a95f46fe16663780a1ba6f4065e2caaac66d76c9c8b559e4ef9431f41a080faf346f13b3

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.5.39"
+  s.version = "0.5.40"
   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/parser/edngrammar.rb

@@ -252,12 +252,12 @@ module EDNGRAMMAR
     r0
   end
 
-  def _nt_string1e
+  def _nt_string
     start_index = index
-    if node_cache[:string1e].has_key?(index)
-      cached = node_cache[:string1e][index]
+    if node_cache[:string].has_key?(index)
+      cached = node_cache[:string][index]
       if cached
-        node_cache[:string1e][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:string][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -279,7 +279,7 @@ module EDNGRAMMAR
       end
     end
 
-    node_cache[:string1e][start_index] = r0
+    node_cache[:string][start_index] = r0
 
     r0
   end
@@ -328,120 +328,6 @@ module EDNGRAMMAR
     r0
   end
 
-  module String0
-    def S1
-      elements[0]
-    end
-
-    def S2
-      elements[2]
-    end
-
-    def string1e
-      elements[3]
-    end
-  end
-
-  module String1
-    def string1e
-      elements[0]
-    end
-
-  end
-
-  module String2
-    def join1(s)
-      s.join # XXX -- look at encoding and ei
-    end
-    def unpack_chunk(c, s)
-      if c == String
-        join1(s)
-      else
-        unless c == CBOR::Tagged && s.first.tag == 888 && s.first.value == nil # XXX check all values?
-          raise ArgumentError, "*** unjoinable chunks #{c.inspect} #{s.inspect}" if s.size != 1
-        end
-        s.first
-      end
-    end
-    def ast
-      arr = [elements[0].ast] + elements[1].elements.map {|x| x.elements[3].ast}
-      charr = arr.chunk(&:class).to_a
-      if charr.size == 1
-        unpack_chunk(*charr.first)
-      else
-        CBOR::Tagged.new(888, charr.map {|x| unpack_chunk(*x)})
-      end
-    end
-  end
-
-  def _nt_string
-    start_index = index
-    if node_cache[:string].has_key?(index)
-      cached = node_cache[:string][index]
-      if cached
-        node_cache[:string][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-        @index = cached.interval.end
-      end
-      return cached
-    end
-
-    i0, s0 = index, []
-    r1 = _nt_string1e
-    s0 << r1
-    if r1
-      s2, i2 = [], index
-      loop do
-        i3, s3 = index, []
-        r4 = _nt_S
-        s3 << r4
-        if r4
-          if (match_len = has_terminal?("+", false, index))
-            r5 = true
-            @index += match_len
-          else
-            terminal_parse_failure('"+"')
-            r5 = nil
-          end
-          s3 << r5
-          if r5
-            r6 = _nt_S
-            s3 << r6
-            if r6
-              r7 = _nt_string1e
-              s3 << r7
-            end
-          end
-        end
-        if s3.last
-          r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
-          r3.extend(String0)
-        else
-          @index = i3
-          r3 = nil
-        end
-        if r3
-          s2 << r3
-        else
-          break
-        end
-      end
-      r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-      s0 << r2
-    end
-    if s0.last
-      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(String1)
-      r0.extend(String2)
-    else
-      @index = i0
-      r0 = nil
-    end
-
-    node_cache[:string][start_index] = r0
-
-    r0
-  end
-
   module Number0
     def spec
       elements[1]
@@ -2214,30 +2100,30 @@ module EDNGRAMMAR
   end
 
   module Rawstring0
-    def rawcontent0
-      elements[1]
+    def startrawdelim
+      elements[0]
     end
 
-  end
-
-  module Rawstring1
-    def rawcontent
+    def raw_inner
       elements[1]
     end
-  end
-
-  module Rawstring2
-    def startrawdelim
-      elements[0]
-    end
 
     def alikerawdelim
       elements[2]
     end
   end
 
-  module Rawstring3
-    def ast; elements[1].elements[1].text_value.gsub("\r", "") end
+  module Rawstring1
+    def ast
+                                     val = raw_inner.text_value.gsub("\r", "")
+                                     if val[0] == ' ' && val[-1] == ' '
+                                       val[1...-1]
+                                     elsif val[0] == "\n"
+                                       val[1..-1]
+                                     else
+                                       val
+                                     end
+                                   end
   end
 
   def _nt_rawstring
@@ -2255,78 +2141,17 @@ module EDNGRAMMAR
     r1 = _nt_startrawdelim
     s0 << r1
     if r1
-      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
-        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
+      r2 = _nt_raw_inner
       s0 << r2
       if r2
-        r11 = _nt_alikerawdelim
-        s0 << r11
+        r3 = _nt_alikerawdelim
+        s0 << r3
       end
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Rawstring2)
-      r0.extend(Rawstring3)
+      r0.extend(Rawstring0)
+      r0.extend(Rawstring1)
     else
       @index = i0
       r0 = nil
@@ -2610,100 +2435,12 @@ 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
+  def _nt_raw_inner
     start_index = index
-    if node_cache[:rawcontent].has_key?(index)
-      cached = node_cache[:rawcontent][index]
+    if node_cache[:raw_inner].has_key?(index)
+      cached = node_cache[:raw_inner][index]
       if cached
-        node_cache[:rawcontent][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:raw_inner][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -2739,112 +2476,7 @@ module EDNGRAMMAR
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
     end
 
-    node_cache[:rawcontent][start_index] = r0
-
-    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
+    node_cache[:raw_inner][start_index] = r0
 
     r0
   end
@@ -10030,55 +9662,6 @@ module EDNGRAMMAR
     r0
   end
 
-  module Fitrawdelim0
-    def rawdelim
-      elements[0]
-    end
-
-  end
-
-  def _nt_fitrawdelim
-    start_index = index
-    if node_cache[:fitrawdelim].has_key?(index)
-      cached = node_cache[:fitrawdelim][index]
-      if cached
-        node_cache[:fitrawdelim][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-        @index = cached.interval.end
-      end
-      return cached
-    end
-
-    i0, s0 = index, []
-    r1 = _nt_rawdelim
-    s0 << r1
-    if r1
-      i2 = index
-      r3 = lambda {|(rd)|rd.text_value.length == @rawdelimlength}.call(s0)
-      if !r3
-        terminal_parse_failure("<semantic predicate>")
-      end
-      if r3
-        @index = i2
-        r2 = instantiate_node(SyntaxNode,input, index...index)
-      else
-        @index = i2
-        r2 = nil
-      end
-      s0 << r2
-    end
-    if s0.last
-      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Fitrawdelim0)
-    else
-      @index = i0
-      r0 = nil
-    end
-
-    node_cache[:fitrawdelim][start_index] = r0
-
-    r0
-  end
-
   module RhS0
     def rh_comment
       elements[0]
@@ -10744,9 +10327,6 @@ module EDNGRAMMAR
       elements[0]
     end
 
-    def alikerawdelim
-      elements[2]
-    end
   end
 
   module RAppStringH5
@@ -10754,6 +10334,9 @@ module EDNGRAMMAR
       elements[0]
     end
 
+    def alikerawdelim
+      elements[3]
+    end
   end
 
   module RAppStringH6
@@ -10864,7 +10447,6 @@ module EDNGRAMMAR
       r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
       s0 << r2
       if r2
-        i12 = index
         i13, s13 = index, []
         r14 = _nt_eol_comment
         s13 << r14
@@ -10880,10 +10462,6 @@ module EDNGRAMMAR
           end
           r15 = instantiate_node(SyntaxNode,input, i15...index, s15)
           s13 << r15
-          if r15
-            r17 = _nt_alikerawdelim
-            s13 << r17
-          end
         end
         if s13.last
           r13 = instantiate_node(SyntaxNode,input, i13...index, s13)
@@ -10893,19 +10471,15 @@ module EDNGRAMMAR
           r13 = nil
         end
         if r13
-          r13 = SyntaxNode.new(input, (index-1)...index) if r13 == true
           r12 = r13
         else
-          r18 = _nt_fitrawdelim
-          if r18
-            r18 = SyntaxNode.new(input, (index-1)...index) if r18 == true
-            r12 = r18
-          else
-            @index = i12
-            r12 = nil
-          end
+          r12 = instantiate_node(SyntaxNode,input, index...index)
         end
         s0 << r12
+        if r12
+          r17 = _nt_alikerawdelim
+          s0 << r17
+        end
       end
     end
     if s0.last
@@ -11608,9 +11182,6 @@ module EDNGRAMMAR
   end
 
   module RAppStringB644
-    def alikerawdelim
-      elements[2]
-    end
   end
 
   module RAppStringB645
@@ -11618,9 +11189,13 @@ module EDNGRAMMAR
       elements[0]
     end
 
+    def alikerawdelim
+      elements[4]
+    end
   end
 
   module RAppStringB646
+
     def ast
       v = elements[0..2].map {|part| part.text_value}.join
       t = v.gsub(/\s|#[^\n]*(?:\n|\z)/, '').chars.each_slice(4).map(&:join)
@@ -11809,7 +11384,6 @@ module EDNGRAMMAR
         end
         s0 << r7
         if r7
-          i25 = index
           i26, s26 = index, []
           if (match_len = has_terminal?("#", false, index))
             r27 = true
@@ -11831,10 +11405,6 @@ module EDNGRAMMAR
             end
             r28 = instantiate_node(SyntaxNode,input, i28...index, s28)
             s26 << r28
-            if r28
-              r30 = _nt_alikerawdelim
-              s26 << r30
-            end
           end
           if s26.last
             r26 = instantiate_node(SyntaxNode,input, i26...index, s26)
@@ -11844,19 +11414,15 @@ module EDNGRAMMAR
             r26 = nil
           end
           if r26
-            r26 = SyntaxNode.new(input, (index-1)...index) if r26 == true
             r25 = r26
           else
-            r31 = _nt_fitrawdelim
-            if r31
-              r31 = SyntaxNode.new(input, (index-1)...index) if r31 == true
-              r25 = r31
-            else
-              @index = i25
-              r25 = nil
-            end
+            r25 = instantiate_node(SyntaxNode,input, index...index)
           end
           s0 << r25
+          if r25
+            r30 = _nt_alikerawdelim
+            s0 << r30
+          end
         end
       end
     end

metadata

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