cddlc 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 000da759c9346bf077d53d94e0d303e6a60e2384ca81fe8a2e746a0f3a058ebc
-  data.tar.gz: 93a2e95d3ab753726aa62f97e036e554bf2ca4c008eb7189dca1c87e63b53dd3
+  metadata.gz: aa1feed69996a1e91c43877cfbe3e68c6b935039976ae95db312fef99a0e8bbd
+  data.tar.gz: 746c4b175cb78c502ab731e43672841663cfb4a4159bcf387f8f69c9f34e347a
 SHA512:
-  metadata.gz: 2e501521ac303e9a8aba48198037a3f941f2ff3b6e4c875ea42bc64e8052c4a78516c0d7cb2c5a1a7efc1827295f5c446e349c51782ac6f52e9c009d341a8bd0
-  data.tar.gz: f9ae3b76b1bbd807816b959e02d8ddaf7d79be417dfe3c3d56eb0fca3496eafd2d50f2b4496a8bd8abffb3fb539e3fb3702c140679cd25329d0a9cfe4c9af55d
+  metadata.gz: c9b58614695995f0336496734a3684992ddd6f7a1be0dfcbc0451f45afde7e78eb2a2f89ce60e9c5e0c09a1c0e7e8856cc5e5658fe3fe78bc22bc08c4897c4d4
+  data.tar.gz: d19ca545ca39eb87af227651438755c13475dd75bd29ef11a6a6327aac42e9c4a69fe0e5322a291e7819903d89c4de1296e1605934bce9b154dcb7ef6563c151

data/bin/cddlc

@@ -44,7 +44,7 @@ require 'ostruct'
 $options = OpenStruct.new
 begin
   op = OptionParser.new do |opts|
-    opts.banner = "Usage: cddlc.rb [options] file.cddl"
+    opts.banner = "Usage: cddlc.rb [options] [file.cddl... | -]"
 
     opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
       $options.verbose = v

data/cddlc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cddlc"
-  s.version = "0.1.4"
+  s.version = "0.1.5"
   s.summary = "CDDL (Concise Data Definition Language) converters and miscellaneous tools"
   s.description = %q{cddlc implements converters and miscellaneous tools for CDDL, RFC 8610}
   s.author = "Carsten Bormann"
@@ -15,6 +15,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'bundler', '~>1'
   s.add_dependency 'treetop', '~>1'
-  s.add_dependency 'json'
-  s.add_dependency 'neatjson'
+  s.add_dependency 'json', '~>2'
+  s.add_dependency 'neatjson', '~>0.10'
 end

data/lib/cddlc.rb

@@ -39,8 +39,22 @@ class CDDL
            end])
   end
 
+  def self.read_from_include_path(fn)
+    io = nil
+    CDDL::cddl_include_path.each do |path|
+      begin
+        io = (path + fn).open
+        break
+      rescue Errno::ENOENT
+        next
+      end
+    end
+    io
+  end
+
   SAFE_FN = /\A[-._a-zA-Z0-9]+\z/
   IMPINC = /\A(?:import|include)\z/
+  IDENTIFIER_RE = /\A[A-Za-z@_$]([-.]*[A-Za-z@_$0-9])*\z/
 
   def self.from_cddl(s)
     ast = @@parser.parse s
@@ -51,86 +65,146 @@ class CDDL
       directives = s.lines.grep(/^;# /).map(&:chomp).map{|l| l.sub(/^;#\s+/, '').split(/\s+/)}
       # puts directives.to_yaml
     end
+
     ret = CDDL.new(ast, directives)
 
     if $options.cddl2
-      ret.directives.each do |di|
-        preferred_tag = nil
-        case di
-        in [IMPINC => dir, SAFE_FN => docref]
-        in [IMPINC => dir, SAFE_FN => docref, "as", SAFE_FN => preferred_tag]
-        else
-          warn "** Can't parse directive »#{di.join(" ")}«"
-          next
-        end
-        puts "PREFERRED_TAG #{preferred_tag}" if $options.verbose
-        puts "DOCREF #{docref}" if $options.verbose
-        fn = docref.downcase << ".cddl"
-
-        io = nil
-        CDDL::cddl_include_path.each do |path|
-          begin
-            io = (path + fn).open
-            break
-          rescue Errno::ENOENT
-            next
+      ret.perform_directives
+    end
+    ret
+  end
+
+  def perform_directives
+    directives.each do |di|
+      preferred_tag = nil
+      from = nil
+      case di
+      in [IMPINC => dir, SAFE_FN => docref, "as", SAFE_FN => preferred_tag]
+      in [IMPINC => dir, SAFE_FN => docref]
+      in [IMPINC => dir, *from, "from", SAFE_FN => docref, "as", SAFE_FN => preferred_tag]
+      in [IMPINC => dir, *from, "from", SAFE_FN => docref]
+      else
+        warn "** Can't parse directive »#{di.join(" ")}«"
+        next
+      end
+      if from
+        from = from.map do |name|
+          name.chomp!(",")
+          if IDENTIFIER_RE === name
+            name
+          else
+            warn "*** invalid identifier #{name.inspect} ignored in »#{di.join(' ')}«"
+            nil
           end
-        end
-        unless io
-          warn "** include file #{fn} not found in #{CDDL::cddl_include_path.map(&:to_s)}"
-          next
-        end
+        end.compact
+      end
+      puts "FROM #{from.inspect}" if $options.verbose
+      puts "PREFERRED_TAG #{preferred_tag.inspect}" if $options.verbose
+      puts "DOCREF #{docref.inspect}" if $options.verbose
 
-        include_file = io.read
-        included_cddl = CDDL.from_cddl(include_file)
-        if preferred_tag
-          included_cddl = included_cddl.deep_clone # needed?
-          renamed_names = included_cddl.rules.keys
-          name_rename = Hash[
-            renamed_names.map { |o|
-              n = "#{preferred_tag}.#{o}"
-              warn "** Warning: renamed name #{n} already in #{fn}" if included_cddl.rules[n]
-              [o, n]}]
-          included_cddl.rename(name_rename)
-        end
+      fn = docref.downcase << ".cddl"
+      io = CDDL.read_from_include_path(fn)
+      unless io
+        warn "** #{dir} file #{fn} not found in #{CDDL::cddl_include_path.map(&:to_s)}"
+        next
+      end
 
-        case dir
-        in "import"
-          warn "** IMPORTING #{fn}" if $options.verbose
-          undef_rule = nil
-          loop do
-            undef_rule = ret.cddl_undefined # XXX square...
-            # p undef_rule
-            got_more = false
-            undef_rule.each do |name|
-              if rule = included_cddl.rules[name]
-                ret.rules[name] = rule
-                warn "IMPORTED #{name} from #{fn}" if $options.verbose
-                got_more = true
-              end
+      include_file = io.read
+      included_cddl = CDDL.from_cddl(include_file)
+      if preferred_tag
+        included_cddl = included_cddl.deep_clone # needed?
+        renamed_names = included_cddl.rules.keys
+        name_rename = Hash[
+          renamed_names.map { |o|
+            n = "#{preferred_tag}.#{o}"
+            warn "** Warning: renamed name #{n} already in #{fn}" if included_cddl.rules[n]
+            [o, n]}]
+        included_cddl.rename(name_rename)
+      end
+
+      case dir
+      in "import"
+        warn "** IMPORTING #{from && from.join(", ") << " from "}#{fn}" if $options.verbose
+
+        must_be_found = false
+        to_be_imported = if from
+                           if preferred_tag
+                             from.map{ |k|
+                               if k =~ /\A#{preferred_tag}[.]/
+                                 k
+                               elsif nn = name_rename[k]
+                                 if old = store_rule(k, v = ["name", nn])
+                                   warn "*** autogenerated rule #{k} = #{v} would overwrite #{old}"
+                                 end
+                                 nn
+                               else
+                                 warn_error "*** imported rule #{k.inspect} not in #{fn}"
+                               end
+                             }.compact
+                           else
+                             must_be_found = true
+                             from
+                           end
+                         else
+                           cddl_undefined
+                         end
+        loop do
+          # p to_be_imported
+          got_more = false
+          to_be_imported.each do |name|
+            if rule = included_cddl.rules[name]
+              rules[name] = rule
+              warn "IMPORTED #{name} from #{fn}" if $options.verbose
+              got_more = true
+            elsif must_be_found
+              warn_error "*** imported rule #{name.inspect} not in #{fn}"
             end
-            break unless got_more
           end
-          if preferred_tag
-            undef_rule.each do |name|
-              warn "** Warning: undefined reference #{name} without namespace prefix is defined in namespaced imported module #{fn}" if name_rename[name]
-            end
+          break unless got_more
+          to_be_imported = cddl_undefined # XXX square...
+          must_be_found = false
+        end
+        if preferred_tag
+          to_be_imported.each do |name|
+            warn "** Warning: undefined reference #{name} without namespace prefix is defined in namespaced imported module #{fn}" if name_rename[name]
+            ### instead just add rule...
           end
-        in "include"
-          warn "** INCLUDING #{fn}" if $options.verbose
-          included_cddl.rules.each do |k, v|
-            if old = ret.rules[k]
-              if old != v
-                warn "** included rule #{k} = #{v} would overwrite #{old}"
-              end
-            else
-              ret.rules[k] = v
-            end
+        end
+      in "include"
+        if from
+          from = Set[*from]
+        end
+        warn "** INCLUDING #{from && from.join(", ") << " from "}#{fn}" if $options.verbose
+        included_cddl.rules.each do |k, v|
+          if from
+            next unless from.include?(k)
+            from.delete(k)
           end
+          if old = store_rule(k, v)
+            warn "*** included rule #{k} = #{v} would overwrite #{old}"
+          end
+        end
+        if from && !from.empty?
+          warn "*** could not find #{from.join(", ")} in #{fn}"
         end
       end
     end
-    ret
+  end
+
+  def store_rule(k, v)
+    if old = rules[k]
+      if old != v
+        return old              # error
+      end
+    else
+      rules[k] = v
+    end
+    nil                         # OK
+  end
+
+  def warn_error(s)
+    warn s
+    @error = true
   end
 
   attr_accessor :ast, :tree, :directives

data/lib/parser/cddlgrammar.rb

@@ -69,12 +69,7 @@ module CDDLGRAMMAR
           break
         end
       end
-      if s2.empty?
-        @index = i2
-        r2 = nil
-      else
-        r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-      end
+      r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
       s0 << r2
     end
     if s0.last

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddlc
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-02 00:00:00.000000000 Z
+date: 2023-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,30 +42,30 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: neatjson
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 description: cddlc implements converters and miscellaneous tools for CDDL, RFC 8610
 email: cabo@tzi.org
 executables: