rggen-core 0.16.0 → 0.21.0

data/lib/rggen/core/register_map/input_data.rb

@@ -3,30 +3,44 @@
 module RgGen
   module Core
     module RegisterMap
-      class BitFieldData < InputBase::InputData
-      end
+      class InputData < InputBase::InputData
+        module Root
+          def register_block(value_list = nil, &block)
+            child(:register_block, value_list, &block)
+          end
+        end
 
-      class RegisterData < InputBase::InputData
-        alias_method :bit_field, :child
+        module RegisterBlockRegisterFile
+          def register_file(value_list = nil, &block)
+            child(:register_file, value_list, &block)
+          end
 
-        def child_data_class
-          BitFieldData
+          def register(value_list = nil, &block)
+            child(:register, value_list, &block)
+          end
         end
-      end
 
-      class RegisterBlockData < InputBase::InputData
-        alias_method :register, :child
+        module Register
+          def bit_field(value_list = nil, &block)
+            child(:bit_field, value_list, &block)
+          end
+        end
 
-        def child_data_class
-          RegisterData
+        module BitField
+          def self.extended(object)
+            object.singleton_exec { undef_method :child }
+          end
         end
-      end
 
-      class RegisterMapData < InputBase::InputData
-        alias_method :register_block, :child
+        LAYER_EXTENSIONS = {
+          root: Root, register_block: RegisterBlockRegisterFile,
+          register_file: RegisterBlockRegisterFile, register: Register,
+          bit_field: BitField
+        }.freeze
 
-        def child_data_class
-          RegisterBlockData
+        def initialize(layer, valid_value_list)
+          extend(LAYER_EXTENSIONS[layer])
+          super
         end
       end
     end

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

@@ -6,7 +6,7 @@ module RgGen
       class Loader < InputBase::Loader
         private
 
-        def register_map
+        def root
           input_data
         end
       end

data/lib/rggen/core/register_map/ruby_loader.rb

@@ -7,7 +7,7 @@ module RgGen
         support_types [:rb]
 
         def read_file(file)
-          register_map.load_file(file)
+          root.load_file(file)
         end
       end
     end

data/lib/rggen/core/utility/code_utility.rb

@@ -8,13 +8,15 @@ module RgGen
           code_block
         end
 
-        private
+        module_function
 
         def newline
           "\n"
         end
 
-        alias_method :nl, :newline
+        def nl
+          newline
+        end
 
         def comma
           ','
@@ -36,6 +38,10 @@ module RgGen
           "\"#{expression}\""
         end
 
+        def array_name(name, size)
+          [name, *size&.map { |s| "[#{s}]" }].join
+        end
+
         def code_block(indent = 0, &body)
           CodeBlock.new(indent, &body)
         end

data/lib/rggen/core/version.rb

@@ -3,7 +3,7 @@
 module RgGen
   module Core
     MAJOR = 0
-    MINOR = 16
+    MINOR = 21
     PATCH = 0
     VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen-core
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-01 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -81,21 +81,22 @@ files:
 - lib/rggen/core.rb
 - lib/rggen/core/base/component.rb
 - lib/rggen/core/base/component_factory.rb
+- lib/rggen/core/base/component_layer_extension.rb
 - lib/rggen/core/base/feature.rb
 - lib/rggen/core/base/feature_factory.rb
-- lib/rggen/core/base/hierarchical_accessors.rb
-- lib/rggen/core/base/hierarchical_feature_accessors.rb
+- lib/rggen/core/base/feature_layer_extension.rb
 - lib/rggen/core/base/internal_struct.rb
 - lib/rggen/core/base/proxy_call.rb
 - lib/rggen/core/base/shared_context.rb
 - lib/rggen/core/builder.rb
 - lib/rggen/core/builder/builder.rb
-- lib/rggen/core/builder/category.rb
 - lib/rggen/core/builder/component_entry.rb
 - lib/rggen/core/builder/component_registry.rb
 - lib/rggen/core/builder/feature_registry.rb
 - lib/rggen/core/builder/input_component_registry.rb
+- lib/rggen/core/builder/layer.rb
 - lib/rggen/core/builder/list_feature_entry.rb
+- lib/rggen/core/builder/loader_registry.rb
 - lib/rggen/core/builder/output_component_registry.rb
 - lib/rggen/core/builder/plugins.rb
 - lib/rggen/core/builder/simple_feature_entry.rb
@@ -107,11 +108,11 @@ files:
 - lib/rggen/core/configuration/feature.rb
 - lib/rggen/core/configuration/feature_factory.rb
 - lib/rggen/core/configuration/hash_loader.rb
+- lib/rggen/core/configuration/input_data.rb
 - lib/rggen/core/configuration/json_loader.rb
 - lib/rggen/core/configuration/loader.rb
 - lib/rggen/core/configuration/ruby_loader.rb
 - lib/rggen/core/configuration/yaml_loader.rb
-- lib/rggen/core/core_extensions/casecmp.rb
 - lib/rggen/core/core_extensions/object.rb
 - lib/rggen/core/dsl.rb
 - lib/rggen/core/exceptions.rb
@@ -124,6 +125,7 @@ files:
 - lib/rggen/core/input_base/input_data.rb
 - lib/rggen/core/input_base/input_matcher.rb
 - lib/rggen/core/input_base/input_value.rb
+- lib/rggen/core/input_base/input_value_extractor.rb
 - lib/rggen/core/input_base/json_loader.rb
 - lib/rggen/core/input_base/loader.rb
 - lib/rggen/core/input_base/property.rb
@@ -177,15 +179,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: rggen-core-0.16.0
+summary: rggen-core-0.21.0
 test_files: []

data/lib/rggen/core/base/hierarchical_accessors.rb

@@ -1,91 +0,0 @@
-# frozen_string_literal: true
-
-module RgGen
-  module Core
-    module Base
-      module HierarchicalAccessors
-        module RegisterMap
-          def hierarchy
-            :register_map
-          end
-
-          def register_blocks
-            children
-          end
-
-          def registers
-            register_blocks.flat_map(&:children)
-          end
-
-          def bit_fields
-            registers.flat_map(&:children)
-          end
-        end
-
-        module RegisterBlock
-          def hierarchy
-            :register_block
-          end
-
-          def register_map
-            parent
-          end
-
-          def registers
-            children
-          end
-
-          def bit_fields
-            registers.flat_map(&:children)
-          end
-        end
-
-        module Register
-          def hierarchy
-            :register
-          end
-
-          def register_map
-            register_block.parent
-          end
-
-          def register_block
-            parent
-          end
-
-          def bit_fields
-            children
-          end
-        end
-
-        module BitField
-          def hierarchy
-            :bit_field
-          end
-
-          def register_map
-            register_block.parent
-          end
-
-          def register_block
-            register.parent
-          end
-
-          def register
-            parent
-          end
-        end
-
-        private
-
-        ACCESSOR_EXTENSIONS = [
-          RegisterMap, RegisterBlock, Register, BitField
-        ].freeze
-
-        def define_hierarchical_accessors
-          extend ACCESSOR_EXTENSIONS[level]
-        end
-      end
-    end
-  end
-end

data/lib/rggen/core/base/hierarchical_feature_accessors.rb

@@ -1,83 +0,0 @@
-# frozen_string_literal: true
-
-module RgGen
-  module Core
-    module Base
-      module HierarchicalFeatureAccessors
-        module RegisterMap
-          def hierarchy
-            :register_map
-          end
-
-          def register_map
-            @component
-          end
-        end
-
-        module RegisterBlock
-          def hierarchy
-            :register_block
-          end
-
-          def register_map
-            register_block.parent
-          end
-
-          def register_block
-            @component
-          end
-        end
-
-        module Register
-          def hierarchy
-            :register
-          end
-
-          def register_map
-            register_block.parent
-          end
-
-          def register_block
-            register.parent
-          end
-
-          def register
-            @component
-          end
-        end
-
-        module BitField
-          def hierarchy
-            :bit_field
-          end
-
-          def register_map
-            register_block.parent
-          end
-
-          def register_block
-            register.parent
-          end
-
-          def register
-            bit_field.parent
-          end
-
-          def bit_field
-            @component
-          end
-        end
-
-        private
-
-        ACCESSOR_EXTENSIONS = [
-          RegisterMap, RegisterBlock, Register, BitField
-        ].freeze
-
-        def define_hierarchical_accessors
-          extend ACCESSOR_EXTENSIONS[@component.level]
-        end
-      end
-    end
-  end
-end

data/lib/rggen/core/core_extensions/casecmp.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-if RUBY_VERSION < '2.4'
-  casecmp = Module.new do
-    def casecmp?(other)
-      casecmp(other).zero?
-    end
-  end
-
-  String.send(:include, casecmp)
-  Symbol.send(:include, casecmp)
-end