rggen-core 0.16.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0510741051f873be7dc827047f0de66a99c8597f012c4115b856b5c33080a55d
-  data.tar.gz: 6acbc096d450278f19c03e4fad095d1a181fa8ae3dbe11e1fcd7e8bde0f11e16
+  metadata.gz: 135125b25bc30e8eb74fa97644c356afd817cda2a84a810a401efbcde7d2a647
+  data.tar.gz: c4cb605aaa49801ff0f70458148f1349a220de2c41b6f7ed614e98466e425668
 SHA512:
-  metadata.gz: caf9bacb6b71be870d48a03afc67ff9f35516289e331b4cc8231ee1ed94f9bb3444001b496f9a508de5c2e9700bbaa99cb9e9ab05e9628f6a73902d3d7d9d46b
-  data.tar.gz: e1863ab6134225fc653bb9dcf88dde4ae5e307f0d73ce88c1ab87669c26452a57f3852ee29c8821c42f79d83ca279047011eb5fef6d58c516699260ae4d837d2
+  metadata.gz: 122340fafae09f08a604c54b3f21e8428a0d03af5ef81b37f4211f881a99186c2f0a45e50cad9367406a75f784041eabc0ef87ebf692946a2dfbec5221135e8f
+  data.tar.gz: fb87835adc54ec4416f5811126ff65355ada76e05cc46d89eedbe87e2899fd16665d26caf66e41a9919a074824f51ef97fd6dee9abc2aa959b42d83b9c4dd35c

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2019 Taichi Ishitani
+Copyright (c) 2017-2020 Taichi Ishitani
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/rggen-core.svg)](https://badge.fury.io/rb/rggen-core)
-[![Build Status](https://travis-ci.com/rggen/rggen-core.svg?branch=master)](https://travis-ci.com/rggen/rggen-core)
+[![CI](https://github.com/rggen/rggen-core/workflows/CI/badge.svg)](https://github.com/rggen/rggen-core/actions?query=workflow%3ACI)
 [![Maintainability](https://api.codeclimate.com/v1/badges/53c8e6654c2b5ecb9142/maintainability)](https://codeclimate.com/github/rggen/rggen-core/maintainability)
 [![codecov](https://codecov.io/gh/rggen/rggen-core/branch/master/graph/badge.svg)](https://codecov.io/gh/rggen/rggen-core)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=rggen_rggen-core&metric=alert_status)](https://sonarcloud.io/dashboard?id=rggen_rggen-core)
@@ -43,7 +43,7 @@ Feedbacks, bug reports, questions and etc. are wellcome! You can post them by us
 
 ## Copyright & License
 
-Copyright © 2017-2019 Taichi Ishitani. RgGen::Core is licensed under the [MIT License](https://opensource.org/licenses/MIT), see [LICENSE](LICENSE) for futher details.
+Copyright © 2017-2020 Taichi Ishitani. RgGen::Core is licensed under the [MIT License](https://opensource.org/licenses/MIT), see [LICENSE](LICENSE) for futher details.
 
 ## Code of Conduct
 

data/lib/rggen/core.rb

@@ -13,7 +13,6 @@ require 'yaml'
 require_relative 'core/version'
 
 require_relative 'core/facets'
-require_relative 'core/core_extensions/casecmp'
 require_relative 'core/core_extensions/object'
 
 require_relative 'core/utility/attribute_setter'
@@ -32,13 +31,14 @@ 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'
+require_relative 'core/input_base/input_value_extractor'
 require_relative 'core/input_base/loader'
 require_relative 'core/input_base/json_loader'
 require_relative 'core/input_base/yaml_loader'
@@ -50,6 +50,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'
@@ -87,12 +88,13 @@ require_relative 'core/output_base/feature_factory'
 
 require_relative 'core/builder/component_entry'
 require_relative 'core/builder/component_registry'
+require_relative 'core/builder/loader_registry'
 require_relative 'core/builder/input_component_registry'
 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,26 +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