edn-abnf 0.5.35 → 0.5.36pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 066fe883e4f63f1d4f093c32c280a69ad282f587bd289224b5f9c3c869be7e73
-  data.tar.gz: 34bccaaa9015884fbb9bc9dcc9f8c1eba352dc0178a5ba33c6a71305c2d2b51c
+  metadata.gz: ffe8e904ee5a50ead60bd3583dc0280908528c42d0d9def2c6d957a76a37412c
+  data.tar.gz: 7cc0afc1c2be87aad5d61006cf186209fba5ff9f5519e9b4de301f4713adfdff
 SHA512:
-  metadata.gz: 5ca8b9c5816196a430547ebe8ed8b6b90599161b41f51443bb319cec2b86220ffe158df62f5520afbd67cb3450ecebc3ce0e970c90e8f3040f7dd1eb355f7543
-  data.tar.gz: b1bfc0fc1f5b6f076837b47900ceb9962163e32a488ef3c89d63ac1135eec991c7c8d3fa69cbf5355d7af8757c232f7fd89cd8ffdecd38a5b1ea8ae6152007b6
+  metadata.gz: 4b22f6dc393b06caf005b9a912570c710face625647d710c5ec34ebc26d2c2be64d6f7e5c292f6bada972b3f4cb4375a114fea0e6196b388eeba6eedd36a4fde
+  data.tar.gz: fc1d29a21c85fb0e16beb271df70397a930aaebc6155f9dd348c9e8494d09b03904d811472fcb65123f0fad01461c3b0b458a36858bf964725de099192684031

data/edn-abnf.gemspec

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

@@ -1976,13 +1976,16 @@ module EDNGRAMMAR
   end
 
   module AppString1
+  end
+
+  module AppString2
     def ast                       # XXX ignoring h and b64
-      data = sqstr.ast.force_encoding(Encoding::UTF_8) # XXX undo .b
-      app = app_prefix.text_value
+      data = elements[0].sqstr.ast.force_encoding(Encoding::UTF_8) # XXX undo .b
+      app = elements[0].app_prefix.text_value
       begin
         ::EDNGRAMMAR::APPS[app].decode(app, data)
       rescue CBOR_DIAG::AppParseError => e
-        app_parser_level1_diagnostics(e, elements[1].elements[1])
+        app_parser_level1_diagnostics(e, elements[0].elements[1].elements[1])
         raise e
       end
     end
@@ -2000,16 +2003,42 @@ module EDNGRAMMAR
     end
 
     i0, s0 = index, []
-    r1 = _nt_app_prefix
+    i1, s1 = index, []
+    r2 = _nt_app_prefix
+    s1 << r2
+    if r2
+      r3 = _nt_sqstr
+      s1 << r3
+    end
+    if s1.last
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+      r1.extend(AppString0)
+    else
+      @index = i1
+      r1 = nil
+    end
     s0 << r1
     if r1
-      r2 = _nt_sqstr
-      s0 << r2
+      i4 = index
+      r5 = lambda {|x| pref = x[0].app_prefix.text_value
+                           ret = !$options.integrated || !["h", "b64", "dt"].include?(pref)
+                           ret}.call(s0)
+      if !r5
+        terminal_parse_failure("<semantic predicate>")
+      end
+      if r5
+        @index = i4
+        r4 = instantiate_node(SyntaxNode,input, index...index)
+      else
+        @index = i4
+        r4 = nil
+      end
+      s0 << r4
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(AppString0)
       r0.extend(AppString1)
+      r0.extend(AppString2)
     else
       @index = i0
       r0 = nil
@@ -2103,13 +2132,17 @@ module EDNGRAMMAR
   end
 
   module AppRstring1
+  end
+
+  module AppRstring2
+  
     def ast                       # XXX ignoring h and b64
-      data = rawstring.ast.force_encoding(Encoding::UTF_8) # XXX undo .b
-      app = app_prefix.text_value
+      data = elements[0].rawstring.ast.force_encoding(Encoding::UTF_8) # XXX undo .b
+      app = elements[0].app_prefix.text_value
       begin
         ::EDNGRAMMAR::APPS[app].decode(app, data)
       rescue CBOR_DIAG::AppParseError => e
-        app_parser_level1_raw_diagnostics(e, rawstring.rawcontent)
+        app_parser_level1_raw_diagnostics(e, elements[0].elements[1].elements[1])
         raise e
       end
     end
@@ -2127,16 +2160,42 @@ module EDNGRAMMAR
     end
 
     i0, s0 = index, []
-    r1 = _nt_app_prefix
+    i1, s1 = index, []
+    r2 = _nt_app_prefix
+    s1 << r2
+    if r2
+      r3 = _nt_rawstring
+      s1 << r3
+    end
+    if s1.last
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+      r1.extend(AppRstring0)
+    else
+      @index = i1
+      r1 = nil
+    end
     s0 << r1
     if r1
-      r2 = _nt_rawstring
-      s0 << r2
+      i4 = index
+      r5 = lambda {|x| pref = x[0].app_prefix.text_value
+                           ret = !$options.integrated || !["h", "b64", "dt"].include?(pref)
+                           ret}.call(s0)
+      if !r5
+        terminal_parse_failure("<semantic predicate>")
+      end
+      if r5
+        @index = i4
+        r4 = instantiate_node(SyntaxNode,input, index...index)
+      else
+        @index = i4
+        r4 = nil
+      end
+      s0 << r4
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(AppRstring0)
       r0.extend(AppRstring1)
+      r0.extend(AppRstring2)
     else
       @index = i0
       r0 = nil
@@ -2148,25 +2207,30 @@ module EDNGRAMMAR
   end
 
   module Rawstring0
-    def startrawdelim
-      elements[0]
+    def rawcontent0
+      elements[1]
     end
 
+  end
+
+  module Rawstring1
     def rawcontent
-      elements[2]
+      elements[1]
     end
+  end
 
-    def matchrawdelim
-      elements[3]
+  module Rawstring2
+    def startrawdelim
+      elements[0]
+    end
+
+    def alikerawdelim
+      elements[2]
     end
   end
 
-  module Rawstring1
-    def ast
-                          rawcontent.text_value.gsub("\r", "") + (
-                          tv = matchrawdelim.text_value
-                          dv = startrawdelim.text_value.length
-                          tv[dv..]) end
+  module Rawstring3
+    def ast; elements[1].elements[1].text_value.gsub("\r", "") end
   end
 
   def _nt_rawstring
@@ -2184,26 +2248,78 @@ module EDNGRAMMAR
     r1 = _nt_startrawdelim
     s0 << r1
     if r1
-      r3 = _nt_newline
+      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
-        r2 = instantiate_node(SyntaxNode,input, index...index)
+        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
       s0 << r2
       if r2
-        r4 = _nt_rawcontent
-        s0 << r4
-        if r4
-          r5 = _nt_matchrawdelim
-          s0 << r5
-        end
+        r11 = _nt_alikerawdelim
+        s0 << r11
       end
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Rawstring0)
-      r0.extend(Rawstring1)
+      r0.extend(Rawstring2)
+      r0.extend(Rawstring3)
     else
       @index = i0
       r0 = nil
@@ -2301,19 +2417,19 @@ module EDNGRAMMAR
     r0
   end
 
-  module Matchrawdelim0
+  module Alikerawdelim0
     def rawdelim
       elements[0]
     end
 
   end
 
-  def _nt_matchrawdelim
+  def _nt_alikerawdelim
     start_index = index
-    if node_cache[:matchrawdelim].has_key?(index)
-      cached = node_cache[:matchrawdelim][index]
+    if node_cache[:alikerawdelim].has_key?(index)
+      cached = node_cache[:alikerawdelim][index]
       if cached
-        node_cache[:matchrawdelim][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:alikerawdelim][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -2324,7 +2440,7 @@ module EDNGRAMMAR
     s0 << r1
     if r1
       i2 = index
-      r3 = lambda {|(rd)|rd.text_value.length >= @rawdelimlength}.call(s0)
+      r3 = lambda {|(rd)|rd.text_value.length == @rawdelimlength}.call(s0)
       if !r3
         terminal_parse_failure("<semantic predicate>")
       end
@@ -2339,13 +2455,13 @@ module EDNGRAMMAR
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Matchrawdelim0)
+      r0.extend(Alikerawdelim0)
     else
       @index = i0
       r0 = nil
     end
 
-    node_cache[:matchrawdelim][start_index] = r0
+    node_cache[:alikerawdelim][start_index] = r0
 
     r0
   end
@@ -2487,6 +2603,94 @@ 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
     start_index = index
     if node_cache[:rawcontent].has_key?(index)
@@ -2533,6 +2737,111 @@ module EDNGRAMMAR
     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
+
+    r0
+  end
+
   module Sqstr0
     def SQUOTE1
       elements[0]
@@ -10423,7 +10732,7 @@ module EDNGRAMMAR
       elements[0]
     end
 
-    def matchrawdelim
+    def alikerawdelim
       elements[2]
     end
   end
@@ -10560,7 +10869,7 @@ module EDNGRAMMAR
           r15 = instantiate_node(SyntaxNode,input, i15...index, s15)
           s13 << r15
           if r15
-            r17 = _nt_matchrawdelim
+            r17 = _nt_alikerawdelim
             s13 << r17
           end
         end
@@ -11287,7 +11596,7 @@ module EDNGRAMMAR
   end
 
   module RAppStringB644
-    def matchrawdelim
+    def alikerawdelim
       elements[2]
     end
   end
@@ -11511,7 +11820,7 @@ module EDNGRAMMAR
             r28 = instantiate_node(SyntaxNode,input, i28...index, s28)
             s26 << r28
             if r28
-              r30 = _nt_matchrawdelim
+              r30 = _nt_alikerawdelim
               s26 << r30
             end
           end
@@ -11928,6 +12237,17 @@ module EDNGRAMMAR
     def ast; elements[1].ast; end
   end
 
+  module AppStringDtRaw22
+    def app_string_dt
+      elements[1]
+    end
+
+  end
+
+  module AppStringDtRaw23
+    def ast; elements[1].ast; end
+  end
+
   def _nt_app_string_dt_raw2
     start_index = index
     if node_cache[:app_string_dt_raw2].has_key?(index)
@@ -11939,25 +12259,69 @@ module EDNGRAMMAR
       return cached
     end
 
-    i0, s0 = index, []
-    r2 = _nt_newline
+    i0 = index
+    i1, s1 = index, []
+    r3 = _nt_newline
+    if r3
+      r2 = r3
+    else
+      r2 = instantiate_node(SyntaxNode,input, index...index)
+    end
+    s1 << r2
     if r2
-      r1 = r2
+      r4 = _nt_app_string_dt
+      s1 << r4
+    end
+    if s1.last
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+      r1.extend(AppStringDtRaw20)
+      r1.extend(AppStringDtRaw21)
     else
-      r1 = instantiate_node(SyntaxNode,input, index...index)
+      @index = i1
+      r1 = nil
     end
-    s0 << r1
     if r1
-      r3 = _nt_app_string_dt
-      s0 << r3
-    end
-    if s0.last
-      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(AppStringDtRaw20)
-      r0.extend(AppStringDtRaw21)
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
     else
-      @index = i0
-      r0 = nil
+      i5, s5 = index, []
+      if (match_len = has_terminal?(" ", false, index))
+        r6 = true
+        @index += match_len
+      else
+        terminal_parse_failure('" "')
+        r6 = nil
+      end
+      s5 << r6
+      if r6
+        r7 = _nt_app_string_dt
+        s5 << r7
+        if r7
+          if (match_len = has_terminal?(" ", false, index))
+            r8 = true
+            @index += match_len
+          else
+            terminal_parse_failure('" "')
+            r8 = nil
+          end
+          s5 << r8
+        end
+      end
+      if s5.last
+        r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+        r5.extend(AppStringDtRaw22)
+        r5.extend(AppStringDtRaw23)
+      else
+        @index = i5
+        r5 = nil
+      end
+      if r5
+        r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
+        r0 = r5
+      else
+        @index = i0
+        r0 = nil
+      end
     end
 
     node_cache[:app_string_dt_raw2][start_index] = r0

metadata

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