edn-abnf 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c6889b9d7aa6148fe54cb74e2594c0235b0fe1b6d07192b942d5690aa2b4e55
-  data.tar.gz: 40a8707339bb46f5c984b292eff1ece51d0fcdb614feae79c224b83d4d9ffa1e
+  metadata.gz: e8a0d869d43bdd2c5db0cb07f07e425f6cd1aafd83b22e6bca5620676b8b83c7
+  data.tar.gz: b97edeff8726594b0502e67da2b0a5c57c32addfef0aa1a960fec35b8e939b93
 SHA512:
-  metadata.gz: 9e1461595213030be64e5e778bceaf998cd105772948b51a9b3340feba463e3e6c2da6a68de1388eb9fab487b7f6d8b5d3b092b00704d67b77d15829f681266b
-  data.tar.gz: 8485df1945d7989b762a6d9a94e1395a4228f4fc2126af2c0136af749c3d273d1e72af3d160f3862f8747c33e24411eb084f5fc852138f890f1afa34a2bc4171
+  metadata.gz: e773170c39923fdad052d371804f2074664f42e66d17c193bc1d312aa78d12d889c509268c1c9e978407e1076ee1d28e539b7c85a135f162bb75f854b668b016
+  data.tar.gz: 00a5c49dd6af1b9f1726d84f63d3b625b6d6ad5663ad80d51c3ef8f86151a559f47a7e694f8970eb585b351d3c728c76171fee0027b08d7a357f7af3b57fb711

data/bin/edn-abnf

@@ -58,7 +58,7 @@ edn_file = $options.edn
 if $options.lines
   CSV.parse(edn_file) do |ok, edn, out|
     if ok[0] == "#"
-      puts "# #{ok}, #{edn}, #{out}" if $options.verbose
+      puts "# #{ok}, #{edn.inspect}, #{out}" if $options.verbose
       next
     end
     begin

data/edn-abnf.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.1.1"
-  s.summary = "CBOR Extended Diagnostic Notation implemented in ABNF"
+  s.version = "0.1.2"
+  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"
   s.email = "cabo@tzi.org"

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

@@ -8,7 +8,7 @@ class CBOR_DIAG::App_b64
       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)
+    t = s.gsub(/\s|#[^\n]*(?:\n|\z)/, '').chars.each_slice(4).map(&:join)
     if last = t[-1]
       last << "=" * (4 - last.size)
     end

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

@@ -60,6 +60,9 @@ module B64GRAMMAR
   end
 
   module AppStringB644
+  end
+
+  module AppStringB645
     def B
       elements[0]
     end
@@ -238,11 +241,48 @@ module B64GRAMMAR
           r7 = instantiate_node(SyntaxNode,input, index...index)
         end
         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
+          s26 << r27
+          if r27
+            s28, i28 = [], index
+            loop do
+              r29 = _nt_inon_lf
+              if r29
+                s28 << r29
+              else
+                break
+              end
+            end
+            r28 = instantiate_node(SyntaxNode,input, i28...index, s28)
+            s26 << r28
+          end
+          if s26.last
+            r26 = instantiate_node(SyntaxNode,input, i26...index, s26)
+            r26.extend(AppStringB644)
+          else
+            @index = i26
+            r26 = nil
+          end
+          if r26
+            r25 = r26
+          else
+            r25 = instantiate_node(SyntaxNode,input, index...index)
+          end
+          s0 << r25
+        end
       end
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(AppStringB644)
+      r0.extend(AppStringB645)
     else
       @index = i0
       r0 = nil
@@ -333,6 +373,16 @@ module B64GRAMMAR
     r0
   end
 
+  module B0
+    def icomment
+      elements[0]
+    end
+
+  end
+
+  module B1
+  end
+
   def _nt_B
     start_index = index
     if node_cache[:B].has_key?(index)
@@ -344,16 +394,60 @@ module B64GRAMMAR
       return cached
     end
 
-    s0, i0 = [], index
+    i0, s0 = index, []
+    s1, i1 = [], index
     loop do
-      r1 = _nt_iblank
-      if r1
-        s0 << r1
+      r2 = _nt_iblank
+      if r2
+        s1 << r2
       else
         break
       end
     end
-    r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+    r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+    s0 << r1
+    if r1
+      s3, i3 = [], index
+      loop do
+        i4, s4 = index, []
+        r5 = _nt_icomment
+        s4 << r5
+        if r5
+          s6, i6 = [], index
+          loop do
+            r7 = _nt_iblank
+            if r7
+              s6 << r7
+            else
+              break
+            end
+          end
+          r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+          s4 << r6
+        end
+        if s4.last
+          r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+          r4.extend(B0)
+        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(B1)
+    else
+      @index = i0
+      r0 = nil
+    end
 
     node_cache[:B][start_index] = r0
 
@@ -404,26 +498,105 @@ module B64GRAMMAR
     r0
   end
 
-  def _nt_lcalpha
+  module Icomment0
+  end
+
+  def _nt_icomment
     start_index = index
-    if node_cache[:lcalpha].has_key?(index)
-      cached = node_cache[:lcalpha][index]
+    if node_cache[:icomment].has_key?(index)
+      cached = node_cache[:icomment][index]
       if cached
-        node_cache[:lcalpha][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:icomment][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
+    i0, s0 = index, []
+    if (match_len = has_terminal?("#", false, index))
+      r1 = true
+      @index += match_len
+    else
+      terminal_parse_failure('"#"')
+      r1 = nil
+    end
+    s0 << r1
+    if r1
+      s2, i2 = [], index
+      loop do
+        r3 = _nt_inon_lf
+        if r3
+          s2 << r3
+        else
+          break
+        end
+      end
+      r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+      s0 << r2
+      if r2
+        if (match_len = has_terminal?("\n", false, index))
+          r4 = true
+          @index += match_len
+        else
+          terminal_parse_failure('"\\n"')
+          r4 = nil
+        end
+        s0 << r4
+      end
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(Icomment0)
     else
-      terminal_parse_failure('[a-z]')
+      @index = i0
       r0 = nil
     end
 
-    node_cache[:lcalpha][start_index] = r0
+    node_cache[:icomment][start_index] = r0
+
+    r0
+  end
+
+  def _nt_inon_lf
+    start_index = index
+    if node_cache[:inon_lf].has_key?(index)
+      cached = node_cache[:inon_lf][index]
+      if cached
+        node_cache[:inon_lf][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[:inon_lf][start_index] = r0
 
     r0
   end
@@ -451,7 +624,13 @@ module B64GRAMMAR
       r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
-      r2 = _nt_lcalpha
+      if has_terminal?(@regexps[gr = '\A[a-z]'] ||= Regexp.new(gr), :regexp, index)
+        r2 = true
+        @index += 1
+      else
+        terminal_parse_failure('[a-z]')
+        r2 = nil
+      end
       if r2
         r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2

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

@@ -48,13 +48,16 @@ module HGRAMMAR
   end
 
   module AppStringH4
+  end
+
+  module AppStringH5
     def S
       elements[0]
     end
 
   end
 
-  module AppStringH5
+  module AppStringH6
     def unpack_thread(s)
       case s[0]
       when CBOR::Tagged
@@ -161,11 +164,48 @@ module HGRAMMAR
       end
       r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
       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
+        s13 << r14
+        if r14
+          s15, i15 = [], index
+          loop do
+            r16 = _nt_non_lf
+            if r16
+              s15 << r16
+            else
+              break
+            end
+          end
+          r15 = instantiate_node(SyntaxNode,input, i15...index, s15)
+          s13 << r15
+        end
+        if s13.last
+          r13 = instantiate_node(SyntaxNode,input, i13...index, s13)
+          r13.extend(AppStringH4)
+        else
+          @index = i13
+          r13 = nil
+        end
+        if r13
+          r12 = r13
+        else
+          r12 = instantiate_node(SyntaxNode,input, index...index)
+        end
+        s0 << r12
+      end
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(AppStringH4)
       r0.extend(AppStringH5)
+      r0.extend(AppStringH6)
     else
       @index = i0
       r0 = nil

data/lib/parser/edngrammar.rb

@@ -222,73 +222,6 @@ module EDNGRAMMAR
     r0
   end
 
-  module Number0
-    def spec
-      elements[1]
-    end
-  end
-
-  module Number1
-    def ast
-      if ei = spec.text_value[1..-1]
-         warn "*** ignoring unimplemented encoding indicator #{ei.inspect} for #{elements[0].text_value}"
-      end
-      elements[0].ast
-    end
-  end
-
-  def _nt_number
-    start_index = index
-    if node_cache[:number].has_key?(index)
-      cached = node_cache[:number][index]
-      if cached
-        node_cache[:number][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-        @index = cached.interval.end
-      end
-      return cached
-    end
-
-    i0, s0 = index, []
-    i1 = index
-    r2 = _nt_basenumber
-    if r2
-      r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
-      r1 = r2
-    else
-      r3 = _nt_decnumber
-      if r3
-        r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
-        r1 = r3
-      else
-        r4 = _nt_infin
-        if r4
-          r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
-          r1 = r4
-        else
-          @index = i1
-          r1 = nil
-        end
-      end
-    end
-    s0 << r1
-    if r1
-      r5 = _nt_spec
-      s0 << r5
-    end
-    if s0.last
-      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Number0)
-      r0.extend(Number1)
-    else
-      @index = i0
-      r0 = nil
-    end
-
-    node_cache[:number][start_index] = r0
-
-    r0
-  end
-
   module String10
     def spec
       elements[1]
@@ -522,6 +455,73 @@ module EDNGRAMMAR
     r0
   end
 
+  module Number0
+    def spec
+      elements[1]
+    end
+  end
+
+  module Number1
+    def ast
+      if ei = spec.text_value[1..-1]
+         warn "*** ignoring unimplemented encoding indicator #{ei.inspect} for #{elements[0].text_value}"
+      end
+      elements[0].ast
+    end
+  end
+
+  def _nt_number
+    start_index = index
+    if node_cache[:number].has_key?(index)
+      cached = node_cache[:number][index]
+      if cached
+        node_cache[:number][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    i1 = index
+    r2 = _nt_basenumber
+    if r2
+      r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+      r1 = r2
+    else
+      r3 = _nt_decnumber
+      if r3
+        r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+        r1 = r3
+      else
+        r4 = _nt_infin
+        if r4
+          r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+          r1 = r4
+        else
+          @index = i1
+          r1 = nil
+        end
+      end
+    end
+    s0 << r1
+    if r1
+      r5 = _nt_spec
+      s0 << r5
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(Number0)
+      r0.extend(Number1)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:number][start_index] = r0
+
+    r0
+  end
+
   def _nt_sign
     start_index = index
     if node_cache[:sign].has_key?(index)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Carsten Bormann
@@ -125,5 +125,5 @@ requirements: []
 rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
-summary: CBOR Extended Diagnostic Notation implemented in ABNF
+summary: CBOR Extended Diagnostic Notation (EDN) implemented in ABNF
 test_files: []