edn-abnf 0.5.32 → 0.6.1pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 526056ed796bf81ffc83f6042d90706a446955e4069c10382f253e68b29fe587
-  data.tar.gz: 9f0221ad1617fcdf26411960ded59fb620a7a3a66175d15547a3b24f4e24885a
+  metadata.gz: 35b0986f4a0d059f1223e057a2cd2ea5c6852e2a682ad5fa1a3c1e135b2446c7
+  data.tar.gz: 98f4bdb66e78f3b3c85edd88bcd18dbb3a832dd9153d178a79f89baf911ac109
 SHA512:
-  metadata.gz: fdf3bda3807bbf83935287d370927b2c10d02b667a72468b620ad7745e7ecdbca275a519b574133f5107cfd4fbe17d4b9bdcb81acc59df61e082d40c0e6c91e9
-  data.tar.gz: f7a0085dc92fe04f4b11e6872b518ff6bc7382813195cbf7d929fcf7281152c388c3790f09d57c71a2971e6fae5b0b4b28448474fbabea55e656c715cbcde045
+  metadata.gz: 3e7ce39d92102381078c9d3da002dd2362808fd9c7faaca0676fbdc532d430ffeb85c6c6f770b34466571814529c66aaa172b26a179e26d8b081bea9cb08b5af
+  data.tar.gz: 62c3946d702aec9897e4149021e3798459abbe93927e87942faec2df9373190b4d86877e9dfd01ff5f8b40c3635fafd0203f18e2f4244dc22b8d713bc4c5361b

data/bin/edn-abnf

@@ -115,12 +115,11 @@ if $options.lines
     exit 1
   end
   CSV.parse(edn_file) do |ok, ednin, out|
-    if !ok || ok[0] == "#" || ok == "op"
+    if ok[0] == "#"
       puts "# #{ok}, #{ednin.inspect}, #{out}" if $options.verbose
       next
     end
     if ok[0] == "x"
-      warn "#{[ok, ednin, out].inspect}" unless ednin
       result = tree_from_edn_possibly_hex(ednin)
       result_hex = result.to_cbor.hexi
       result_diag = result.cbor_diagnostic
@@ -137,8 +136,8 @@ if $options.lines
     end
     begin
       ok = ok == "="
-      puts "➔ #{ok.inspect}, #{ednin.inspect}, #{out.inspect}" if $options.verbose
-      result = tree_from_edn_possibly_hex(ednin || "")
+      puts "➔ #{ok}, #{ednin}, #{out}" if $options.verbose
+      result = tree_from_edn_possibly_hex(ednin)
       diag = result.cbor_diagnostic
       if out == diag && !ok
           puts "** ≠ / #{diag.inspect} / #{out.inspect}"
@@ -152,7 +151,7 @@ if $options.lines
         end
         puts "reparsed / #{diag.inspect} / #{out.inspect}" if $options.verbose
       end
-    rescue CBOR_DIAG::AppParseError, ArgumentError => e
+    rescue ArgumentError => e
       if ok
         puts "** #{e} / #{result.inspect} / #{out.inspect}"
         $error += 1
@@ -181,10 +180,10 @@ begin
     result = edn.tree               # XXX .tree?
   end
 rescue CBOR_DIAG::AppParseError, ArgumentError => e
-  warn "** #{e}"
+  puts "** #{e}"
   exit 1
 rescue CBOR::OutOfBytesError, RuntimeError, JSON::GeneratorError => e
-  warn "** (encoded CBOR input:) #{e}"
+  puts "** (encoded CBOR input:) #{e}"
   exit 1
 end
 

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.5.32"
+  s.version = "0.6.1pre"
   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,10 +48,6 @@ module HGRAMMAR
   end
 
   module AppStringH4
-    def eol_comment
-      elements[0]
-    end
-
   end
 
   module AppStringH5
@@ -170,7 +166,13 @@ module HGRAMMAR
       s0 << r2
       if r2
         i13, s13 = index, []
-        r14 = _nt_eol_comment
+        if (match_len = has_terminal?("#", false, index))
+          r14 = true
+          @index += match_len
+        else
+          terminal_parse_failure('"#"')
+          r14 = nil
+        end
         s13 << r14
         if r14
           s15, i15 = [], index
@@ -448,50 +450,6 @@ 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)
@@ -520,25 +478,19 @@ 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
-          r4 = _nt_NONASCII
-          if r4
-            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
-            r0 = r4
-          else
-            @index = i0
-            r0 = nil
-          end
+          @index = i0
+          r0 = nil
         end
       end
     end
@@ -548,193 +500,6 @@ 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)
@@ -769,18 +534,24 @@ 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
-          r4 = _nt_NONASCII
+          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
             r0 = r4
@@ -797,50 +568,6 @@ 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]
@@ -923,34 +650,9 @@ 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
@@ -975,30 +677,26 @@ module HGRAMMAR
     end
     s1 << r2
     if r2
-      r3 = _nt_non_slash_star
+      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)
       s1 << r3
       if r3
-        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
+        if (match_len = has_terminal?("/", false, index))
+          r5 = true
+          @index += match_len
+        else
+          terminal_parse_failure('"/"')
+          r5 = nil
         end
+        s1 << r5
       end
     end
     if s1.last
@@ -1012,106 +710,51 @@ module HGRAMMAR
       r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
-      i7, s7 = index, []
-      if (match_len = has_terminal?("/*", false, index))
-        r8 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      i6, s6 = index, []
+      if (match_len = has_terminal?("#", false, index))
+        r7 = true
         @index += match_len
       else
-        terminal_parse_failure('"/*"')
-        r8 = nil
+        terminal_parse_failure('"#"')
+        r7 = nil
       end
-      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
+      s6 << r7
+      if r7
+        s8, i8 = [], index
+        loop do
+          r9 = _nt_non_lf
+          if r9
+            s8 << r9
+          else
+            break
           end
-          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
+        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
           end
+          s6 << r10
         end
       end
-      if s7.last
-        r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
-        r7.extend(Comment2)
+      if s6.last
+        r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+        r6.extend(Comment1)
       else
-        @index = i7
-        r7 = nil
+        @index = i6
+        r6 = nil
       end
-      if r7
-        r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
-        r0 = r7
+      if r6
+        r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
+        r0 = r6
       else
-        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
+        @index = i0
+        r0 = nil
       end
     end
 
@@ -1120,11 +763,9 @@ module HGRAMMAR
     r0
   end
 
-
-  class Parser < Treetop::Runtime::CompiledParser
-    include HGRAMMAR
-  end
 end
 
-(remove_const(:HGRAMMARParser) if const_defined?(:HGRAMMARParser)) rescue nil; HGRAMMARParser = HGRAMMAR::Parser
+class HGRAMMARParser < Treetop::Runtime::CompiledParser
+  include HGRAMMAR
+end