cddlc 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e4a9fe5e7434a8b5f5bea9b9194c988206f74e95aef1e4d2e46067968367727
-  data.tar.gz: de11c07b72815e2e6580ed35b36d4d0b56f39e282b3072f84d00e836b6bcd2aa
+  metadata.gz: b1b9a4aa1c2c8b9ba3310cdca0201947f6bd08c7d229443d462ac2881e3d0768
+  data.tar.gz: 7873a339b9f98917635e0d9e5bd6a1a62ce096b2ba6fb39d1daced9eb328209b
 SHA512:
-  metadata.gz: 62ca200613f056851f397a41a57e64fd49fa0ff2196d0433d706760c05f11468ae3a6ed7652fc4ee5f4387476744e36f2f06f07f67efc14b68774460b55023cd
-  data.tar.gz: b1b7560dbfe6f712f31b415138f37bde551a095fcb7a42a7afc82268db416de5eca5f1dff0d3d9f8cf02b82b39b9880d3fb19e7dc405186ffba61acd6b2d029a
+  metadata.gz: ac5068f18dc4881e9b52edeb0e262d806f788d72835ca3bfd020911f1414bc60a8a35fe18b7ede71d56bee3c25e263afa16e81f7d8fabee349fe9c0e9c57218a
+  data.tar.gz: 3676274ba515d3ec01677a2e0db3e988659e692c9457e01566122dc672f00ec0d1490d602139d13e962ebd31544a6d90ae88842f466edbc65d3c2373d2b9a948

data/bin/cddlc

@@ -4,8 +4,39 @@ require 'yaml'
 require 'treetop'
 require 'json'
 
-require_relative '../lib/parser/cddl-util.rb'
+require_relative '../lib/cddlc.rb'
 
+def named_keys(tree)
+  # warn [:T, tree].inspect
+  fail unless Array === tree
+  case tree[0]
+  when "seq", "gcho", "tcho"
+    tree[1..-1].flat_map {|x| named_keys(x)}
+  when "rep"
+    named_keys(tree[3])
+  when "mem"
+    key = tree[1]
+    if Array === key && key[0] == "name"
+      [key[1]]
+    end
+  end || []
+end
+
+def integer_value(tree)
+  tree and (
+    fail tree.inspect unless Array === tree
+    case tree[0]
+    when "number"
+      tree[1]
+      # XXX: could add other cases
+    end
+  )
+end
+
+def snaky(name)
+  name.gsub(/-/, "_")
+end
+ 
 Encoding.default_external = Encoding::UTF_8
 require 'optparse'
 require 'ostruct'
@@ -18,7 +49,10 @@ begin
     opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
       $options.verbose = v
     end
-    opts.on("-tFMT", "--to=FMT", [:neat, :json, :yaml], "Target format") do |v|
+    opts.on("-r", "--[no-]rules", "Process rules") do |v|
+      $options.rules = v
+    end
+    opts.on("-tFMT", "--to=FMT", [:basic, :neat, :json, :yaml, :enum], "Target format") do |v|
       $options.target = v
     end
   end
@@ -34,26 +68,38 @@ if ARGV == []
 end
 cddl_file = ARGF.read
 
-parser = CDDLParser.new
-ast = parser.parse cddl_file
-if ast
-#  puts ast.to_yaml
-  result = ast.ast
-  case $options.target
-  when :json, nil
-    pp result
-  when :neat
-    require 'neatjson'
-    puts JSON.neat_generate(result, after_comma: 1, after_colon: 1)
-  when :yaml
-    puts result.to_yaml
-  else
-    warn ["Unknown target format: ", $options.target].inspect
+cddl = CDDL.from_cddl(cddl_file)
+result = if $options.rules
+           cddl.rules
+         else
+           cddl.tree
+         end
+
+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 :enum
+  rules = cddl.rules
+  rules.each do |k, v|
+    if v[0] == "map"
+      nk = v[1..-1].flat_map {|e| named_keys(e)}
+      # warn [:NK, k, nk].inspect
+      nk = nk.map {|name| i = integer_value(rules[name]); [name, i] if i}.compact
+      # warn [:NK, k, nk].inspect
+      if nk != []
+        puts "enum #{snaky(k).downcase}_keys {"
+        nk.each do |n, v|
+          puts "  #{snaky(n).upcase} = #{v},"
+        end
+        puts "};"
+      end
+    end
   end
 else
-  warn parser.failure_reason
-  parser.failure_reason =~ /^(Expected .+) after/m
-  warn "#{$1.gsub("\n", '<<<NEWLINE>>>')}:"
-  warn cddl_file.lines.to_a[parser.failure_line - 1]
-  warn "#{'~' * (parser.failure_column - 1)}^"
+  warn ["Unknown target format: ", $options.target].inspect
 end

data/cddlc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cddlc"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
   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"

data/lib/cddlc.rb

@@ -0,0 +1,69 @@
+require_relative "parser/cddl-util.rb"
+
+class CDDL
+  @@parser = CDDLGRAMMARParser.new
+
+  def self.reason(parser, s)
+    reason = [parser.failure_reason]
+    parser.failure_reason =~ /^(Expected .+) after/m
+    reason << "#{$1.gsub("\n", '<<<NEWLINE>>>')}:" if $1
+    if line = s.lines.to_a[parser.failure_line - 1]
+      reason << line
+      reason << "#{'~' * (parser.failure_column - 1)}^"
+    end
+    reason.join("\n")
+  end
+
+  def self.from_cddl(s)
+    ast = @@parser.parse s
+    if !ast
+      fail self.reason(@@parser, s)
+    end
+    CDDL.new(ast)
+  end
+
+  attr_accessor :ast, :tree
+  def initialize(ast_)
+    @ast = ast_
+    @tree = ast.ast
+    @rules = nil                # only fill in if needed
+  end
+
+  RULE_OP_TO_CHOICE = {"/=" => "tcho", "//=" => "gcho"}
+
+  def rules
+    if @rules.nil?              # memoize
+      @rules = {}
+      fail unless @tree.first == "cddl"
+      @tree[1..-1].each do |x|
+        op, name, val, rest = x
+        cho = RULE_OP_TO_CHOICE[op]
+        fail rest if rest
+        fail name unless Array === name
+        case name[0]
+        when "name"
+          fail unless name.size == 2
+          name = name[1]
+        when "gen"
+          name = name[1..-1]
+        else
+          fail name
+        end
+        @rules[name] =
+          if old = @rules[name]
+            fail "duplicate rule for name #{name}" unless cho
+            if Array === old && old[0] == cho
+              old.dup << val
+            else
+              [cho, old, val]
+            end
+          else
+            val
+          end
+      end
+      # warn "** rules #{rules.inspect}"
+    end
+    @rules
+  end
+
+end

data/lib/parser/cddl-util.rb

@@ -1,5 +1,5 @@
 
-require_relative './cddl'
+require_relative './cddlgrammar'
 
 class Treetop::Runtime::SyntaxNode
   def ast

data/lib/parser/{cddl.rb → cddlgrammar.rb}

@@ -2,14 +2,14 @@
 # Autogenerated from a Treetop grammar. Edits may be lost.
 
 
-module CDDL
+module CDDLGRAMMAR
   include Treetop::Runtime
 
   def root
-    @root ||= :cddl
+    @root ||= :cddlgrammar
   end
 
-  module Cddl0
+  module Cddlgrammar0
     def r__rule
       elements[0]
     end
@@ -19,25 +19,25 @@ module CDDL
     end
   end
 
-  module Cddl1
+  module Cddlgrammar1
     def S
       elements[0]
     end
 
   end
 
-  module Cddl2
+  module Cddlgrammar2
     def ast
       ["cddl", *elements[1].elements.map(&:r__rule).map(&:ast)]
     end
   end
 
-  def _nt_cddl
+  def _nt_cddlgrammar
     start_index = index
-    if node_cache[:cddl].has_key?(index)
-      cached = node_cache[:cddl][index]
+    if node_cache[:cddlgrammar].has_key?(index)
+      cached = node_cache[:cddlgrammar][index]
       if cached
-        node_cache[:cddl][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:cddlgrammar][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -58,7 +58,7 @@ module CDDL
         end
         if s3.last
           r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
-          r3.extend(Cddl0)
+          r3.extend(Cddlgrammar0)
         else
           @index = i3
           r3 = nil
@@ -79,14 +79,14 @@ module CDDL
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Cddl1)
-      r0.extend(Cddl2)
+      r0.extend(Cddlgrammar1)
+      r0.extend(Cddlgrammar2)
     else
       @index = i0
       r0 = nil
     end
 
-    node_cache[:cddl][start_index] = r0
+    node_cache[:cddlgrammar][start_index] = r0
 
     r0
   end
@@ -4010,7 +4010,7 @@ module CDDL
 
 end
 
-class CDDLParser < Treetop::Runtime::CompiledParser
-  include CDDL
+class CDDLGRAMMARParser < Treetop::Runtime::CompiledParser
+  include CDDLGRAMMAR
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddlc
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Carsten Bormann
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-20 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,13 +75,14 @@ extra_rdoc_files: []
 files:
 - bin/cddlc
 - cddlc.gemspec
+- lib/cddlc.rb
 - lib/parser/cddl-util.rb
-- lib/parser/cddl.rb
+- lib/parser/cddlgrammar.rb
 homepage: http://github.com/cabo/cddlc
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -96,8 +97,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: CDDL (Concise Data Definition Language) converters and miscellaneous tools
 test_files: []