edn-abnf 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17ca8476ccb59a567d0c72fa1eb3be96a637901add2544a545a5e87f8781bd8f
-  data.tar.gz: c88bba22e17635f44acbe1705cd8cb6a9c37ca4c91806e729341cfd347aa8eed
+  metadata.gz: fc5ceebd31ab8dcb7737436c41348a218438eb914ac7090e85015fb6ecbda313
+  data.tar.gz: 8859e52ce3b6154d0d409e01a1d4d279c1f60f589121eeb749f7d171b60c2452
 SHA512:
-  metadata.gz: baac80d34ad740d44e18907bda40ee83f50ab858441d61a70b44ec9f9786fa90c2d24cb988327c44f9ad19762d89af2dffb5b77b2817b1f1c23688a9390bda01
-  data.tar.gz: a6a086be5922adf1ce51f51f5dc009719ed985729efb2c94c4d27bed097054f5490c2d04ca33e32e6a9239bd5c987a31860dc24aa05e46dcdedf7c2293c37f04
+  metadata.gz: 350cb3b5cf59fc45721f626e2a6eb2cf5b936da60952aa4d758b14f8152f98e2f08afe490d2c3e063a2db6900ac1323f59c2e8f6248a11e8f9ff7ac440020130
+  data.tar.gz: 75c3ff4a6948ac326e1b60b9e49a4f440f2e18fd2dc910fc3a7b915244fc95be4edecf843cdcde6d408cc8d74df321200ef93762c3e15228c4c947ea41d600f0

data/edn-abnf.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.0.3"
+  s.version = "0.0.5"
   s.summary = "CDDL (Concise Data Definition Language) converters and miscellaneous tools"
   s.description = %q{edn-abnf implements converters and miscellaneous tools for CBOR EDN's ABNF}
   s.author = "Carsten Bormann"
   s.email = "cabo@tzi.org"
   s.license = "MIT"
   s.homepage = "http://github.com/cabo/edn-abnf"
-  s.files = Dir['lib/**/*.rb'] + %w(edn-abnf.gemspec) + Dir['data/*.cddl'] + Dir['bin/**/*.rb']
+  s.files = Dir['lib/**/*.rb'] + %w(edn-abnf.gemspec) + Dir['bin/**/*.rb']
   s.executables = Dir['bin/*'].map {|x| File.basename(x)}
   s.required_ruby_version = '>= 1.9.2'
 

data/lib/cbor-diagnostic-app/b64.rb

@@ -1,7 +1,13 @@
-# mockup only; needs parser!
+require_relative "b64grammar.rb"
 
 class CBOR_DIAG::App_b64
   def self.decode(_, s)
+    parser = B64GRAMMARParser.new #  B? XXX
+    ast = parser.parse(s)
+    if !ast
+      raise ArgumentError, "cbor-diagnostic: Parse Error in b64'#{s}':\n" << EDN.reason(parser, s)
+    end
+    # lazy -- not using parse tree...:
     t = s.gsub(/\s/, '').chars.each_slice(4).map(&:join)
     if last = t[-1]
       last << "=" * (4 - last.size)

data/lib/cbor-diagnostic-app/b64grammar.rb

@@ -0,0 +1,498 @@
+# Encoding: UTF-8
+# Autogenerated from a Treetop grammar. Edits may be lost.
+
+
+module B64GRAMMAR
+  include Treetop::Runtime
+
+  def root
+    @root ||= :app_string_b64
+  end
+
+  module AppStringB640
+    def b64dig
+      elements[0]
+    end
+
+    def B
+      elements[1]
+    end
+  end
+
+  module AppStringB641
+    def B
+      elements[1]
+    end
+
+  end
+
+  module AppStringB642
+    def b64dig
+      elements[0]
+    end
+
+    def B
+      elements[1]
+    end
+
+  end
+
+  module AppStringB643
+    def b64dig1
+      elements[0]
+    end
+
+    def B1
+      elements[1]
+    end
+
+    def b64dig2
+      elements[2]
+    end
+
+    def B2
+      elements[3]
+    end
+
+    def B3
+      elements[5]
+    end
+  end
+
+  module AppStringB644
+    def B
+      elements[0]
+    end
+
+  end
+
+  def _nt_app_string_b64
+    start_index = index
+    if node_cache[:app_string_b64].has_key?(index)
+      cached = node_cache[:app_string_b64][index]
+      if cached
+        node_cache[:app_string_b64][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    r1 = _nt_B
+    s0 << r1
+    if r1
+      s2, i2 = [], index
+      loop do
+        s3, i3 = [], index
+        loop do
+          i4, s4 = index, []
+          r5 = _nt_b64dig
+          s4 << r5
+          if r5
+            r6 = _nt_B
+            s4 << r6
+          end
+          if s4.last
+            r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+            r4.extend(AppStringB640)
+          else
+            @index = i4
+            r4 = nil
+          end
+          if r4
+            s3 << r4
+          else
+            break
+          end
+          if s3.size == 4
+            break
+          end
+        end
+        if s3.size < 4
+          @index = i3
+          r3 = nil
+        else
+          if s3.size < 4
+            @terminal_failures.pop
+          end
+          r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+        end
+        if r3
+          s2 << r3
+        else
+          break
+        end
+      end
+      r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+      s0 << r2
+      if r2
+        i8, s8 = index, []
+        r9 = _nt_b64dig
+        s8 << r9
+        if r9
+          r10 = _nt_B
+          s8 << r10
+          if r10
+            r11 = _nt_b64dig
+            s8 << r11
+            if r11
+              r12 = _nt_B
+              s8 << r12
+              if r12
+                i14 = index
+                i15, s15 = index, []
+                if (match_len = has_terminal?("=", false, index))
+                  r16 = true
+                  @index += match_len
+                else
+                  terminal_parse_failure('"="')
+                  r16 = nil
+                end
+                s15 << r16
+                if r16
+                  r17 = _nt_B
+                  s15 << r17
+                  if r17
+                    if (match_len = has_terminal?("=", false, index))
+                      r18 = true
+                      @index += match_len
+                    else
+                      terminal_parse_failure('"="')
+                      r18 = nil
+                    end
+                    s15 << r18
+                  end
+                end
+                if s15.last
+                  r15 = instantiate_node(SyntaxNode,input, i15...index, s15)
+                  r15.extend(AppStringB641)
+                else
+                  @index = i15
+                  r15 = nil
+                end
+                if r15
+                  r15 = SyntaxNode.new(input, (index-1)...index) if r15 == true
+                  r14 = r15
+                else
+                  i19, s19 = index, []
+                  r20 = _nt_b64dig
+                  s19 << r20
+                  if r20
+                    r21 = _nt_B
+                    s19 << r21
+                    if r21
+                      if (match_len = has_terminal?("=", false, index))
+                        r23 = true
+                        @index += match_len
+                      else
+                        terminal_parse_failure('"="')
+                        r23 = nil
+                      end
+                      if r23
+                        r22 = r23
+                      else
+                        r22 = instantiate_node(SyntaxNode,input, index...index)
+                      end
+                      s19 << r22
+                    end
+                  end
+                  if s19.last
+                    r19 = instantiate_node(SyntaxNode,input, i19...index, s19)
+                    r19.extend(AppStringB642)
+                  else
+                    @index = i19
+                    r19 = nil
+                  end
+                  if r19
+                    r19 = SyntaxNode.new(input, (index-1)...index) if r19 == true
+                    r14 = r19
+                  else
+                    @index = i14
+                    r14 = nil
+                  end
+                end
+                if r14
+                  r13 = r14
+                else
+                  r13 = instantiate_node(SyntaxNode,input, index...index)
+                end
+                s8 << r13
+                if r13
+                  r24 = _nt_B
+                  s8 << r24
+                end
+              end
+            end
+          end
+        end
+        if s8.last
+          r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
+          r8.extend(AppStringB643)
+        else
+          @index = i8
+          r8 = nil
+        end
+        if r8
+          r7 = r8
+        else
+          r7 = instantiate_node(SyntaxNode,input, index...index)
+        end
+        s0 << r7
+      end
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(AppStringB644)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:app_string_b64][start_index] = r0
+
+    r0
+  end
+
+  def _nt_b64dig
+    start_index = index
+    if node_cache[:b64dig].has_key?(index)
+      cached = node_cache[:b64dig][index]
+      if cached
+        node_cache[:b64dig][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    r1 = _nt_ALPHA
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      r2 = _nt_DIGIT
+      if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+        r0 = r2
+      else
+        if (match_len = has_terminal?("-", false, index))
+          r3 = true
+          @index += match_len
+        else
+          terminal_parse_failure('"-"')
+          r3 = nil
+        end
+        if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+          r0 = r3
+        else
+          if (match_len = has_terminal?("_", false, index))
+            r4 = true
+            @index += match_len
+          else
+            terminal_parse_failure('"_"')
+            r4 = nil
+          end
+          if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+            r0 = r4
+          else
+            if (match_len = has_terminal?("+", false, index))
+              r5 = true
+              @index += match_len
+            else
+              terminal_parse_failure('"+"')
+              r5 = nil
+            end
+            if r5
+              r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
+              r0 = r5
+            else
+              if (match_len = has_terminal?("/", false, index))
+                r6 = true
+                @index += match_len
+              else
+                terminal_parse_failure('"/"')
+                r6 = nil
+              end
+              if r6
+                r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
+                r0 = r6
+              else
+                @index = i0
+                r0 = nil
+              end
+            end
+          end
+        end
+      end
+    end
+
+    node_cache[:b64dig][start_index] = r0
+
+    r0
+  end
+
+  def _nt_B
+    start_index = index
+    if node_cache[:B].has_key?(index)
+      cached = node_cache[:B][index]
+      if cached
+        node_cache[:B][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    s0, i0 = [], index
+    loop do
+      r1 = _nt_iblank
+      if r1
+        s0 << r1
+      else
+        break
+      end
+    end
+    r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+
+    node_cache[:B][start_index] = r0
+
+    r0
+  end
+
+  def _nt_iblank
+    start_index = index
+    if node_cache[:iblank].has_key?(index)
+      cached = node_cache[:iblank][index]
+      if cached
+        node_cache[:iblank][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?("\n", false, index))
+      r1 = true
+      @index += match_len
+    else
+      terminal_parse_failure('"\\n"')
+      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 = true
+        @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[:iblank][start_index] = r0
+
+    r0
+  end
+
+  def _nt_lcalpha
+    start_index = index
+    if node_cache[:lcalpha].has_key?(index)
+      cached = node_cache[:lcalpha][index]
+      if cached
+        node_cache[:lcalpha][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    if has_terminal?(@regexps[gr = '\A[a-z]'] ||= Regexp.new(gr), :regexp, index)
+      r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
+      @index += 1
+    else
+      terminal_parse_failure('[a-z]')
+      r0 = nil
+    end
+
+    node_cache[:lcalpha][start_index] = r0
+
+    r0
+  end
+
+  def _nt_ALPHA
+    start_index = index
+    if node_cache[:ALPHA].has_key?(index)
+      cached = node_cache[:ALPHA][index]
+      if cached
+        node_cache[:ALPHA][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[A-Z]'] ||= Regexp.new(gr), :regexp, index)
+      r1 = true
+      @index += 1
+    else
+      terminal_parse_failure('[A-Z]')
+      r1 = nil
+    end
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      r2 = _nt_lcalpha
+      if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+        r0 = r2
+      else
+        @index = i0
+        r0 = nil
+      end
+    end
+
+    node_cache[:ALPHA][start_index] = r0
+
+    r0
+  end
+
+  def _nt_DIGIT
+    start_index = index
+    if node_cache[:DIGIT].has_key?(index)
+      cached = node_cache[:DIGIT][index]
+      if cached
+        node_cache[:DIGIT][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    if has_terminal?(@regexps[gr = '\A[0-9]'] ||= Regexp.new(gr), :regexp, index)
+      r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
+      @index += 1
+    else
+      terminal_parse_failure('[0-9]')
+      r0 = nil
+    end
+
+    node_cache[:DIGIT][start_index] = r0
+
+    r0
+  end
+
+end
+
+class B64GRAMMARParser < Treetop::Runtime::CompiledParser
+  include B64GRAMMAR
+end
+

data/lib/cbor-diagnostic-app/h.rb

@@ -1,7 +1,13 @@
-# mockup only; needs parser!
+require_relative "hgrammar.rb"
 
 class CBOR_DIAG::App_h
   def self.decode(_, s)
-    s.gsub(/#.*|\s|\/[^\/]*\//, "").chars.each_slice(2).map{ |x| Integer(x.join, 16).chr("BINARY") }.join
+    parser = HGRAMMARParser.new
+    ast = parser.parse(s)
+    if !ast
+      raise ArgumentError, "cbor-diagnostic: Parse Error in h'#{s}':\n" << EDN.reason(parser, s)
+    end
+    ast.ast
   end
+# s.gsub(/#.*|\s|\/[^\/]*\//, "").chars.each_slice(2).map{ |x| Integer(x.join, 16).chr("BINARY") }.join
 end

data/lib/cbor-diagnostic-app/hgrammar.rb

@@ -0,0 +1,457 @@
+# Encoding: UTF-8
+# Autogenerated from a Treetop grammar. Edits may be lost.
+
+
+module HGRAMMAR
+  include Treetop::Runtime
+
+  def root
+    @root ||= :app_string_h
+  end
+
+  module AppStringH0
+    def HEXDIG1
+      elements[0]
+    end
+
+    def S1
+      elements[1]
+    end
+
+    def HEXDIG2
+      elements[2]
+    end
+
+    def S2
+      elements[3]
+    end
+  end
+
+  module AppStringH1
+    def S
+      elements[0]
+    end
+
+  end
+
+  module AppStringH2
+    def ast
+      e1 = elements[1].elements
+      e1.map {|e| Integer(e.elements[0].text_value + e.elements[2].text_value, 16).chr("BINARY")}.join.b
+    end
+  end
+
+  def _nt_app_string_h
+    start_index = index
+    if node_cache[:app_string_h].has_key?(index)
+      cached = node_cache[:app_string_h][index]
+      if cached
+        node_cache[:app_string_h][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    r1 = _nt_S
+    s0 << r1
+    if r1
+      s2, i2 = [], index
+      loop do
+        i3, s3 = index, []
+        r4 = _nt_HEXDIG
+        s3 << r4
+        if r4
+          r5 = _nt_S
+          s3 << r5
+          if r5
+            r6 = _nt_HEXDIG
+            s3 << r6
+            if r6
+              r7 = _nt_S
+              s3 << r7
+            end
+          end
+        end
+        if s3.last
+          r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+          r3.extend(AppStringH0)
+        else
+          @index = i3
+          r3 = nil
+        end
+        if r3
+          s2 << r3
+        else
+          break
+        end
+      end
+      r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+      s0 << r2
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(AppStringH1)
+      r0.extend(AppStringH2)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:app_string_h][start_index] = r0
+
+    r0
+  end
+
+  def _nt_HEXDIG
+    start_index = index
+    if node_cache[:HEXDIG].has_key?(index)
+      cached = node_cache[:HEXDIG][index]
+      if cached
+        node_cache[:HEXDIG][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    r1 = _nt_DIGIT
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      if (match_len = has_terminal?("a", :insens, index))
+        r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+        @index += match_len
+      else
+        terminal_parse_failure('"A"')
+        r2 = nil
+      end
+      if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+        r0 = r2
+      else
+        if (match_len = has_terminal?("b", :insens, index))
+          r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
+        else
+          terminal_parse_failure('"B"')
+          r3 = nil
+        end
+        if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+          r0 = r3
+        else
+          if (match_len = has_terminal?("c", :insens, index))
+            r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+            @index += match_len
+          else
+            terminal_parse_failure('"C"')
+            r4 = nil
+          end
+          if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+            r0 = r4
+          else
+            if (match_len = has_terminal?("d", :insens, index))
+              r5 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+              @index += match_len
+            else
+              terminal_parse_failure('"D"')
+              r5 = nil
+            end
+            if r5
+              r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
+              r0 = r5
+            else
+              if (match_len = has_terminal?("e", :insens, index))
+                r6 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                @index += match_len
+              else
+                terminal_parse_failure('"E"')
+                r6 = nil
+              end
+              if r6
+                r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
+                r0 = r6
+              else
+                if (match_len = has_terminal?("f", :insens, index))
+                  r7 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                  @index += match_len
+                else
+                  terminal_parse_failure('"F"')
+                  r7 = nil
+                end
+                if r7
+                  r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
+                  r0 = r7
+                else
+                  @index = i0
+                  r0 = nil
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+
+    node_cache[:HEXDIG][start_index] = r0
+
+    r0
+  end
+
+  def _nt_DIGIT
+    start_index = index
+    if node_cache[:DIGIT].has_key?(index)
+      cached = node_cache[:DIGIT][index]
+      if cached
+        node_cache[:DIGIT][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    if has_terminal?(@regexps[gr = '\A[0-9]'] ||= Regexp.new(gr), :regexp, index)
+      r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
+      @index += 1
+    else
+      terminal_parse_failure('[0-9]')
+      r0 = nil
+    end
+
+    node_cache[:DIGIT][start_index] = r0
+
+    r0
+  end
+
+  def _nt_blank
+    start_index = index
+    if node_cache[:blank].has_key?(index)
+      cached = node_cache[:blank][index]
+      if cached
+        node_cache[:blank][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?("\t", false, index))
+      r1 = true
+      @index += match_len
+    else
+      terminal_parse_failure('"\\t"')
+      r1 = nil
+    end
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      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
+        r0 = 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
+          r0 = r3
+        else
+          if (match_len = has_terminal?(" ", false, index))
+            r4 = true
+            @index += match_len
+          else
+            terminal_parse_failure('" "')
+            r4 = nil
+          end
+          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[:blank][start_index] = r0
+
+    r0
+  end
+
+  def _nt_non_slash
+    start_index = index
+    if node_cache[:non_slash].has_key?(index)
+      cached = node_cache[:non_slash][index]
+      if cached
+        node_cache[:non_slash][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[0-􏿿]'] ||= Regexp.new(gr), :regexp, index)
+          r3 = true
+          @index += 1
+        else
+          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
+        end
+      end
+    end
+
+    node_cache[:non_slash][start_index] = r0
+
+    r0
+  end
+
+  module S0
+  end
+
+  module S1
+  end
+
+  def _nt_S
+    start_index = index
+    if node_cache[:S].has_key?(index)
+      cached = node_cache[:S][index]
+      if cached
+        node_cache[:S][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_blank
+      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
+        i4, s4 = index, []
+        if (match_len = has_terminal?("/", false, index))
+          r5 = true
+          @index += match_len
+        else
+          terminal_parse_failure('"/"')
+          r5 = nil
+        end
+        s4 << r5
+        if r5
+          s6, i6 = [], index
+          loop do
+            r7 = _nt_non_slash
+            if r7
+              s6 << r7
+            else
+              break
+            end
+          end
+          r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+          s4 << r6
+          if r6
+            if (match_len = has_terminal?("/", false, index))
+              r8 = true
+              @index += match_len
+            else
+              terminal_parse_failure('"/"')
+              r8 = nil
+            end
+            s4 << r8
+            if r8
+              s9, i9 = [], index
+              loop do
+                r10 = _nt_blank
+                if r10
+                  s9 << r10
+                else
+                  break
+                end
+              end
+              r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
+              s4 << r9
+            end
+          end
+        end
+        if s4.last
+          r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+          r4.extend(S0)
+        else
+          @index = i4
+          r4 = nil
+        end
+        if r4
+          s3 << r4
+        else
+          break
+        end
+      end
+      r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+      s0 << r3
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(S1)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:S][start_index] = r0
+
+    r0
+  end
+
+end
+
+class HGRAMMARParser < Treetop::Runtime::CompiledParser
+  include HGRAMMAR
+end
+

data/lib/edn-abnf.rb

@@ -5,9 +5,10 @@ class EDN
 
   def self.reason(parser, s)
     reason = [parser.failure_reason]
-    parser.failure_reason =~ /^(Expected .+) after/m
-    reason << "#{$1.gsub("\n", '<<<NEWLINE>>>')}:" if $1
+    parser.failure_reason =~ /^(Expected .+) after ./m
+    expected = $1
     if line = s.lines.to_a[parser.failure_line - 1]
+      reason << "#{$1.gsub("\n", '<<<NEWLINE>>>')}:" if expected
       reason << line
       reason << "#{'~' * (parser.failure_column - 1)}^"
     end
@@ -17,7 +18,7 @@ class EDN
   def self.from_edn(s)
     ast = @@parser.parse s
     if !ast
-      fail self.reason(@@parser, s)
+      raise ArgumentError, "Parse Error:\n" << self.reason(@@parser, s)
     end
     ret = EDN.new(ast)
     ret

data/lib/parser/edn-util.rb

@@ -1,9 +1,6 @@
 require 'cbor-diagnostic'
 module CBOR_DIAG
 end
-require 'cbor-diagnostic-app/dt'
-require 'cbor-diagnostic-app/h'
-require 'cbor-diagnostic-app/b64'
 
 require 'treetop'
 require_relative './edngrammar'
@@ -19,3 +16,8 @@ class Treetop::Runtime::SyntaxNode
     text_value.to_i(16)
   end
 end
+
+
+require 'cbor-diagnostic-app/dt'
+require 'cbor-diagnostic-app/h'
+require 'cbor-diagnostic-app/b64'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-25 00:00:00.000000000 Z
+date: 2023-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,7 +93,9 @@ files:
 - bin/edn-abnf~
 - edn-abnf.gemspec
 - lib/cbor-diagnostic-app/b64.rb
+- lib/cbor-diagnostic-app/b64grammar.rb
 - lib/cbor-diagnostic-app/h.rb
+- lib/cbor-diagnostic-app/hgrammar.rb
 - lib/edn-abnf.rb
 - lib/parser/edn-util.rb
 - lib/parser/edngrammar.rb