edn-abnf 0.5.23 → 0.5.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2de62d87cb2ff756b2aaf5a615604391289921e5430f28f5ba0d655d4e0eb631
-  data.tar.gz: 56d5f8bc3a375799c9d8c534463b61a3b0e1d69c8422e21d0b8e40e7f4b79164
+  metadata.gz: 7ecff49f462934ac958a9624737c4612c498e6f434958eb26787b0f05fbc7e13
+  data.tar.gz: 0ec7a86f00424edbf61b5027d1e7fae7f01817b9b098acf65b491c70aa4067bc
 SHA512:
-  metadata.gz: 05ca01e9fb98904f0d81b61d94bd78006ab09c8abf059c8ee71d40bf8110624021c711ca995fda388ac0528d1653100e57459487425166e785dbd2e6f0ff67aa
-  data.tar.gz: 3b8cb49feb84b974d613b87094e391bc3f00a7afb7fdbf113a37f92d996123b764729e876849432539a9a57244365954152d7d5daa9b41dbe208eb125b3bfb5a
+  metadata.gz: 2818b417115bb44c83a5f5e200f7cdaf9a60f823ddc17d4e1c24a56c1805660d1e0a78cf14b5b608997dcb8403e7a6262f149cab1ddadce0bd716af181fda1c8
+  data.tar.gz: ada8677b77c726d04a644066400d27711ec46f9acf9030b3e53039315656ee45a7c2d1acf0f2e17365538e505a6449c24f041f82bfa717341d400add0246853d

data/edn-abnf.gemspec

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

@@ -3339,10 +3339,58 @@ module EDNGRAMMAR
     r0
   end
 
+  def _nt_eol_comment
+    start_index = index
+    if node_cache[:eol_comment].has_key?(index)
+      cached = node_cache[:eol_comment][index]
+      if cached
+        node_cache[:eol_comment][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    if (match_len = has_terminal?("#", false, index))
+      r1 = true
+      @index += match_len
+    else
+      terminal_parse_failure('"#"')
+      r1 = nil
+    end
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      if (match_len = has_terminal?("//", false, index))
+        r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+        @index += match_len
+      else
+        terminal_parse_failure('"//"')
+        r2 = nil
+      end
+      if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+        r0 = r2
+      else
+        @index = i0
+        r0 = nil
+      end
+    end
+
+    node_cache[:eol_comment][start_index] = r0
+
+    r0
+  end
+
   module Comment0
   end
 
   module Comment1
+    def eol_comment
+      elements[0]
+    end
+
   end
 
   def _nt_comment
@@ -3376,7 +3424,12 @@ module EDNGRAMMAR
           break
         end
       end
-      r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+      if s3.empty?
+        @index = i3
+        r3 = nil
+      else
+        r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+      end
       s1 << r3
       if r3
         if (match_len = has_terminal?("/", false, index))
@@ -3401,13 +3454,7 @@ module EDNGRAMMAR
       r0 = r1
     else
       i6, s6 = index, []
-      if (match_len = has_terminal?("#", false, index))
-        r7 = true
-        @index += match_len
-      else
-        terminal_parse_failure('"#"')
-        r7 = nil
-      end
+      r7 = _nt_eol_comment
       s6 << r7
       if r7
         s8, i8 = [], index
@@ -8195,6 +8242,10 @@ module EDNGRAMMAR
   end
 
   module SAppStringH4
+    def eol_comment
+      elements[0]
+    end
+
   end
 
   module SAppStringH5
@@ -8313,13 +8364,7 @@ module EDNGRAMMAR
       s0 << r2
       if r2
         i13, s13 = index, []
-        if (match_len = has_terminal?("#", false, index))
-          r14 = true
-          @index += match_len
-        else
-          terminal_parse_failure('"#"')
-          r14 = nil
-        end
+        r14 = _nt_eol_comment
         s13 << r14
         if r14
           s15, i15 = [], index
@@ -8552,6 +8597,10 @@ module EDNGRAMMAR
   end
 
   module HComment1
+    def eol_comment
+      elements[0]
+    end
+
     def i_LF
       elements[2]
     end
@@ -8588,7 +8637,12 @@ module EDNGRAMMAR
           break
         end
       end
-      r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+      if s3.empty?
+        @index = i3
+        r3 = nil
+      else
+        r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+      end
       s1 << r3
       if r3
         if (match_len = has_terminal?("/", false, index))
@@ -8613,13 +8667,7 @@ module EDNGRAMMAR
       r0 = r1
     else
       i6, s6 = index, []
-      if (match_len = has_terminal?("#", false, index))
-        r7 = true
-        @index += match_len
-      else
-        terminal_parse_failure('"#"')
-        r7 = nil
-      end
+      r7 = _nt_eol_comment
       s6 << r7
       if r7
         s8, i8 = [], index
@@ -8867,6 +8915,10 @@ module EDNGRAMMAR
   end
 
   module RhComment1
+    def eol_comment
+      elements[0]
+    end
+
   end
 
   def _nt_rh_comment
@@ -8900,7 +8952,12 @@ module EDNGRAMMAR
           break
         end
       end
-      r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+      if s3.empty?
+        @index = i3
+        r3 = nil
+      else
+        r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+      end
       s1 << r3
       if r3
         if (match_len = has_terminal?("/", false, index))
@@ -8925,13 +8982,7 @@ module EDNGRAMMAR
       r0 = r1
     else
       i6, s6 = index, []
-      if (match_len = has_terminal?("#", false, index))
-        r7 = true
-        @index += match_len
-      else
-        terminal_parse_failure('"#"')
-        r7 = nil
-      end
+      r7 = _nt_eol_comment
       s6 << r7
       if r7
         s8, i8 = [], index
@@ -9072,6 +9123,10 @@ module EDNGRAMMAR
   end
 
   module RAppStringH4
+    def eol_comment
+      elements[0]
+    end
+
     def matchrawdelim
       elements[2]
     end
@@ -9194,13 +9249,7 @@ module EDNGRAMMAR
       if r2
         i12 = index
         i13, s13 = index, []
-        if (match_len = has_terminal?("#", false, index))
-          r14 = true
-          @index += match_len
-        else
-          terminal_parse_failure('"#"')
-          r14 = nil
-        end
+        r14 = _nt_eol_comment
         s13 << r14
         if r14
           s15, i15 = [], index
@@ -9366,6 +9415,10 @@ module EDNGRAMMAR
   end
 
   module SAppStringB644
+    def eol_comment
+      elements[0]
+    end
+
   end
 
   module SAppStringB645
@@ -9564,13 +9617,7 @@ module EDNGRAMMAR
         s0 << r7
         if r7
           i26, s26 = index, []
-          if (match_len = has_terminal?("#", false, index))
-            r27 = true
-            @index += match_len
-          else
-            terminal_parse_failure('"#"')
-            r27 = nil
-          end
+          r27 = _nt_eol_comment
           s26 << r27
           if r27
             s28, i28 = [], index
@@ -9777,6 +9824,10 @@ module EDNGRAMMAR
   end
 
   module B64Comment0
+    def eol_comment
+      elements[0]
+    end
+
   end
 
   def _nt_b64_comment
@@ -9791,13 +9842,7 @@ module EDNGRAMMAR
     end
 
     i0, s0 = index, []
-    if (match_len = has_terminal?("#", false, index))
-      r1 = true
-      @index += match_len
-    else
-      terminal_parse_failure('"#"')
-      r1 = nil
-    end
+    r1 = _nt_eol_comment
     s0 << r1
     if r1
       s2, i2 = [], index
@@ -9942,6 +9987,10 @@ module EDNGRAMMAR
   end
 
   module RAppStringB644
+    def eol_comment
+      elements[0]
+    end
+
     def matchrawdelim
       elements[2]
     end
@@ -10144,13 +10193,7 @@ module EDNGRAMMAR
         if r7
           i25 = index
           i26, s26 = index, []
-          if (match_len = has_terminal?("#", false, index))
-            r27 = true
-            @index += match_len
-          else
-            terminal_parse_failure('"#"')
-            r27 = nil
-          end
+          r27 = _nt_eol_comment
           s26 << r27
           if r27
             s28, i28 = [], index
@@ -10289,6 +10332,10 @@ module EDNGRAMMAR
   end
 
   module Rb64Comment0
+    def eol_comment
+      elements[0]
+    end
+
   end
 
   def _nt_rb64_comment
@@ -10303,13 +10350,7 @@ module EDNGRAMMAR
     end
 
     i0, s0 = index, []
-    if (match_len = has_terminal?("#", false, index))
-      r1 = true
-      @index += match_len
-    else
-      terminal_parse_failure('"#"')
-      r1 = nil
-    end
+    r1 = _nt_eol_comment
     s0 << r1
     if r1
       s2, i2 = [], index

metadata

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