edn-abnf 0.5.15 → 0.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0cfa7f5a3324396126a17a2530147bff309fec468d512ede0ca8c436591f44c
-  data.tar.gz: 6850c6fa052ba8b687ac8a0332ed05f27a32781e5132c76754dfd24ad2928e55
+  metadata.gz: a7428d9c37d567345cad63c6dc471c5d053267338240ea1ac3fcd14f76cb05a9
+  data.tar.gz: f76991dd9d56badebfcfa995f8b6ac4a72a7993eaf4a36760f589e696856a55f
 SHA512:
-  metadata.gz: dd717eab5c11238c954e70ecf9575524aa1826fccbe7d885c9ac9e5946783314181443ddd17c6af22e5b18a841f472252871e14a3d480e701cdba8c996142658
-  data.tar.gz: ae2f0a9e57e9d4cb64cf3ea2f00f7f5d3e8e47141c2ec1e05276f6c4c3d859661d76003617c9b22c7773cbf067603bdf883c788ad670335e97c4757a25ff1b15
+  metadata.gz: 4dea78110a5b51f5d7d116118889858314324f950f7749fe157d965649004835a3dda5de145ac70551814783bffca467badca26495ada0e1b757e67287cda93f
+  data.tar.gz: ed5cc8087dcd1d8af1bf31cd9be40153b5d5be83b6508da75d78a9dc96852f1e47e0048c3a59ad23bb645d9595212ca491385839c298886e28584b3b968b919b

data/bin/edn-abnf

@@ -85,6 +85,12 @@ begin
     opts.on("-f", "--[no-]fallback", "use tag 999 for unknown app-extensions") do |v|
       $options.fallback = v
     end
+    opts.on("-wCOL", "--wrap=COL", Integer, "EDN: wrap at column COL") do |v|
+      $options.wrap = v
+    end
+    opts.on("-T", "--[no-]terminator", "Format with comma as terminator") do |v|
+      $options.terminator = v
+    end
   end
   op.parse!
 rescue Exception => e
@@ -191,7 +197,7 @@ when :neat, :json
 when :yaml
   puts result.to_yaml
 when :edn, :diag, nil
-  puts result.cbor_diagnostic
+  puts result.cbor_diagnostic(wrap: $options.wrap, terminator: $options.terminator)
 when :pretty, :hex, :cbor
   # XXX can't do Box yet
   enc = if CBOR::Sequence === result

data/edn-abnf.gemspec

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

@@ -5888,87 +5888,27 @@ module EDNGRAMMAR
       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?("\r", false, index))
-        r2 = true
-        @index += match_len
+    s0, i0 = [], index
+    loop do
+      if has_terminal?(@regexps[gr = '\A[\\n\\r\\ -!\\#-&\\(-\\[\\]-€-퟿-􏿿]'] ||= Regexp.new(gr), :regexp, index)
+        r1 = true
+        @index += 1
       else
-        terminal_parse_failure('"\\r"')
-        r2 = nil
+        terminal_parse_failure('[\\n\\r\\ -!\\#-&\\(-\\[\\]-€-퟿-􏿿]')
+        r1 = nil
       end
-      if r2
-        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
-        r0 = r2
+      if r1
+        s0 << r1
       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[\\#-&]'] ||= 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
-          else
-            if has_terminal?(@regexps[gr = '\A[\\(-\\[]'] ||= Regexp.new(gr), :regexp, index)
-              r5 = true
-              @index += 1
-            else
-              terminal_parse_failure('[\\(-\\[]')
-              r5 = nil
-            end
-            if r5
-              r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
-              r0 = r5
-            else
-              if has_terminal?(@regexps[gr = '\A[\\]-]'] ||= Regexp.new(gr), :regexp, index)
-                r6 = true
-                @index += 1
-              else
-                terminal_parse_failure('[\\]-]')
-                r6 = nil
-              end
-              if r6
-                r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
-                r0 = r6
-              else
-                r7 = _nt_NONASCII
-                if r7
-                  r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
-                  r0 = r7
-                else
-                  @index = i0
-                  r0 = nil
-                end
-              end
-            end
-          end
-        end
+        break
       end
     end
+    if s0.empty?
+      @index = i0
+      r0 = nil
+    else
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+    end
 
     node_cache[:unescaped][start_index] = r0
 

metadata

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