edn-abnf 0.5.10 → 0.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5a1d958a80d806f5fdf17fe1ac020448da6ecad0046e8bb2dc2019ce901851c
-  data.tar.gz: 1748c58f4baee7386ad82bfa78709e3779cd53660692da35b59c066c7c9c55ae
+  metadata.gz: 9ba3b4253e30d6651e6e0727be9f658b58a36679baee743474049a28311ed6f0
+  data.tar.gz: caa326ac4833ab0a14d3706f582e7b6d2101422a03e94b9469da1271fa80a5a2
 SHA512:
-  metadata.gz: d8244cfa524d2e5552048e05f14e810f36a13b0d384c47e11c80e80bad5a0d4c63a13d99296b3dbb524ebf4f30ff879192e93164c9040989144be71834476aca
-  data.tar.gz: 842b886e2e0ae034564052fca7954c4c35f10ff9eb72547586d5421250bd26c8c504efba6ad1d8ff1c952e62247dabfd686db5394596d515cf3b6bfc7b588960
+  metadata.gz: 3839a117495a4250634de8da4be6eda871d57e0eb62a1a92255c087befe3bcc05cea05e58a973cb6bba4af22146f6b4e8f47bd72a1accf80585b7743bec08be2
+  data.tar.gz: 183f1878a8a73bee41172e9b079089d03e425eabcd52ab66fe69b4357b2e52a96c1b7b0ec64920fd6b6549f331652292911ec392c4d5e605d2aff53ad796146e

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.5.10"
+  s.version = "0.5.12"
   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

@@ -1865,9 +1865,6 @@ module EDNGRAMMAR
   end
 
   module Rawstring0
-  end
-
-  module Rawstring1
     def startrawdelim
       elements[0]
     end
@@ -1881,12 +1878,11 @@ module EDNGRAMMAR
     end
   end
 
-  module Rawstring2
+  module Rawstring1
     def ast; rawcontent.text_value.gsub("\r", "") + (
                           tv = matchrawdelim.text_value
                           dv = startrawdelim.text_value.length
-                          tv[dv..]                      
-                          ) end
+                          tv[dv..]) end
   end
 
   def _nt_rawstring
@@ -1904,37 +1900,7 @@ module EDNGRAMMAR
     r1 = _nt_startrawdelim
     s0 << r1
     if r1
-      i3, s3 = index, []
-      if (match_len = has_terminal?("\r", false, index))
-        r5 = true
-        @index += match_len
-      else
-        terminal_parse_failure('"\\r"')
-        r5 = nil
-      end
-      if r5
-        r4 = r5
-      else
-        r4 = instantiate_node(SyntaxNode,input, index...index)
-      end
-      s3 << r4
-      if r4
-        if (match_len = has_terminal?("\n", false, index))
-          r6 = true
-          @index += match_len
-        else
-          terminal_parse_failure('"\\n"')
-          r6 = nil
-        end
-        s3 << r6
-      end
-      if s3.last
-        r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
-        r3.extend(Rawstring0)
-      else
-        @index = i3
-        r3 = nil
-      end
+      r3 = _nt_newline
       if r3
         r2 = r3
       else
@@ -1942,18 +1908,18 @@ module EDNGRAMMAR
       end
       s0 << r2
       if r2
-        r7 = _nt_rawcontent
-        s0 << r7
-        if r7
-          r8 = _nt_matchrawdelim
-          s0 << r8
+        r4 = _nt_rawcontent
+        s0 << r4
+        if r4
+          r5 = _nt_matchrawdelim
+          s0 << r5
         end
       end
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(Rawstring0)
       r0.extend(Rawstring1)
-      r0.extend(Rawstring2)
     else
       @index = i0
       r0 = nil
@@ -2025,7 +1991,7 @@ module EDNGRAMMAR
     s0 << r1
     if r1
       i2 = index
-      r3 = lambda {|(rd)|@rawdelim = rd.text_value}.call(s0)
+      r3 = lambda {|(rd)|@rawdelimlength = rd.text_value.length}.call(s0)
       if !r3
         terminal_parse_failure("<semantic predicate>")
       end
@@ -2074,7 +2040,7 @@ module EDNGRAMMAR
     s0 << r1
     if r1
       i2 = index
-      r3 = lambda {|(rd)|rd.text_value.length >= @rawdelim.length}.call(s0)
+      r3 = lambda {|(rd)|rd.text_value.length >= @rawdelimlength}.call(s0)
       if !r3
         terminal_parse_failure("<semantic predicate>")
       end
@@ -2123,7 +2089,7 @@ module EDNGRAMMAR
     s0 << r1
     if r1
       i2 = index
-      r3 = lambda {|(rd)|rd.text_value.length < @rawdelim.length}.call(s0)
+      r3 = lambda {|(rd)|rd.text_value.length < @rawdelimlength}.call(s0)
       if !r3
         terminal_parse_failure("<semantic predicate>")
       end
@@ -4102,6 +4068,10 @@ module EDNGRAMMAR
     def ast; text_value end
   end
 
+  module Escapable16
+    def ast; "" end
+  end
+
   def _nt_escapable1
     start_index = index
     if node_cache[:escapable1].has_key?(index)
@@ -4186,8 +4156,16 @@ module EDNGRAMMAR
                 r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
                 r0 = r6
               else
-                @index = i0
-                r0 = nil
+                r7 = _nt_newline
+                r7.extend(Escapable16)
+                r7.extend(Escapable16)
+                if r7
+                  r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
+                  r0 = r7
+                else
+                  @index = i0
+                  r0 = nil
+                end
               end
             end
           end
@@ -5997,6 +5975,57 @@ module EDNGRAMMAR
     r0
   end
 
+  module Newline0
+  end
+
+  def _nt_newline
+    start_index = index
+    if node_cache[:newline].has_key?(index)
+      cached = node_cache[:newline][index]
+      if cached
+        node_cache[:newline][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    if (match_len = has_terminal?("\r", false, index))
+      r2 = true
+      @index += match_len
+    else
+      terminal_parse_failure('"\\r"')
+      r2 = nil
+    end
+    if r2
+      r1 = r2
+    else
+      r1 = instantiate_node(SyntaxNode,input, index...index)
+    end
+    s0 << r1
+    if r1
+      if (match_len = has_terminal?("\n", false, index))
+        r3 = true
+        @index += match_len
+      else
+        terminal_parse_failure('"\\n"')
+        r3 = nil
+      end
+      s0 << r3
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(Newline0)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:newline][start_index] = r0
+
+    r0
+  end
+
   def _nt_DQUOTE
     start_index = index
     if node_cache[:DQUOTE].has_key?(index)

metadata

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