rggen 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19195a9804097d391d2ee4c629922ef49a1d1d82
-  data.tar.gz: 7052fa9b494b2948f452649797f5280bef883af2
+  metadata.gz: 5cf6420ad53a229357bd8445db927fe2c8c23d32
+  data.tar.gz: 960ab1258d4dc08dc4f79679b7095f5d7a93dd9b
 SHA512:
-  metadata.gz: 59827fbc8e93f033570dd65f7bfaaeb0123c977bc095d0b7d835c80b2f21f263058b880408fc840ed8a7a1da77e05da4e40884462526ade82824336d3ede4014
-  data.tar.gz: f31b881ee297b1915fbfe6b60266b8eed027f73d7eb2f0161fe3fb15bddc2a5df4c64304051b2964d3dee59664abe3a0c52e158f2078014f5e498b9cae197a0d
+  metadata.gz: 3732f7f3ee3826b0594a03b9595172898229a26c0165a3f49a8777582a1fa7f8075a903a0d6ac6f76d89e81bbfca823e9a9e9f128f2ef964bcc0d03334367aa6
+  data.tar.gz: b716700cfe79c466b05edf9f47b56ca6706089e09b613d24f8c29cd03d49b20aa1434c0a93e02982c48d902f6ae9e9562b5663b938ca4b69ef197bd05567b9c9

data/lib/rggen.rb

@@ -49,6 +49,8 @@ module RgGen
   require_relative 'rggen/builder/category'
   require_relative 'rggen/builder/builder'
 
+  require_relative 'rggen/options'
+  require_relative 'rggen/option_switches'
   require_relative 'rggen/generator'
 
   require_relative 'rggen/commands'

data/lib/rggen/base/item.rb

@@ -13,10 +13,10 @@ module RgGen
           define_method(:available?, &body)
         end
 
-        def inherit_class_instance_variable(variable_name, klass, &block)
+        def inherit_class_instance_variable(variable_name, klass)
           return unless klass.instance_variable_defined?(variable_name)
           v = klass.instance_variable_get(variable_name)
-          v = block.call(v) if block_given?
+          v = yield(v) if block_given?
           instance_variable_set(variable_name, v)
         end
       end

data/lib/rggen/base/item_factory.rb

@@ -8,12 +8,11 @@ module RgGen
 
       private
 
-      def create_item(owner, *args, &block)
+      def create_item(owner, *args)
         item  = create_item_object(owner, *args)
-        if item.available?
-          block.call(item) if block_given?
-          owner.add_item(item)
-        end
+        return unless item.available?
+        yield item if block_given?
+        owner.add_item(item)
       end
 
       def create_item_object(owner, *args)

data/lib/rggen/builder/builder.rb

@@ -10,10 +10,10 @@ module RgGen
 
       def initialize
         @stores = Hash.new do |_, component_name|
-          fail RgGen::BuilderError, "unknown component: #{component_name}"
+          raise RgGen::BuilderError, "unknown component: #{component_name}"
         end
         @categories = Hash.new do |_, category_name|
-          fail RgGen::BuilderError, "unknown category: #{category_name}"
+          raise RgGen::BuilderError, "unknown category: #{category_name}"
         end
         INITIAL_CATEGORIES.each do |category_name|
           @categories[category_name]  = Category.new

data/lib/rggen/builder/item_store.rb

@@ -32,7 +32,7 @@ module RgGen
           enable_list_item(args[0], args[1])
         else
           message = "wrong number of arguments (#{args.size} for 1..2)"
-          fail ArgumentError, message
+          raise ArgumentError, message
         end
       end
 
@@ -65,7 +65,7 @@ module RgGen
       def define_list_item_class(list_name, item_name, context, body)
         unless @list_item_entries.key?(list_name)
           message = "undefined list item entry: #{list_name}"
-          fail RgGen::BuilderError, message
+          raise RgGen::BuilderError, message
         end
         entry = @list_item_entries[list_name]
         entry.define_list_item(item_name, context, &body)
@@ -76,7 +76,7 @@ module RgGen
           next if @enabled_entries.include?(entry_name)
           next unless @simple_item_entries.key?(entry_name) ||
                       @list_item_entries.key?(entry_name)
-          @enabled_entries  << entry_name
+          @enabled_entries << entry_name
         end
       end
 

data/lib/rggen/builder/list_item_entry.rb

@@ -36,7 +36,7 @@ module RgGen
         klass = Class.new(item_base)
         unless context.nil?
           if item_base.private_method_defined?(:shared_context)
-            fail BuilderError, 'base class already has #shared_context'
+            raise BuilderError, 'base class already has #shared_context'
           end
           set_context(klass, context)
         end
@@ -48,7 +48,7 @@ module RgGen
         Array(item_or_items).each do |item|
           next unless @items.key?(item)
           next if @enabled_items.include?(item)
-          @enabled_items  << item
+          @enabled_items << item
         end
       end
 

data/lib/rggen/builtins/bit_field/type.rb

@@ -158,7 +158,7 @@ list_item :bit_field, :type do
 
       def convert(cell)
         @target_items.keys.find(proc { cell }) do |type|
-          type.to_sym.casecmp(cell.to_sym) == 0
+          type.to_sym.casecmp(cell.to_sym).zero?
         end
       end
     end

data/lib/rggen/builtins/loaders/register_map/csv_loader.rb

@@ -9,6 +9,6 @@ loader :register_map, [:csv, :tsv] do
   end
 
   def separator(file)
-    (File.ext(file) == 'csv') ? ',' : "\t"
+    { 'csv' => ',', 'tsv' => "\t" }[File.ext(file).downcase]
   end
 end

data/lib/rggen/builtins/register/offset_address.rb

@@ -36,7 +36,7 @@ simple_item :register, :offset_address do
 
     def check_start_end_adderss_relation(cell)
       return if start_address < end_address
-      return if [configuration.byte_width, byte_size].all? { |v| v == 1}
+      return if [configuration.byte_width, byte_size].all? { |v| v == 1 }
       error "start address is equal to or greater than end address: #{cell}"
     end
 

data/lib/rggen/builtins/register/rtl_top.rb

@@ -27,7 +27,7 @@ simple_item :register, :rtl_top do
 
     def loop_variables
       return nil unless array?
-      dimensions.size.times.map(&method(:loop_variable))
+      Array.new(dimensions.size, &method(:loop_variable))
     end
 
     def loop_variable(level)

data/lib/rggen/builtins/register/type.rb

@@ -142,7 +142,7 @@ list_item :register, :type do
     factory do
       define_struct :cell_value, [:type, :options] do
         def empty?
-          self.type.nil?
+          type.nil?
         end
       end
 
@@ -229,7 +229,7 @@ list_item :register, :type do
 
       def valid_bits_value
         actual_bit_fields.inject(0) do |bits, bit_field|
-          bits |= (((1 << bit_field.width) - 1) << bit_field.lsb)
+          bits | (((1 << bit_field.width) - 1) << bit_field.lsb)
         end
       end
     end

data/lib/rggen/builtins/register/types/indirect.rb

@@ -55,9 +55,7 @@ list_item :register, :type, :indirect do
         :check_using_non_existing_index,
         :check_using_own_bit_field_for_index,
         :check_using_arrayed_bit_field_for_index
-      ].each do |checker|
-        send(checker, entry)
-      end
+      ].each { |checker| send(checker, entry) }
     end
 
     def check_using_same_index_more_than_once(entry)
@@ -82,7 +80,7 @@ list_item :register, :type, :indirect do
 
     def check_number_of_array_indexes
       return if array_indexes.size == size_of_dimensions
-      error "not match size of array dimensions and number of array indexes"
+      error 'not match size of array dimensions and number of array indexes'
     end
 
     def check_array_index_values
@@ -94,7 +92,7 @@ list_item :register, :type, :indirect do
     end
 
     def check_fixed_value_index_values
-      fixed_value_indexes.each_with_index do |entry, i|
+      fixed_value_indexes.each do |entry|
         next if entry.value <= max_value(entry.name)
         error "index value(#{entry.value}) is greater thatn " \
               "maximum value of #{entry.name}(#{max_value(entry.name)})"
@@ -114,7 +112,7 @@ list_item :register, :type, :indirect do
     end
 
     def fixed_value_indexes
-      indexes.select { |entry| entry.value }
+      indexes.select(&:value)
     end
 
     def size_of_dimensions

data/lib/rggen/builtins/register_block/host_if.rb

@@ -30,7 +30,7 @@ list_item :register_block, :host_if do
 
       def find_host_if(value, &ifnone)
         shared_context.enabled_host_ifs.find(ifnone) do |host_if|
-          host_if.to_sym.casecmp(value.to_sym) == 0
+          host_if.to_sym.casecmp(value.to_sym).zero?
         end
       end
     end

data/lib/rggen/builtins/register_block/irq_controller.rb

@@ -1,6 +1,6 @@
 simple_item :register_block, :irq_controller do
   rtl do
-    available? { total_interrupts > 0 }
+    available? { register_block.source.bit_fields.any?(&:irq?) }
 
     build do
       output :register_block, :irq, width: 1               , name: 'o_irq'
@@ -14,11 +14,6 @@ simple_item :register_block, :irq_controller do
       code << process_template
     end
 
-    def total_interrupts
-      @total_interrupts ||=
-        register_block.source.bit_fields.count(&:irq?)
-    end
-
     def assign_ier
       assign(ier, concat(ier_fields.map(&:value)))
     end
@@ -28,11 +23,11 @@ simple_item :register_block, :irq_controller do
     end
 
     def isr_fields
-      register_block.bit_fields.select(&:irq?)
+      @isr_fields ||= register_block.bit_fields.select(&:irq?)
     end
 
     def ier_fields
-      isr_fields.each_with_object([]) do |isr_field, fields|
+      @ier_fields ||= isr_fields.each_with_object([]) do |isr_field, fields|
         fields << find_ier_field(isr_field.reference)
       end
     end
@@ -40,5 +35,9 @@ simple_item :register_block, :irq_controller do
     def find_ier_field(reference)
       register_block.bit_fields.find_by(name: reference.name)
     end
+
+    def total_interrupts
+      @total_interrupts ||= isr_fields.sum(0, &:width)
+    end
   end
 end

data/lib/rggen/core_components/c_utility/data_structure_definition.rb

@@ -3,10 +3,10 @@ module RgGen
     class DataStructureDefinition
       include CodeUtility
 
-      def initialize(type_keyword, type_name, &body)
+      def initialize(type_keyword, type_name)
         @type_keyword = type_keyword
         @type_name    = type_name
-        body.call(self) if block_given?
+        yield(self) if block_given?
       end
 
       attr_setter :members
@@ -34,9 +34,7 @@ module RgGen
 
       def body_code(code)
         indent(code, 2) do
-          @members.each do |member, i|
-            code << member << semicolon << nl
-          end
+          @members.each { |member| code << member << semicolon << nl }
         end
       end
 

data/lib/rggen/core_components/code_utility.rb

@@ -28,24 +28,24 @@ module RgGen
       "\"#{expression}\""
     end
 
-    def code_block(indent_size = 0, &block)
+    def code_block(indent_size = 0)
       CodeBlock.new.tap do |code|
         code.indent = indent_size
-        block.call(code) if block_given?
+        yield(code) if block_given?
       end
     end
 
-    def indent(code_block, indent_size, &indent_block)
+    def indent(code_block, indent_size)
       code_block << nl unless code_block.last_line_empty?
       code_block.indent += indent_size
-      indent_block.call if block_given?
+      yield if block_given?
       code_block << nl unless code_block.last_line_empty?
       code_block.indent -= indent_size
     end
 
-    def wrap(code_block, head, tail, &block)
+    def wrap(code_block, head, tail)
       code_block << head
-      block.call if block_given?
+      yield if block_given?
       code_block << tail
     end
 

data/lib/rggen/core_components/code_utility/code_block.rb

@@ -47,7 +47,7 @@ module RgGen
       def merge_code_block(other_block)
         other_block.lines.each_with_index do |line, i|
           line.indent += @indent
-          if i == 0
+          if i.zero?
             @lines.last.indent  = line.indent if last_line_empty?
             @lines.last.words.concat(line.words)
           else

data/lib/rggen/core_components/code_utility/source_file.rb

@@ -10,9 +10,9 @@ module RgGen
         attr_setter :include_keyword
       end
 
-      def initialize(path, &body)
+      def initialize(path)
         @path = path
-        body.call(self) if block_given?
+        yield(self) if block_given?
       end
 
       attr_reader :path
@@ -62,7 +62,7 @@ module RgGen
       end
 
       def default_guard_macro(prefix, suffix)
-       "#{prefix}#{path.basename.to_s.upcase.gsub(/\W/, '_')}#{suffix}"
+        "#{prefix}#{path.basename.to_s.upcase.gsub(/\W/, '_')}#{suffix}"
       end
 
       def include_guard_header
@@ -73,7 +73,7 @@ module RgGen
       end
 
       def include_guard_footer
-        @guard_macro && lambda { |c| c << self.class.endif_keyword << nl }
+        @guard_macro && ->(c) { c << self.class.endif_keyword << nl }
       end
 
       def include_files_block

data/lib/rggen/core_components/configuration/configuration_factory.rb

@@ -15,7 +15,7 @@ module RgGen
           data.symbolize_keys!
         else
           message = "Hash type required for configuration: #{data.class}"
-          fail RgGen::LoadError, message
+          raise RgGen::LoadError, message
         end
       end
     end

data/lib/rggen/core_components/configuration/raise_error.rb

@@ -4,7 +4,7 @@ module RgGen
       private
 
       def error(message = nil)
-        fail RgGen::ConfigurationError, message
+        raise RgGen::ConfigurationError, message
       end
     end
   end

data/lib/rggen/core_components/register_map/loader.rb

@@ -3,10 +3,8 @@ module RgGen
     class Loader < InputBase::Loader
       private
 
-      def create_map(file, &block)
-        map = GenericMap.new(file)
-        block.call(map) if block_given?
-        map
+      def create_map(file)
+        GenericMap.new(file).tap { |m| yield(m) if block_given? }
       end
     end
   end

data/lib/rggen/core_components/register_map/raise_error.rb

@@ -10,7 +10,7 @@ module RgGen
           when GenericMap::Cell then cell_or_position.position
           else @position
           end
-        fail RgGen::RegisterMapError.new(message, error_position)
+        raise RgGen::RegisterMapError.new(message, error_position)
       end
     end
   end

data/lib/rggen/core_components/register_map/register_map_factory.rb

@@ -9,12 +9,9 @@ module RgGen
 
       def load(file)
         map = load_file(file)
-        if map.is_a?(GenericMap)
-          map
-        else
-          message = "GenericMap type required for register map: #{map.class}"
-          fail RgGen::LoadError, message
-        end
+        return map if map.is_a?(GenericMap)
+        message = "GenericMap type required for register map: #{map.class}"
+        raise RgGen::LoadError, message
       end
     end
   end

data/lib/rggen/core_components/verilog_utility/structure_definition.rb

@@ -3,9 +3,9 @@ module RgGen
     class StructureDefinition
       include CodeUtility
 
-      def initialize(name, &body)
+      def initialize(name)
         @name = name
-        body.call(self) if block_given?
+        yield(self) if block_given?
       end
 
       def body(&block)
@@ -43,7 +43,7 @@ module RgGen
       end
 
       def body_code?
-        @bodies && @bodies.size > 0
+        !(@bodies.nil? || @bodies.empty?)
       end
     end
   end

data/lib/rggen/generator.rb

@@ -1,139 +1,6 @@
 module RgGen
   class Generator
-    Context = Struct.new(:options, :configuration, :register_map) do
-      def initialize
-        super
-        self.options  = {}
-      end
-    end
-
-    class Option
-      def initialize(kind)
-        @kind = kind
-      end
-
-      attr_accessor :short
-      attr_accessor :long
-      attr_accessor :class
-      attr_writer   :default
-      attr_writer   :description
-      attr_writer   :body
-
-      def on(parser, options)
-        options[@kind]  = default_value if default_value
-        parser.on(*args) do |value|
-          parser.instance_exec(value, options, @kind, &body)
-        end
-      end
-
-      def args
-        [@short, @long, @class, description].compact
-      end
-
-      def description
-        return nil unless @description || default_value
-        d = ''
-        d << @description.to_s
-        d << "(default: #{default_value})" if default_value
-        d
-      end
-
-      def body
-        @body || default_body
-      end
-
-      def default_body
-        proc do |value, options, kind|
-          options[kind] = value
-        end
-      end
-
-      def default_value
-        return unless @default
-        case @default
-        when Proc
-          @default.call
-        else
-          @default
-        end
-      end
-    end
-
-    class << self
-      def options
-        @options  ||= []
-      end
-
-      private
-
-      def add_option(kind, &body)
-        options << Option.new(kind)
-        body.call(options.last)
-      end
-    end
-
-    add_option :setup do |option|
-      option.long         = '--setup FILE'
-      option.default      = proc do
-        ENV['RGGEN_DEFAULT_SETUP_FILE'] ||
-        File.join(RGGEN_HOME, 'setup', 'default.rb')
-      end
-      option.description  = 'Specify a setup file to set up RgGen tool'
-    end
-
-    add_option :configuration do |option|
-      option.short        = '-c'
-      option.long         = '--configuration FILE'
-      option.default      = proc { ENV['RGGEN_DEFAULT_CONFIGURATION_FILE'] }
-      option.description  = 'Specify a configuration file ' \
-                            'for generated source code'
-    end
-
-    add_option :output do |option|
-      option.short        = '-o'
-      option.long         = '--output DIR'
-      option.default      = '.'
-      option.description  = 'Specify output directory'
-    end
-
-    add_option :except do |option|
-      option.long         = '--except [TYPE1,TYPE2,...]'
-      option.class        = Array
-      option.description  = 'Disable the given output file type(s)'
-      option.body         = proc do |value, options, kind|
-        options[kind] ||= []
-        options[kind].concat(value.map(&:to_sym))
-      end
-    end
-
-    add_option :show_home do |option|
-      option.long         = '--show-home'
-      option.description  = 'Display the path of RgGen tool home directory'
-      option.body         = proc do
-        puts RGGEN_HOME
-        exit
-      end
-    end
-
-    add_option :version do |option|
-      option.short        = '-v'
-      option.long         = '--version'
-      option.description  = 'Display the version'
-      option.body         = proc do
-        puts ver
-        exit
-      end
-    end
-
-    add_option :help do |option|
-      option.short        = '-h'
-      option.long         = '--help'
-      option.description  = 'Display this message'
-      option.body         = proc do
-        puts help
-        exit
-      end
-    end
+    Context = Struct.new(:options, :configuration, :register_map)
 
     def run(argv)
       Context.new.tap do |context|
@@ -150,22 +17,7 @@ module RgGen
     private
 
     def parse_options(argv, context)
-      option_parser(context.options).parse!(argv)
-    end
-
-    def option_parser(options)
-      OptionParser.new do |parser|
-        parser.version      = RgGen::VERSION
-        parser.program_name = 'rggen'
-        parser.banner       = 'Usage: rggen [options] REGISTER_MAP'
-        add_option_switches(parser, options)
-      end
-    end
-
-    def add_option_switches(parser, options)
-      self.class.options.each do |option|
-        option.on(parser, options)
-      end
+      context.options = Options.parse(argv)
     end
 
     def load_setup(context)
@@ -195,7 +47,7 @@ module RgGen
     def write_files(context)
       file_generators(context).each do |generator|
         generator.write_file(context.options[:output])
-      end
+      end unless context.options[:load_only]
     end
 
     def file_generators(context)
@@ -207,9 +59,8 @@ module RgGen
     end
 
     def available_output_components(context)
-      except  = context.options[:except]
-      RgGen.builder.stored_output_components.select do |component|
-        except.nil? || except.exclude?(component)
+      RgGen.builder.stored_output_components.reject do |component|
+        context.options[:disable].include?(component)
       end
     end
   end

data/lib/rggen/input_base/loader.rb

@@ -6,7 +6,7 @@ module RgGen
 
         def acceptable?(file)
           ext = File.ext(file).to_sym
-          @supported_types.any? { |type| type.casecmp(ext) == 0 }
+          @supported_types.any? { |type| type.casecmp(ext).zero? }
         end
 
         def load(file)

data/lib/rggen/option_switches.rb

@@ -0,0 +1,60 @@
+module RgGen
+  Options.add_option_switch :setup do
+    long        '--setup FILE'
+    description 'Specify a setup file to set up RgGen tool'
+    default { ENV['RGGEN_DEFAULT_SETUP_FILE'] || default_setup }
+
+    def default_setup
+      File.join(RgGen::RGGEN_HOME, 'setup', 'default.rb')
+    end
+  end
+
+  Options.add_option_switch :configuration do
+    short       '-c'
+    long        '--configuration FILE'
+    description 'Specify a configuration file for generated source code'
+    default { ENV['RGGEN_DEFAULT_CONFIGURATION_FILE'] }
+  end
+
+  Options.add_option_switch :output do
+    short       '-o'
+    long        '--output DIR'
+    description 'Specify output directory'
+    default     '.'
+  end
+
+  Options.add_option_switch :load_only do
+    long          '--load-only'
+    option_class  TrueClass
+    description   'Load input files only if specified'
+    default       false
+  end
+
+  Options.add_option_switch :disable do
+    long          '--disable TYPE1[,TYPE2,...]'
+    option_class  Array
+    description   'Disable the given output file type(s)'
+    default { [] }
+    body { |v, o, k| o[k].concat(v.map(&:to_sym)) }
+  end
+
+  Options.add_option_switch :show_home do
+    long        '--show-home'
+    description 'Display the path of RgGen tool home directory'
+    body { puts RgGen::RGGEN_HOME; exit }
+  end
+
+  Options.add_option_switch :version do
+    short       '-v'
+    long        '--version'
+    description 'Display the version'
+    body { puts ver; exit }
+  end
+
+  Options.add_option_switch :help do
+    short       '-h'
+    long        '--help'
+    description 'Display this message'
+    body  { puts help; exit }
+  end
+end

data/lib/rggen/options.rb

@@ -0,0 +1,97 @@
+module RgGen
+  class Options
+    extend Forwardable
+
+    class OptionSwitch
+      def initialize(kind)
+        @kind = kind
+      end
+
+      def on(parser, options)
+        parser.on(*args) do |value|
+          parser.instance_exec(value, options, @kind, &body)
+        end
+      end
+
+      attr_setter :short
+      attr_setter :long
+      attr_setter :option_class
+
+      def default(value = nil, &block)
+        if block_given?
+          @default  = block
+        elsif value
+          @default  = proc { value }
+        else
+          @default && @default.call
+        end
+      end
+
+      def description(value = nil)
+        if value
+          @description  = value
+        elsif @description || @default
+          ''.tap do |d|
+            d << @description if @description
+            d << "(default: #{default})" if default
+          end
+        end
+      end
+
+      def body(&block)
+        if block_given?
+          @body = block
+        else
+          @body || proc { |v, o, k| o[k] = v }
+        end
+      end
+
+      private
+
+      def args
+        [@short, @long, @option_class, description].compact
+      end
+    end
+
+    class << self
+      def parse(args)
+        new.tap { |options| options.parse(args) }
+      end
+
+      def option_switches
+        @option_switches ||= {}
+      end
+
+      def add_option_switch(kind, &block)
+        option_switches[kind] = OptionSwitch.new(kind)
+        option_switches[kind].instance_exec(&block)
+      end
+    end
+
+    def_class_delegator :option_switches
+    def_delegator :@options, :[]
+
+    def initialize
+      @options  = Hash.new { |h, k| h[k]  = option_switches[k].default }
+    end
+
+    def parse(args)
+      option_parser.parse!(args)
+    end
+
+    private
+
+    def option_parser
+      OptionParser.new do |parser|
+        parser.version      = RgGen::VERSION
+        parser.program_name = 'rggen'
+        parser.banner       = 'Usage: rggen [options] REGISTER_MAP'
+        define_option_switches(parser)
+      end
+    end
+
+    def define_option_switches(parser)
+      option_switches.each_value { |switch| switch.on(parser, @options) }
+    end
+  end
+end

data/lib/rggen/output_base/component.rb

@@ -49,7 +49,7 @@ module RgGen
 
       def generate_child_code(kind, mode, code)
         children.inject(code) do |c, child|
-          child.generate_code(kind, mode, code)
+          child.generate_code(kind, mode, c)
         end
       end
 
@@ -58,14 +58,16 @@ module RgGen
       end
 
       def main_code_generator(mode)
-        return [
-          method(:generate_item_code ).curry[:generate_code],
-          method(:generate_child_code)
-        ] if mode == :top_down
-        return [
-          method(:generate_child_code),
-          method(:generate_item_code ).curry[:generate_code]
-        ] if mode == :bottom_up
+        {
+          top_down: [
+            method(:generate_item_code ).curry[:generate_code],
+            method(:generate_child_code)
+          ],
+          bottom_up: [
+            method(:generate_child_code),
+            method(:generate_item_code ).curry[:generate_code]
+          ]
+        }[mode]
       end
 
       def post_code_generator

data/lib/rggen/version.rb

@@ -1,6 +1,6 @@
 module RgGen
   MAJOR   = 0
   MINOR   = 6
-  TEENY   = 2
+  TEENY   = 3
   VERSION = "#{MAJOR}.#{MINOR}.#{TEENY}".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: baby_erubis
@@ -109,8 +109,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.35'
 description: |2
-      RgGen is a code generation tool for SoC designers.
-      It will automatically generate source code for control registers in a SoC design, e.g. RTL, UVM RAL model, C header file, from its register map document.
+      RgGen is a code generator tool for SoC/IP/FPGA/RTL engineers.
+      It will automatically generate source code for control/status registers, e.g. RTL, UVM RAL model, C header file, from its register map document.
       Also RgGen is customizable so you can build your specific generate tool.
 email:
 - taichi730@gmail.com
@@ -266,6 +266,8 @@ files:
 - lib/rggen/input_base/item_factory.rb
 - lib/rggen/input_base/loader.rb
 - lib/rggen/input_base/regexp_patterns.rb
+- lib/rggen/option_switches.rb
+- lib/rggen/options.rb
 - lib/rggen/output_base/code_generator.rb
 - lib/rggen/output_base/component.rb
 - lib/rggen/output_base/component_factory.rb