edn-abnf 0.5.43 → 0.5.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe28153b880f4ed0b622b3eb4405d8eb72f480729c25d8b30edee80e95e85a74
-  data.tar.gz: e10f8b6e293a1ed72f1e4aed231339318752d023e1ddf3d7af94e161c57fc2dd
+  metadata.gz: 387d30122d152d5ff18c6e6c54b799e116de77aac0322668997b2d1c0fd121a6
+  data.tar.gz: 6a15cfd8406ab50fd809781d87126d9e2cbc47072d79617069b4fc42627259b2
 SHA512:
-  metadata.gz: 4e91ccd12231bc740812ba3f774cab99fa3e307b80bd5f729ec0429e8cbd8b99fa74986e8f094c6a2176f6a8dff20764b7645d5d20724b8f7c82957bbfaa52ef
-  data.tar.gz: a4834aa184a7b22a57d5a729939f10a3bbde519900faf6199b0609dcbb5473728356f053d5a6b16c0b22ea9c6507faeab23ff014af02e67303dec735259cd2e6
+  metadata.gz: 383edc7befdc01f8ced4305c8cfe48eea3fff2b70128a119239c54262a08c0a7fd13e24c5e62c0c329b3c739ad7e643ebabafa2fc15d37739f794c612aa87d2e
+  data.tar.gz: c1dab33f80321f63b56226e1783cef132a158aaf05da077e355168fd0c1609e0bf49e9302f544d921def3a919f373c2ba30db5ab3db0e87d472fb80b08c7fb2e

data/bin/edn-abnf

@@ -35,7 +35,7 @@ require 'ostruct'
 
 $error = 0
 
-output_formats = [:basic, :neat, :json, :yaml, :edn, :diag, :pretty, :hex, :cbor, :"test-vector"]
+output_formats = [:basic, :neat, :json, :yaml, :edn, :diag, :pretty, :hex, :cbor, :"test-vector", :feat]
 
 $options = OpenStruct.new
 begin
@@ -118,7 +118,10 @@ rescue Exception => e
   exit 1
 end
 
+$feat = Set[]
+
 if !$options.edn
+  $fn = ARGV.join(";")
   ARGF.binmode if $options.cbor
   $options.edn = ARGF.read
 else
@@ -218,6 +221,8 @@ rescue CBOR::OutOfBytesError, RuntimeError, JSON::GeneratorError => e
 end
 
 case $options.target
+when :feat
+  puts [$fn, $feat.to_a.join(",")].join(":")
 when :basic
   pp result
 when :neat, :json

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.5.43"
+  s.version = "0.5.45"
   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/h.rb

@@ -4,6 +4,13 @@ class CBOR_DIAG::App_h
   def self.decode(prefix, s)
     parser = HGRAMMARParser.new
     s = EDN.to_one_string(prefix, s)
+    s.scan(/#.*|\s|\/[^\/]*\//).each do |comment|
+      case comment
+      in /\A\s\z/; $feat << :h_comment_space
+      in /\A#.*\z/; $feat << :h_comment_hash
+      in /\A\/[^\/]*\/\z/; $feat << :h_comment_slash
+      end
+    end
     ast = parser.parse(s)
     if !ast
       raise CBOR_DIAG::AppParseError.new("cbor-diagnostic: Parse Error in h'#{s}':\n" << EDN.reason(parser, s), parser.failure_index)

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

@@ -215,7 +215,7 @@ module HGRAMMAR
   end
 
   module Ellipsis0
-    def ast; CBOR::Tagged.new(888, nil) end
+    def ast; $feat << :ellipsis_in_h; CBOR::Tagged.new(888, nil) end
   end
 
   def _nt_ellipsis

data/lib/edn-abnf.rb

@@ -29,8 +29,9 @@ class EDN
     s = s.to_str
     ast = @@parser.parse s
     if !ast
-      raise ArgumentError, "Parse Error:\n" << self.reason(@@parser, s)
+      raise ArgumentError, "Parse Error#{$fn ? " " + $fn.inspect : ""}:\n" << self.reason(@@parser, s)
     end
+    ast.count_feat
     ret = EDN.new(ast)
     ret
   end

data/lib/parser/edn-util.rb

@@ -30,6 +30,13 @@ module EDNGRAMMAR
 end
 
 class Treetop::Runtime::SyntaxNode
+  def count_feat
+    if elements
+      elements.each do |el|
+        el.count_feat
+      end
+    end
+  end
   def ast
     fail "undefined_ast #{inspect}"
   end

data/lib/parser/edngrammar.rb

@@ -215,7 +215,7 @@ module EDNGRAMMAR
               r10 = SyntaxNode.new(input, (index-1)...index) if r10 == true
               r0 = r10
             else
-              r11 = _nt_ellipsis
+              r11 = _nt_ellipsis_meas
               if r11
                 r11 = SyntaxNode.new(input, (index-1)...index) if r11 == true
                 r0 = r11
@@ -240,6 +240,52 @@ module EDNGRAMMAR
     r0
   end
 
+  module EllipsisMeas0
+    def ellipsis
+      elements[0]
+    end
+
+    def epsilon
+      elements[1]
+    end
+  end
+
+  module EllipsisMeas1
+    def ast; $feat << :ellipsis_outside; ellipsis.ast end
+  end
+
+  def _nt_ellipsis_meas
+    start_index = index
+    if node_cache[:ellipsis_meas].has_key?(index)
+      cached = node_cache[:ellipsis_meas][index]
+      if cached
+        node_cache[:ellipsis_meas][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    r1 = _nt_ellipsis
+    s0 << r1
+    if r1
+      r2 = _nt_epsilon
+      s0 << r2
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(EllipsisMeas0)
+      r0.extend(EllipsisMeas1)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:ellipsis_meas][start_index] = r0
+
+    r0
+  end
+
   def _nt_number
     start_index = index
     if node_cache[:number].has_key?(index)
@@ -341,6 +387,10 @@ module EDNGRAMMAR
   end
 
   module Decnumber0
+    def DIGIT1
+      elements[0]
+    end
+
   end
 
   module Decnumber1
@@ -356,6 +406,9 @@ module EDNGRAMMAR
   end
 
   module Decnumber5
+  end
+
+  module Decnumber6
     def ast
       tv = text_value
       if /[.e]/i =~ tv
@@ -391,62 +444,90 @@ module EDNGRAMMAR
     if r1
       i3 = index
       i4, s4 = index, []
-      s5, i5 = [], index
-      loop do
-        r6 = _nt_DIGIT
-        if r6
-          s5 << r6
-        else
-          break
-        end
+      i5 = index
+      if (match_len = has_terminal?("0", false, index))
+        r6 = true
+        @index += match_len
+      else
+        terminal_parse_failure('"0"')
+        r6 = nil
       end
-      if s5.empty?
-        @index = i5
-        r5 = nil
+      if r6
+        r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
+        r5 = r6
       else
-        r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+        i7, s7 = index, []
+        r8 = _nt_DIGIT1
+        s7 << r8
+        if r8
+          s9, i9 = [], index
+          loop do
+            r10 = _nt_DIGIT
+            if r10
+              s9 << r10
+            else
+              break
+            end
+          end
+          r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
+          s7 << r9
+        end
+        if s7.last
+          r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
+          r7.extend(Decnumber0)
+        else
+          @index = i7
+          r7 = nil
+        end
+        if r7
+          r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
+          r5 = r7
+        else
+          @index = i5
+          r5 = nil
+        end
       end
       s4 << r5
       if r5
-        i8, s8 = index, []
+        i12, s12 = index, []
         if (match_len = has_terminal?(".", false, index))
-          r9 = true
+          r13 = true
           @index += match_len
         else
           terminal_parse_failure('"."')
-          r9 = nil
+          r13 = nil
         end
-        s8 << r9
-        if r9
-          s10, i10 = [], index
+        s12 << r13
+        if r13
+          s14, i14 = [], index
           loop do
-            r11 = _nt_DIGIT
-            if r11
-              s10 << r11
+            r15 = _nt_DIGIT
+            if r15
+              s14 << r15
             else
               break
             end
           end
-          r10 = instantiate_node(SyntaxNode,input, i10...index, s10)
-          s8 << r10
+          r14 = instantiate_node(SyntaxNode,input, i14...index, s14)
+          s12 << r14
         end
-        if s8.last
-          r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
-          r8.extend(Decnumber0)
+        if s12.last
+          r12 = instantiate_node(SyntaxNode,input, i12...index, s12)
+          r12.extend(Decnumber1)
         else
-          @index = i8
-          r8 = nil
+          @index = i12
+          r12 = nil
         end
-        if r8
-          r7 = r8
+        if r12
+          r11 = r12
         else
-          r7 = instantiate_node(SyntaxNode,input, index...index)
+          r11 = instantiate_node(SyntaxNode,input, index...index)
         end
-        s4 << r7
+        s4 << r11
       end
       if s4.last
         r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
-        r4.extend(Decnumber1)
+        r4.extend(Decnumber2)
       else
         @index = i4
         r4 = nil
@@ -455,43 +536,43 @@ module EDNGRAMMAR
         r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
         r3 = r4
       else
-        i12, s12 = index, []
+        i16, s16 = index, []
         if (match_len = has_terminal?(".", false, index))
-          r13 = true
+          r17 = true
           @index += match_len
         else
           terminal_parse_failure('"."')
-          r13 = nil
+          r17 = nil
         end
-        s12 << r13
-        if r13
-          s14, i14 = [], index
+        s16 << r17
+        if r17
+          s18, i18 = [], index
           loop do
-            r15 = _nt_DIGIT
-            if r15
-              s14 << r15
+            r19 = _nt_DIGIT
+            if r19
+              s18 << r19
             else
               break
             end
           end
-          if s14.empty?
-            @index = i14
-            r14 = nil
+          if s18.empty?
+            @index = i18
+            r18 = nil
           else
-            r14 = instantiate_node(SyntaxNode,input, i14...index, s14)
+            r18 = instantiate_node(SyntaxNode,input, i18...index, s18)
           end
-          s12 << r14
+          s16 << r18
         end
-        if s12.last
-          r12 = instantiate_node(SyntaxNode,input, i12...index, s12)
-          r12.extend(Decnumber2)
+        if s16.last
+          r16 = instantiate_node(SyntaxNode,input, i16...index, s16)
+          r16.extend(Decnumber3)
         else
-          @index = i12
-          r12 = nil
+          @index = i16
+          r16 = nil
         end
-        if r12
-          r12 = SyntaxNode.new(input, (index-1)...index) if r12 == true
-          r3 = r12
+        if r16
+          r16 = SyntaxNode.new(input, (index-1)...index) if r16 == true
+          r3 = r16
         else
           @index = i3
           r3 = nil
@@ -499,61 +580,61 @@ module EDNGRAMMAR
       end
       s0 << r3
       if r3
-        i17, s17 = index, []
+        i21, s21 = index, []
         if (match_len = has_terminal?("e", :insens, index))
-          r18 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          r22 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
           terminal_parse_failure('"e"')
-          r18 = nil
+          r22 = nil
         end
-        s17 << r18
-        if r18
-          r20 = _nt_sign
-          if r20
-            r19 = r20
+        s21 << r22
+        if r22
+          r24 = _nt_sign
+          if r24
+            r23 = r24
           else
-            r19 = instantiate_node(SyntaxNode,input, index...index)
+            r23 = instantiate_node(SyntaxNode,input, index...index)
           end
-          s17 << r19
-          if r19
-            s21, i21 = [], index
+          s21 << r23
+          if r23
+            s25, i25 = [], index
             loop do
-              r22 = _nt_DIGIT
-              if r22
-                s21 << r22
+              r26 = _nt_DIGIT
+              if r26
+                s25 << r26
               else
                 break
               end
             end
-            if s21.empty?
-              @index = i21
-              r21 = nil
+            if s25.empty?
+              @index = i25
+              r25 = nil
             else
-              r21 = instantiate_node(SyntaxNode,input, i21...index, s21)
+              r25 = instantiate_node(SyntaxNode,input, i25...index, s25)
             end
-            s17 << r21
+            s21 << r25
           end
         end
-        if s17.last
-          r17 = instantiate_node(SyntaxNode,input, i17...index, s17)
-          r17.extend(Decnumber3)
+        if s21.last
+          r21 = instantiate_node(SyntaxNode,input, i21...index, s21)
+          r21.extend(Decnumber4)
         else
-          @index = i17
-          r17 = nil
+          @index = i21
+          r21 = nil
         end
-        if r17
-          r16 = r17
+        if r21
+          r20 = r21
         else
-          r16 = instantiate_node(SyntaxNode,input, index...index)
+          r20 = instantiate_node(SyntaxNode,input, index...index)
         end
-        s0 << r16
+        s0 << r20
       end
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Decnumber4)
       r0.extend(Decnumber5)
+      r0.extend(Decnumber6)
     else
       @index = i0
       r0 = nil
@@ -577,7 +658,7 @@ module EDNGRAMMAR
   end
 
   module Hexfloat4
-    def ast; Float(text_value.sub(/x\./i, "x0.").sub(/\.p/i, ".0p")) end
+    def ast; $feat << :hex_float; Float(text_value.sub(/x\./i, "x0.").sub(/\.p/i, ".0p")) end
   end
 
   def _nt_hexfloat
@@ -775,7 +856,7 @@ module EDNGRAMMAR
   end
 
   module Hexint1
-    def ast; Integer(text_value) end
+    def ast; $feat << :hex_int; Integer(text_value) end
   end
 
   def _nt_hexint
@@ -843,7 +924,7 @@ module EDNGRAMMAR
   end
 
   module Octint1
-    def ast; Integer(text_value) end
+    def ast; $feat << :oct_int; Integer(text_value) end
   end
 
   def _nt_octint
@@ -911,7 +992,7 @@ module EDNGRAMMAR
   end
 
   module Binint1
-    def ast; Integer(text_value) end
+    def ast; $feat << :bin_int; Integer(text_value) end
   end
 
   def _nt_binint
@@ -1046,6 +1127,158 @@ module EDNGRAMMAR
     r0
   end
 
+  module Epsilon0
+  end
+
+  def _nt_epsilon
+    start_index = index
+    if node_cache[:epsilon].has_key?(index)
+      cached = node_cache[:epsilon][index]
+      if cached
+        node_cache[:epsilon][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
+      if (match_len = has_terminal?("@", false, index))
+        r2 = true
+        @index += match_len
+      else
+        terminal_parse_failure('"@"')
+        r2 = nil
+      end
+      if r2
+        s1 << r2
+      else
+        break
+      end
+    end
+    r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+    s0 << r1
+    if r1
+      i3 = index
+      r4 = lambda {|(x)|x.text_value.length == 0}.call(s0)
+      if !r4
+        terminal_parse_failure("<semantic predicate>")
+      end
+      if r4
+        @index = i3
+        r3 = instantiate_node(SyntaxNode,input, index...index)
+      else
+        @index = i3
+        r3 = nil
+      end
+      s0 << r3
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(Epsilon0)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:epsilon][start_index] = r0
+
+    r0
+  end
+
+  module SqstrMeas0
+    def sqstr
+      elements[0]
+    end
+
+    def epsilon
+      elements[1]
+    end
+  end
+
+  module SqstrMeas1
+    def ast; $feat << :unprefixed_sqstr; sqstr.ast end
+  end
+
+  def _nt_sqstr_meas
+    start_index = index
+    if node_cache[:sqstr_meas].has_key?(index)
+      cached = node_cache[:sqstr_meas][index]
+      if cached
+        node_cache[:sqstr_meas][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    r1 = _nt_sqstr
+    s0 << r1
+    if r1
+      r2 = _nt_epsilon
+      s0 << r2
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(SqstrMeas0)
+      r0.extend(SqstrMeas1)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:sqstr_meas][start_index] = r0
+
+    r0
+  end
+
+  module EmbeddedMeas0
+    def embedded
+      elements[0]
+    end
+
+    def epsilon
+      elements[1]
+    end
+  end
+
+  module EmbeddedMeas1
+    def ast; $feat << :embedded_cbor; embedded.ast end
+  end
+
+  def _nt_embedded_meas
+    start_index = index
+    if node_cache[:embedded_meas].has_key?(index)
+      cached = node_cache[:embedded_meas][index]
+      if cached
+        node_cache[:embedded_meas][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    r1 = _nt_embedded
+    s0 << r1
+    if r1
+      r2 = _nt_epsilon
+      s0 << r2
+    end
+    if s0.last
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(EmbeddedMeas0)
+      r0.extend(EmbeddedMeas1)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:embedded_meas][start_index] = r0
+
+    r0
+  end
+
   def _nt_string
     start_index = index
     if node_cache[:string].has_key?(index)
@@ -1068,12 +1301,12 @@ module EDNGRAMMAR
         r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
-        r3 = _nt_sqstr
+        r3 = _nt_sqstr_meas
         if r3
           r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
-          r4 = _nt_embedded
+          r4 = _nt_embedded_meas
           if r4
             r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
@@ -3816,6 +4049,10 @@ module EDNGRAMMAR
 
   end
 
+  module MSC3
+    def count_feat; $feat << :msc_spaced unless text_value.index(",") end
+  end
+
   def _nt_MSC
     start_index = index
     if node_cache[:MSC].has_key?(index)
@@ -3851,6 +4088,8 @@ module EDNGRAMMAR
     if r1
       r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
+      r0.extend(MSC3)
+      r0.extend(MSC3)
     else
       i4, s4 = index, []
       r5 = _nt_MS
@@ -3893,6 +4132,8 @@ module EDNGRAMMAR
       if r4
         r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
         r0 = r4
+        r0.extend(MSC3)
+        r0.extend(MSC3)
       else
         @index = i0
         r0 = nil
@@ -3917,6 +4158,10 @@ module EDNGRAMMAR
 
   end
 
+  module SOC2
+    def count_feat; $feat << :soc_included if text_value.index(",") end
+  end
+
   def _nt_SOC
     start_index = index
     if node_cache[:SOC].has_key?(index)
@@ -3962,6 +4207,7 @@ module EDNGRAMMAR
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
       r0.extend(SOC1)
+      r0.extend(SOC2)
     else
       @index = i0
       r0 = nil

metadata

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