edn-abnf 0.5.36pre1 → 0.5.36pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f549feee42c4a286feacc2cc626e56139e091e7a65dd3f2826f501ff07da6029
-  data.tar.gz: bb13aa04a7262d1a6663cd0d97f634606f9110b4dff40aaf1b79ed766e885ce4
+  metadata.gz: ffe8e904ee5a50ead60bd3583dc0280908528c42d0d9def2c6d957a76a37412c
+  data.tar.gz: 7cc0afc1c2be87aad5d61006cf186209fba5ff9f5519e9b4de301f4713adfdff
 SHA512:
-  metadata.gz: c4141b3a4ee8d0237b54a8b5c19633b9e9bc821d05b38a68ed8d24253a00366a86d7aba1a6cc154d514d4bdfd60aa20cee997493bf0dbac0d82eab65645ee783
-  data.tar.gz: 7f182c39e9d865c23ed0fd4d204dfef437d3ab1a357fcb220536d5cef80ccf1f33f3cb1188e6dbe993151ee4681f14db2fd0ca88ac7a7963617340b996ff4acc
+  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.36pre1"
+  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, elements[1].elements[1])
+        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
@@ -12178,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)
@@ -12189,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.36pre1
+  version: 0.5.36pre2
 platform: ruby
 authors:
 - Carsten Bormann