edn-abnf 0.5.24 → 0.5.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ecff49f462934ac958a9624737c4612c498e6f434958eb26787b0f05fbc7e13
-  data.tar.gz: 0ec7a86f00424edbf61b5027d1e7fae7f01817b9b098acf65b491c70aa4067bc
+  metadata.gz: 94b5a98d03ecc669c5c2796c357e4bdc36649a0bf399a975ebf24500c680728b
+  data.tar.gz: f1d596f67cc9a24ab4e2afb2cc54fcb9b06b349ce3faa9dbdffdafe8a0d722fa
 SHA512:
-  metadata.gz: 2818b417115bb44c83a5f5e200f7cdaf9a60f823ddc17d4e1c24a56c1805660d1e0a78cf14b5b608997dcb8403e7a6262f149cab1ddadce0bd716af181fda1c8
-  data.tar.gz: ada8677b77c726d04a644066400d27711ec46f9acf9030b3e53039315656ee45a7c2d1acf0f2e17365538e505a6449c24f041f82bfa717341d400add0246853d
+  metadata.gz: 4c1730392c1de9a9cf9c5e389bc03a86390504e281cf3b5b1a96d30edefd4665d2e2b89c6a8c09bb1cf29d3d9f7a307a56eec13f15d757176c5a8a258e88c744
+  data.tar.gz: 91578b63cb5e7e2ff5b3f30de39167c654b9f67461546f24766e1e868c2db3e003e0385855196a8055c1b262d3b1c7ce10e9e67b4261f7112655c6466d5c0f63

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.5.24"
+  s.version = "0.5.26"
   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/cbor-diagnostic-app/hgrammar.rb

@@ -48,6 +48,10 @@ module HGRAMMAR
   end
 
   module AppStringH4
+    def eol_comment
+      elements[0]
+    end
+
   end
 
   module AppStringH5
@@ -166,13 +170,7 @@ module HGRAMMAR
       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
@@ -450,6 +448,50 @@ module HGRAMMAR
     r0
   end
 
+  def _nt_NONASCII
+    start_index = index
+    if node_cache[:NONASCII].has_key?(index)
+      cached = node_cache[:NONASCII][index]
+      if cached
+        node_cache[:NONASCII][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    if has_terminal?(@regexps[gr = '\A[€-퟿]'] ||= Regexp.new(gr), :regexp, index)
+      r1 = true
+      @index += 1
+    else
+      terminal_parse_failure('[€-퟿]')
+      r1 = nil
+    end
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      if has_terminal?(@regexps[gr = '\A[-􏿿]'] ||= Regexp.new(gr), :regexp, index)
+        r2 = true
+        @index += 1
+      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[:NONASCII][start_index] = r0
+
+    r0
+  end
+
   def _nt_non_slash
     start_index = index
     if node_cache[:non_slash].has_key?(index)
@@ -478,19 +520,25 @@ module HGRAMMAR
         r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
-        if has_terminal?(@regexps[gr = '\A[0-􏿿]'] ||= Regexp.new(gr), :regexp, index)
+        if has_terminal?(@regexps[gr = '\A[0-]'] ||= Regexp.new(gr), :regexp, index)
           r3 = true
           @index += 1
         else
-          terminal_parse_failure('[0-􏿿]')
+          terminal_parse_failure('[0-]')
           r3 = nil
         end
         if r3
           r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
-          @index = i0
-          r0 = nil
+          r4 = _nt_NONASCII
+          if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+            r0 = r4
+          else
+            @index = i0
+            r0 = nil
+          end
         end
       end
     end
@@ -500,6 +548,193 @@ module HGRAMMAR
     r0
   end
 
+  def _nt_non_slash_star
+    start_index = index
+    if node_cache[:non_slash_star].has_key?(index)
+      cached = node_cache[:non_slash_star][index]
+      if cached
+        node_cache[:non_slash_star][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    r1 = _nt_blank
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      if has_terminal?(@regexps[gr = '\A[!-\\)]'] ||= Regexp.new(gr), :regexp, index)
+        r2 = true
+        @index += 1
+      else
+        terminal_parse_failure('[!-\\)]')
+        r2 = nil
+      end
+      if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+        r0 = r2
+      else
+        if has_terminal?(@regexps[gr = '\A[\\+-\\.]'] ||= Regexp.new(gr), :regexp, index)
+          r3 = true
+          @index += 1
+        else
+          terminal_parse_failure('[\\+-\\.]')
+          r3 = nil
+        end
+        if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+          r0 = r3
+        else
+          if has_terminal?(@regexps[gr = '\A[0-]'] ||= Regexp.new(gr), :regexp, index)
+            r4 = true
+            @index += 1
+          else
+            terminal_parse_failure('[0-]')
+            r4 = nil
+          end
+          if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+            r0 = r4
+          else
+            r5 = _nt_NONASCII
+            if r5
+              r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
+              r0 = r5
+            else
+              @index = i0
+              r0 = nil
+            end
+          end
+        end
+      end
+    end
+
+    node_cache[:non_slash_star][start_index] = r0
+
+    r0
+  end
+
+  def _nt_non_star
+    start_index = index
+    if node_cache[:non_star].has_key?(index)
+      cached = node_cache[:non_star][index]
+      if cached
+        node_cache[:non_star][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    r1 = _nt_blank
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      if has_terminal?(@regexps[gr = '\A[!-\\)]'] ||= Regexp.new(gr), :regexp, index)
+        r2 = true
+        @index += 1
+      else
+        terminal_parse_failure('[!-\\)]')
+        r2 = nil
+      end
+      if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+        r0 = r2
+      else
+        if has_terminal?(@regexps[gr = '\A[\\+-]'] ||= Regexp.new(gr), :regexp, index)
+          r3 = true
+          @index += 1
+        else
+          terminal_parse_failure('[\\+-]')
+          r3 = nil
+        end
+        if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+          r0 = r3
+        else
+          r4 = _nt_NONASCII
+          if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+            r0 = r4
+          else
+            @index = i0
+            r0 = nil
+          end
+        end
+      end
+    end
+
+    node_cache[:non_star][start_index] = r0
+
+    r0
+  end
+
+  module EndStar0
+  end
+
+  def _nt_end_star
+    start_index = index
+    if node_cache[:end_star].has_key?(index)
+      cached = node_cache[:end_star][index]
+      if cached
+        node_cache[:end_star][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    s1, i1 = [], index
+    loop do
+      r2 = _nt_non_star
+      if r2
+        s1 << r2
+      else
+        break
+      end
+    end
+    r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+    s0 << r1
+    if r1
+      s3, i3 = [], index
+      loop do
+        if (match_len = has_terminal?("*", false, index))
+          r4 = true
+          @index += match_len
+        else
+          terminal_parse_failure('"*"')
+          r4 = nil
+        end
+        if r4
+          s3 << r4
+        else
+          break
+        end
+      end
+      if s3.empty?
+        @index = i3
+        r3 = nil
+      else
+        r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+      end
+      s0 << r3
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(EndStar0)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:end_star][start_index] = r0
+
+    r0
+  end
+
   def _nt_non_lf
     start_index = index
     if node_cache[:non_lf].has_key?(index)
@@ -534,24 +769,18 @@ module HGRAMMAR
         r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
-        if has_terminal?(@regexps[gr = '\A[\\ -퟿]'] ||= Regexp.new(gr), :regexp, index)
+        if has_terminal?(@regexps[gr = '\A[\\ -]'] ||= Regexp.new(gr), :regexp, index)
           r3 = true
           @index += 1
         else
-          terminal_parse_failure('[\\ -퟿]')
+          terminal_parse_failure('[\\ -]')
           r3 = nil
         end
         if r3
           r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
-          if has_terminal?(@regexps[gr = '\A[-􏿿]'] ||= Regexp.new(gr), :regexp, index)
-            r4 = true
-            @index += 1
-          else
-            terminal_parse_failure('[-􏿿]')
-            r4 = nil
-          end
+          r4 = _nt_NONASCII
           if r4
             r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
@@ -568,6 +797,50 @@ module HGRAMMAR
     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 S0
     def comment
       elements[0]
@@ -650,9 +923,34 @@ module HGRAMMAR
   end
 
   module Comment0
+    def non_slash_star
+      elements[1]
+    end
+
   end
 
   module Comment1
+    def non_slash_star
+      elements[0]
+    end
+
+    def end_star
+      elements[1]
+    end
+  end
+
+  module Comment2
+    def end_star
+      elements[1]
+    end
+
+  end
+
+  module Comment3
+    def eol_comment
+      elements[0]
+    end
+
   end
 
   def _nt_comment
@@ -677,26 +975,30 @@ module HGRAMMAR
     end
     s1 << r2
     if r2
-      s3, i3 = [], index
-      loop do
-        r4 = _nt_non_slash
-        if r4
-          s3 << r4
-        else
-          break
-        end
-      end
-      r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+      r3 = _nt_non_slash_star
       s1 << r3
       if r3
-        if (match_len = has_terminal?("/", false, index))
-          r5 = true
-          @index += match_len
-        else
-          terminal_parse_failure('"/"')
-          r5 = nil
+        s4, i4 = [], index
+        loop do
+          r5 = _nt_non_slash
+          if r5
+            s4 << r5
+          else
+            break
+          end
+        end
+        r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+        s1 << r4
+        if r4
+          if (match_len = has_terminal?("/", false, index))
+            r6 = true
+            @index += match_len
+          else
+            terminal_parse_failure('"/"')
+            r6 = nil
+          end
+          s1 << r6
         end
-        s1 << r5
       end
     end
     if s1.last
@@ -710,51 +1012,106 @@ module HGRAMMAR
       r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
-      i6, s6 = index, []
-      if (match_len = has_terminal?("#", false, index))
-        r7 = true
+      i7, s7 = index, []
+      if (match_len = has_terminal?("/*", false, index))
+        r8 = instantiate_node(SyntaxNode,input, index...(index + match_len))
         @index += match_len
       else
-        terminal_parse_failure('"#"')
-        r7 = nil
+        terminal_parse_failure('"/*"')
+        r8 = nil
       end
-      s6 << r7
-      if r7
-        s8, i8 = [], index
-        loop do
-          r9 = _nt_non_lf
-          if r9
-            s8 << r9
-          else
-            break
+      s7 << r8
+      if r8
+        r9 = _nt_end_star
+        s7 << r9
+        if r9
+          s10, i10 = [], index
+          loop do
+            i11, s11 = index, []
+            r12 = _nt_non_slash_star
+            s11 << r12
+            if r12
+              r13 = _nt_end_star
+              s11 << r13
+            end
+            if s11.last
+              r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
+              r11.extend(Comment1)
+            else
+              @index = i11
+              r11 = nil
+            end
+            if r11
+              s10 << r11
+            else
+              break
+            end
           end
-        end
-        r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
-        s6 << r8
-        if r8
-          if (match_len = has_terminal?("\n", false, index))
-            r10 = true
-            @index += match_len
-          else
-            terminal_parse_failure('"\\n"')
-            r10 = nil
+          r10 = instantiate_node(SyntaxNode,input, i10...index, s10)
+          s7 << r10
+          if r10
+            if (match_len = has_terminal?("/", false, index))
+              r14 = true
+              @index += match_len
+            else
+              terminal_parse_failure('"/"')
+              r14 = nil
+            end
+            s7 << r14
           end
-          s6 << r10
         end
       end
-      if s6.last
-        r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
-        r6.extend(Comment1)
+      if s7.last
+        r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
+        r7.extend(Comment2)
       else
-        @index = i6
-        r6 = nil
+        @index = i7
+        r7 = nil
       end
-      if r6
-        r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
-        r0 = r6
+      if r7
+        r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
+        r0 = r7
       else
-        @index = i0
-        r0 = nil
+        i15, s15 = index, []
+        r16 = _nt_eol_comment
+        s15 << r16
+        if r16
+          s17, i17 = [], index
+          loop do
+            r18 = _nt_non_lf
+            if r18
+              s17 << r18
+            else
+              break
+            end
+          end
+          r17 = instantiate_node(SyntaxNode,input, i17...index, s17)
+          s15 << r17
+          if r17
+            if (match_len = has_terminal?("\n", false, index))
+              r19 = true
+              @index += match_len
+            else
+              terminal_parse_failure('"\\n"')
+              r19 = nil
+            end
+            s15 << r19
+          end
+        end
+        if s15.last
+          r15 = instantiate_node(SyntaxNode,input, i15...index, s15)
+          r15.extend(Comment3)
+        else
+          @index = i15
+          r15 = nil
+        end
+        if r15
+          r15 = SyntaxNode.new(input, (index-1)...index) if r15 == true
+          r0 = r15
+        else
+          @index = i0
+          r0 = nil
+        end
       end
     end
 
@@ -763,9 +1120,11 @@ module HGRAMMAR
     r0
   end
 
-end
 
-class HGRAMMARParser < Treetop::Runtime::CompiledParser
-  include HGRAMMAR
+  class Parser < Treetop::Runtime::CompiledParser
+    include HGRAMMAR
+  end
 end
 
+(remove_const(:HGRAMMARParser) if const_defined?(:HGRAMMARParser)) rescue nil; HGRAMMARParser = HGRAMMAR::Parser
+