edn-abnf 0.1.6 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a6d50c20324f9915e90cb313aae08cb443bc60102e99eab1c40bd64744371d2
-  data.tar.gz: 4a90a0f27bc2fdb1827a0537a68bdd9a97968945aef23dc8fb94ba379719c4ef
+  metadata.gz: 53d9d76f5b3a4ac6e05c39d9050d8638ee9c7a7ab40b85e63d76f5deaf908343
+  data.tar.gz: 026a649f7b15be50650baa42b81975ddd6ca791458010dfc5f9a11a0e947bb69
 SHA512:
-  metadata.gz: cddfcc37da78d059dd33d771ec1759d19be1111512335c5a89fafc50402249ee9755197aed94628b2c5b7469e7b765f661ce0f26ba9c914e5665daa9efd8f9b8
-  data.tar.gz: 1bf62702cbb69f420832f24ec82cf42db7f13c15179adf519899aa2e2f655e0ea1d4f9250051c8305e7cf955421b37169a2bd147ead874f123ab470dc9abf4cc
+  metadata.gz: 50342e06dcd4acd09737a50f0f9ee52f52b997368339e98049dd59816cd137f937605514167c3bd9225b73262219ea7797855bc0d7716732c80e6e8f5fca7f99
+  data.tar.gz: bc2286703fc79b9a182019ff2a30b56953b829f63e22b9bf7df738928ad3379b01c1344e4bf561c6b4de1af0177efe8a747e40a4d15026950877296a76c7c8a9

data/edn-abnf.gemspec

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

@@ -10,16 +10,16 @@ module EDNGRAMMAR
   end
 
   module Seq0
-    def S1
-      elements[1]
+    def OC
+      elements[0]
     end
 
     def item
-      elements[2]
+      elements[1]
     end
 
-    def S2
-      elements[3]
+    def S
+      elements[2]
     end
   end
 
@@ -38,13 +38,10 @@ module EDNGRAMMAR
   end
 
   module Seq2
-    def S1
+    def S
       elements[0]
     end
 
-    def S2
-      elements[2]
-    end
   end
 
   module Seq3
@@ -87,24 +84,14 @@ module EDNGRAMMAR
           s6, i6 = [], index
           loop do
             i7, s7 = index, []
-            if (match_len = has_terminal?(",", false, index))
-              r8 = true
-              @index += match_len
-            else
-              terminal_parse_failure('","')
-              r8 = nil
-            end
+            r8 = _nt_OC
             s7 << r8
             if r8
-              r9 = _nt_S
+              r9 = _nt_item
               s7 << r9
               if r9
-                r10 = _nt_item
+                r10 = _nt_S
                 s7 << r10
-                if r10
-                  r11 = _nt_S
-                  s7 << r11
-                end
               end
             end
             if s7.last
@@ -123,8 +110,8 @@ module EDNGRAMMAR
           r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
           s3 << r6
           if r6
-            r12 = _nt_OC
-            s3 << r12
+            r11 = _nt_OC
+            s3 << r11
           end
         end
       end
@@ -141,10 +128,6 @@ module EDNGRAMMAR
         r2 = instantiate_node(SyntaxNode,input, index...index)
       end
       s0 << r2
-      if r2
-        r13 = _nt_S
-        s0 << r13
-      end
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
@@ -360,12 +343,16 @@ module EDNGRAMMAR
   end
 
   module String0
-    def S
+    def S1
       elements[0]
     end
 
+    def S2
+      elements[2]
+    end
+
     def string1e
-      elements[1]
+      elements[3]
     end
   end
 
@@ -391,7 +378,7 @@ module EDNGRAMMAR
       end
     end
     def ast
-      arr = [elements[0].ast] + elements[1].elements.map {|x| x.elements[1].ast}
+      arr = [elements[0].ast] + elements[1].elements.map {|x| x.elements[3].ast}
       charr = arr.chunk(&:class).to_a
       if charr.size == 1
         unpack_chunk(*charr.first)
@@ -422,8 +409,22 @@ module EDNGRAMMAR
         r4 = _nt_S
         s3 << r4
         if r4
-          r5 = _nt_string1e
+          if (match_len = has_terminal?("+", false, index))
+            r5 = true
+            @index += match_len
+          else
+            terminal_parse_failure('"+"')
+            r5 = nil
+          end
           s3 << r5
+          if r5
+            r6 = _nt_S
+            s3 << r6
+            if r6
+              r7 = _nt_string1e
+              s3 << r7
+            end
+          end
         end
         if s3.last
           r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
@@ -1920,16 +1921,16 @@ module EDNGRAMMAR
   end
 
   module Array0
-    def S1
-      elements[1]
+    def OC
+      elements[0]
     end
 
     def item
-      elements[2]
+      elements[1]
     end
 
-    def S2
-      elements[3]
+    def S
+      elements[2]
     end
   end
 
@@ -2014,24 +2015,14 @@ module EDNGRAMMAR
               s8, i8 = [], index
               loop do
                 i9, s9 = index, []
-                if (match_len = has_terminal?(",", false, index))
-                  r10 = true
-                  @index += match_len
-                else
-                  terminal_parse_failure('","')
-                  r10 = nil
-                end
+                r10 = _nt_OC
                 s9 << r10
                 if r10
-                  r11 = _nt_S
+                  r11 = _nt_item
                   s9 << r11
                   if r11
-                    r12 = _nt_item
+                    r12 = _nt_S
                     s9 << r12
-                    if r12
-                      r13 = _nt_S
-                      s9 << r13
-                    end
                   end
                 end
                 if s9.last
@@ -2050,8 +2041,8 @@ module EDNGRAMMAR
               r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
               s5 << r8
               if r8
-                r14 = _nt_OC
-                s5 << r14
+                r13 = _nt_OC
+                s5 << r13
               end
             end
           end
@@ -2070,13 +2061,13 @@ module EDNGRAMMAR
           s0 << r4
           if r4
             if (match_len = has_terminal?("]", false, index))
-              r15 = true
+              r14 = true
               @index += match_len
             else
               terminal_parse_failure('"]"')
-              r15 = nil
+              r14 = nil
             end
-            s0 << r15
+            s0 << r14
           end
         end
       end
@@ -2096,16 +2087,16 @@ module EDNGRAMMAR
   end
 
   module Map0
-    def S1
-      elements[1]
+    def OC
+      elements[0]
     end
 
     def kp
-      elements[2]
+      elements[1]
     end
 
-    def S2
-      elements[3]
+    def S
+      elements[2]
     end
   end
 
@@ -2189,24 +2180,14 @@ module EDNGRAMMAR
               s8, i8 = [], index
               loop do
                 i9, s9 = index, []
-                if (match_len = has_terminal?(",", false, index))
-                  r10 = true
-                  @index += match_len
-                else
-                  terminal_parse_failure('","')
-                  r10 = nil
-                end
+                r10 = _nt_OC
                 s9 << r10
                 if r10
-                  r11 = _nt_S
+                  r11 = _nt_kp
                   s9 << r11
                   if r11
-                    r12 = _nt_kp
+                    r12 = _nt_S
                     s9 << r12
-                    if r12
-                      r13 = _nt_S
-                      s9 << r13
-                    end
                   end
                 end
                 if s9.last
@@ -2225,8 +2206,8 @@ module EDNGRAMMAR
               r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
               s5 << r8
               if r8
-                r14 = _nt_OC
-                s5 << r14
+                r13 = _nt_OC
+                s5 << r13
               end
             end
           end
@@ -2245,13 +2226,13 @@ module EDNGRAMMAR
           s0 << r4
           if r4
             if (match_len = has_terminal?("}", false, index))
-              r15 = true
+              r14 = true
               @index += match_len
             else
               terminal_parse_failure('"}"')
-              r15 = nil
+              r14 = nil
             end
-            s0 << r15
+            s0 << r14
           end
         end
       end
@@ -2786,16 +2767,16 @@ module EDNGRAMMAR
   end
 
   module Streamstring0
-    def S1
-      elements[1]
+    def OC
+      elements[0]
     end
 
     def string
-      elements[2]
+      elements[1]
     end
 
-    def S2
-      elements[3]
+    def S
+      elements[2]
     end
   end
 
@@ -2861,24 +2842,14 @@ module EDNGRAMMAR
             s5, i5 = [], index
             loop do
               i6, s6 = index, []
-              if (match_len = has_terminal?(",", false, index))
-                r7 = true
-                @index += match_len
-              else
-                terminal_parse_failure('","')
-                r7 = nil
-              end
+              r7 = _nt_OC
               s6 << r7
               if r7
-                r8 = _nt_S
+                r8 = _nt_string
                 s6 << r8
                 if r8
-                  r9 = _nt_string
+                  r9 = _nt_S
                   s6 << r9
-                  if r9
-                    r10 = _nt_S
-                    s6 << r10
-                  end
                 end
               end
               if s6.last
@@ -2897,17 +2868,17 @@ module EDNGRAMMAR
             r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
             s0 << r5
             if r5
-              r11 = _nt_OC
-              s0 << r11
-              if r11
+              r10 = _nt_OC
+              s0 << r10
+              if r10
                 if (match_len = has_terminal?(")", false, index))
-                  r12 = true
+                  r11 = true
                   @index += match_len
                 else
                   terminal_parse_failure('")"')
-                  r12 = nil
+                  r11 = nil
                 end
-                s0 << r12
+                s0 << r11
               end
             end
           end
@@ -2983,7 +2954,7 @@ module EDNGRAMMAR
   end
 
   module DoubleQuoted0
-    def ast; text_value end
+    def ast; text_value.gsub("\r", "") end
   end
 
   module DoubleQuoted1
@@ -3104,7 +3075,7 @@ module EDNGRAMMAR
   end
 
   module SingleQuoted0
-    def ast; text_value end
+    def ast; text_value.gsub("\r", "") end
   end
 
   module SingleQuoted1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.1
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-23 00:00:00.000000000 Z
+date: 2024-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,12 +85,10 @@ description: edn-abnf implements converters and miscellaneous tools for CBOR EDN
 email: cabo@tzi.org
 executables:
 - edn-abnf
-- edn-abnf~
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/edn-abnf
-- bin/edn-abnf~
 - edn-abnf.gemspec
 - lib/cbor-diagnostic-app/b64.rb
 - lib/cbor-diagnostic-app/b64grammar.rb
@@ -122,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.4
+rubygems_version: 3.5.14
 signing_key:
 specification_version: 4
 summary: CBOR Extended Diagnostic Notation (EDN) implemented in ABNF

data/bin/edn-abnf~

@@ -1,57 +0,0 @@
-#!/usr/bin/env ruby
-require 'pp'
-require 'yaml'
-require 'treetop'
-require 'json'
-
-require_relative '../lib/edn-abnf.rb'
-
-def snaky(name)
-  name.gsub(/-/, "_")
-end
- 
-Encoding.default_external = Encoding::UTF_8
-require 'optparse'
-require 'ostruct'
-
-$options = OpenStruct.new
-begin
-  op = OptionParser.new do |opts|
-    opts.banner = "Usage: edn-abnf.rb [options] [file.edn... | -]"
-
-    opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-      $options.verbose = v
-    end
-    opts.on("-tFMT", "--to=FMT", [:basic, :neat, :json, :yaml, :edn, :diag], "Target format") do |v|
-      $options.target = v
-    end
-  end
-  op.parse!
-rescue Exception => e
-  warn e
-  exit 1
-end
-
-if ARGV == []
-  puts op
-  exit 1
-end
-
-edn_file = ARGF.read
-
-edn = EDN.from_edn(edn_file)
-result = edn.tree               # XXX .tree?
-
-case $options.target
-when :basic, nil
-  pp result
-when :neat, :json
-  require 'neatjson'
-  puts JSON.neat_generate(result, after_comma: 1, after_colon: 1)
-when :yaml
-  puts result.to_yaml
-when :edn, :diag
-  puts result.cbor_diagnostic
-else
-  warn ["Unknown target format: ", $options.target].inspect
-end