rggen-core 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07b141658bda7d5c43afba30ecbff539ab05beb383844f5a5b8fc9d9b605ebb5
-  data.tar.gz: faac4148e8c6c2e1bfa2632e1e1a589139db03280e3d25af8d39a1172708950e
+  metadata.gz: d9079e5f068e752e9f083fd64c97dda8cdc9f47f2e4ce3c6f1d0568f4950caa3
+  data.tar.gz: e60e14aa24f9f7b003391f0d87d773a35adbdf99c794016cdd803fc8025df8de
 SHA512:
-  metadata.gz: 4838ab9d430ae360da7d223db91171e4460221ecec07e8ed475053eec91ed3a6af1ac10f62350731fb9593e34d7c332f135e68d4d459290cc440b9c7b882065e
-  data.tar.gz: 696f4186513d88b855434a295182dea303b54c52b6a04c251bb8a8dd2910bbeb42147abd9dfe292e28e42c91e4aba4971901490895b3685d375a18c988dd9d70
+  metadata.gz: 7f2b3f56089899d459e62bd6873166a467eec667d559690ad26a17558a72b4e399744d156c9a092181067a1313c82615db12a63469e8b7d9145678adfed2c830
+  data.tar.gz: a5cf836ea12ba57a905d925f29406f76155ce3e389d4678f76adee6da8bec9f5964c3f973f2803019c4aa8756f7223abf1de958f2ceb6b6fd97024d663c02327

data/lib/rggen/core.rb

@@ -31,10 +31,10 @@ require_relative 'core/base/internal_struct'
 require_relative 'core/base/shared_context'
 require_relative 'core/base/component'
 require_relative 'core/base/component_factory'
+require_relative 'core/base/component_layer_extension'
 require_relative 'core/base/feature'
 require_relative 'core/base/feature_factory'
-require_relative 'core/base/hierarchical_accessors'
-require_relative 'core/base/hierarchical_feature_accessors'
+require_relative 'core/base/feature_layer_extension'
 
 require_relative 'core/input_base/input_value'
 require_relative 'core/input_base/input_data'
@@ -49,6 +49,7 @@ require_relative 'core/input_base/property'
 require_relative 'core/input_base/feature'
 require_relative 'core/input_base/feature_factory'
 
+require_relative 'core/configuration/input_data'
 require_relative 'core/configuration/error'
 require_relative 'core/configuration/component'
 require_relative 'core/configuration/component_factory'
@@ -91,7 +92,7 @@ require_relative 'core/builder/output_component_registry'
 require_relative 'core/builder/simple_feature_entry'
 require_relative 'core/builder/list_feature_entry'
 require_relative 'core/builder/feature_registry'
-require_relative 'core/builder/category'
+require_relative 'core/builder/layer'
 require_relative 'core/builder/plugins'
 require_relative 'core/builder/builder'
 require_relative 'core/builder'

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

@@ -4,28 +4,37 @@ module RgGen
   module Core
     module Base
       class Component
-        def initialize(base_name, *args)
+        def initialize(parent, base_name, layer, *args)
+          @parent = parent
           @base_name = base_name
-          @parent = args.first
+          @layer = layer
           @children = []
           @need_children = true
-          @level = (parent && parent.level + 1) || 0
           @features = {}
+          @depth = (parent&.depth || 0) + 1
           @component_index = parent&.children&.size || 0
           post_initialize(*args)
           block_given? && yield(self)
         end
 
         attr_reader :parent
+        attr_reader :layer
         attr_reader :children
-        attr_reader :level
+        attr_reader :depth
         attr_reader :component_index
 
-        def component_name
-          [hierarchy, @base_name].compact.join('@')
+        def ancestors
+          [].tap do |components|
+            component = self
+            while component
+              components.unshift(component)
+              component = component.parent
+            end
+          end
         end
 
-        def hierarchy
+        def component_name
+          [@layer, @base_name].compact.join('@')
         end
 
         alias_method :to_s, :component_name

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

@@ -4,15 +4,19 @@ module RgGen
   module Core
     module Base
       class ComponentFactory
-        def initialize(component_name)
+        def initialize(component_name, layer)
           @component_name = component_name
+          @layer = layer
           @root_factory = false
           block_given? && yield(self)
         end
 
+        attr_reader :component_name
+        attr_reader :layer
+
         attr_setter :target_component
+        attr_setter :component_factories
         attr_setter :feature_factories
-        attr_setter :child_factory
 
         def root_factory
           @root_factory = true
@@ -40,7 +44,7 @@ module RgGen
         def create_component(parent, sources, &block)
           actual_sources = Array(select_actual_sources(*sources))
           @target_component
-            .new(@component_name, parent, *actual_sources, &block)
+            .new(parent, component_name, layer, *actual_sources, &block)
         end
 
         def select_actual_sources(*sources)
@@ -54,8 +58,7 @@ module RgGen
         end
 
         def do_create_features(component, sources)
-          return unless create_features?
-          create_features(component, *sources)
+          create_features? && create_features(component, *sources)
         end
 
         def create_features?
@@ -63,12 +66,11 @@ module RgGen
         end
 
         def do_create_children(component, sources)
-          return unless create_children?(component)
-          create_children(component, *sources)
+          create_children?(component) && create_children(component, *sources)
         end
 
         def create_children?(component)
-          @child_factory && component.need_children?
+          @component_factories && component.need_children?
         end
 
         def preprocess(args)
@@ -86,7 +88,8 @@ module RgGen
         end
 
         def create_child(component, *args)
-          @child_factory.create(component, *args)
+          factory = find_child_factory(*args)
+          factory.create(component, *args)
         end
       end
     end

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

@@ -0,0 +1,194 @@
+# frozen_string_literal: true
+
+module RgGen
+  module Core
+    module Base
+      module ComponentLayerExtension
+        private
+
+        module Common
+          def root?
+            layer == :root
+          end
+
+          def register_block?
+            layer == :register_block
+          end
+
+          def register_file?
+            layer == :register_file
+          end
+
+          def register?
+            layer == :register
+          end
+
+          def bit_field?
+            layer == :bit_field
+          end
+        end
+
+        module Root
+          include Common
+
+          def register_blocks
+            children
+          end
+
+          def register_files
+            register_blocks.flat_map(&:register_files)
+          end
+
+          def registers
+            register_blocks.flat_map(&:registers)
+          end
+
+          def bit_fields
+            register_blocks.flat_map(&:bit_fields)
+          end
+        end
+
+        module RegisterBlock
+          include Common
+
+          def root
+            parent
+          end
+
+          def files_and_registers
+            children
+          end
+
+          def register_files(include_lower_layer = true)
+            files_and_registers
+              .select(&:register_file?)
+              .flat_map { |rf| [rf, *(include_lower_layer ? rf : nil)&.register_files] }
+          end
+
+          def registers(include_lower_layer = true)
+            files_and_registers.flat_map do |file_or_register|
+              if file_or_register.register?
+                file_or_register
+              else
+                [*(include_lower_layer ? file_or_register : nil)&.registers]
+              end
+            end
+          end
+
+          def bit_fields
+            registers.flat_map(&:bit_fields)
+          end
+        end
+
+        module RegisterFile
+          include Common
+
+          def root
+            register_block.root
+          end
+
+          def block_or_file
+            parent
+          end
+
+          def register_block
+            parent.register_block? && parent || parent.register_block
+          end
+
+          def register_file
+            parent.register_file? && parent || nil
+          end
+
+          def files_and_registers
+            children
+          end
+
+          def register_files(include_lower_layer = true)
+            files_and_registers
+              .select(&:register_file?)
+              .flat_map { |rf| [rf, *(include_lower_layer ? rf : nil)&.register_files] }
+          end
+
+          def registers(include_lower_layer = true)
+            files_and_registers.flat_map do |file_or_register|
+              if file_or_register.register?
+                file_or_register
+              else
+                [*(include_lower_layer ? file_or_register : nil)&.registers]
+              end
+            end
+          end
+
+          def bit_fields
+            registers.flat_map(&:bit_fields)
+          end
+        end
+
+        module Register
+          include Common
+
+          def root
+            parent.root
+          end
+
+          def register_block
+            parent.register_block? && parent || parent.register_block
+          end
+
+          def register_file
+            parent.register_file? && parent || nil
+          end
+
+          def register_files
+            ancestors.select(&:register_file?)
+          end
+
+          def block_or_file
+            parent
+          end
+
+          def bit_fields
+            children
+          end
+        end
+
+        module BitField
+          include Common
+
+          def root
+            parent.root
+          end
+
+          def register_block
+            parent.register_block
+          end
+
+          def register_file
+            parent.register_file
+          end
+
+          def register_files
+            parent.register_files
+          end
+
+          def register
+            parent
+          end
+        end
+
+        ACCESSOR_EXTENSIONS = {
+          root: Root,
+          register_block: RegisterBlock,
+          register_file: RegisterFile,
+          register: Register,
+          bit_field: BitField
+        }.freeze
+
+        def define_layer_methods
+          ACCESSOR_EXTENSIONS.key?(layer) &&
+            (extend ACCESSOR_EXTENSIONS[layer])
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,158 @@
+# frozen_string_literal: true
+
+module RgGen
+  module Core
+    module Base
+      module FeatureLayerExtension
+        private
+
+        module Common
+          def root?
+            @component.root?
+          end
+
+          def register_block?
+            @component.register_block?
+          end
+
+          def register_file?
+            @component.register_file?
+          end
+
+          def register?
+            @component.register?
+          end
+
+          def bit_field?
+            @component.bit_field?
+          end
+        end
+
+        module Root
+          include Common
+
+          def root
+            @component
+          end
+        end
+
+        module RegisterBlock
+          include Common
+
+          def root
+            register_block.root
+          end
+
+          def register_block
+            @component
+          end
+
+          def register_blocks
+            root.register_blocks
+          end
+        end
+
+        module RegisterFile
+          include Common
+
+          def root
+            register_file.root
+          end
+
+          def register_block
+            register_file.register_block
+          end
+
+          def block_or_file
+            register_file.block_or_file
+          end
+
+          def register_file(layer = nil)
+            layer == :upper ? @component.register_file : @component
+          end
+
+          def files_and_registers
+            block_or_file.files_and_registers
+          end
+        end
+
+        module Register
+          include Common
+
+          def root
+            register.root
+          end
+
+          def register_block
+            register.register_block
+          end
+
+          def register_file
+            register.register_file
+          end
+
+          def register_files
+            register.register_files
+          end
+
+          def block_or_file
+            register.block_or_file
+          end
+
+          def register
+            @component
+          end
+
+          def files_and_registers
+            block_or_file.files_and_registers
+          end
+        end
+
+        module BitField
+          include Common
+
+          def root
+            bit_field.root
+          end
+
+          def register_block
+            bit_field.register_block
+          end
+
+          def register_file
+            bit_field.register_file
+          end
+
+          def register_files
+            bit_field.register_files
+          end
+
+          def register
+            bit_field.register
+          end
+
+          def bit_field
+            @component
+          end
+
+          def bit_fields
+            register.bit_fields
+          end
+        end
+
+        ACCESSOR_EXTENSIONS = {
+          root: Root,
+          register_block: RegisterBlock,
+          register_file: RegisterFile,
+          register: Register,
+          bit_field: BitField
+        }.freeze
+
+        def define_layer_methods
+          ACCESSOR_EXTENSIONS.key?(component.layer) &&
+            (extend ACCESSOR_EXTENSIONS[component.layer])
+        end
+      end
+    end
+  end
+end