rggen-c-header 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4150e4e77b8fee78e7832a812c4332ce5b56f016c1caa803c23dd2ee032fad55
-  data.tar.gz: 372b8614c051deee871ab887a24930c02d8d93cc97401aa937541f1d6b5fcde9
+  metadata.gz: 5dbb6ddb7c867f003e9ba685413ac4d3deb5ae9978ef5e59cca1919de9c51378
+  data.tar.gz: 34f5d2b0bec9eba0c63bec761ec8927214c118ddf70d3b9a4ae17ca6f9cd5c54
 SHA512:
-  metadata.gz: a01adcc5020ff80a58c547978cff3eadb24edacf9d96c861600fb9d5136f9a70190bf64a71205bea2c4270456e2134c1d3afbe73955a9c3c311459189c843e6d
-  data.tar.gz: ba3d13e5ac18902391b2797bfbda75c78846ca0c240c9fc750195beab84875d8f8a03ed300ed63eb5e839c4c4e8a14a357c90968454f3cfd0e63abf55860293a
+  metadata.gz: a862a0468553d95a8bd094ebf309f53d0745c23619109491b30b968d1bf0200df2bb5d014c632791e04bffc54db4d13ae9447496cbd5541ef44f8a8863475b02
+  data.tar.gz: 7e97c33f3efe07cc93cfb3d09447393b2ddb121de7751cc07a1c1b44fa2d465ac24a20ca96f671544adcac708952050519c1b0a8c6611f1ddea854468b8cd771

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 Taichi Ishitani
+Copyright (c) 2022-2023 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

@@ -41,7 +41,7 @@ Feedbacks, bus reports, questions and etc. are welcome! You can post them bu usi
 
 ## Copyright & License
 
-Copyright © 2022 Taichi Ishitani. RgGen::CHeader is licensed under the [MIT License](https://opensource.org/licenses/MIT), see [LICENSE](LICENSE) for futher details.
+Copyright © 2022-2023 Taichi Ishitani. RgGen::CHeader is licensed under the [MIT License](https://opensource.org/licenses/MIT), see [LICENSE](LICENSE) for futher details.
 
 ## Code of Conduct
 

data/lib/rggen/c_header/feature.rb

@@ -17,7 +17,7 @@ module RgGen
 
       def define_macro(name, value = nil)
         macro_definitions <<
-          Utility::MacroDefinition.new(name.upcase, value)
+          Core::Utility::CodeUtility::MacroDefinition.new(name.upcase, value)
       end
 
       def define_struct(name, members)

data/lib/rggen/c_header/register/c_header.rb

@@ -23,17 +23,21 @@ RgGen.define_simple_feature(:register, :c_header) do
     end
 
     def byte_size
-      array_size_upper_layer.inject(1, :*) * register.byte_size
+      register.byte_size(hierarchical: true)
     end
 
     def array?
-      register_files.any?(&:array?) || register.array?
+      register.array?(hierarchical: true)
     end
 
     def shared_address?
       register.settings[:support_shared_address]
     end
 
+    def array_size
+      register.array_size(hierarchical: true)
+    end
+
     def define_array_macros
       size_list = array_size
       define_macro("#{full_name}_array_dimension", size_list.size)
@@ -53,31 +57,12 @@ RgGen.define_simple_feature(:register, :c_header) do
     end
 
     def address_list
-      upper_address_list = register_file&.expanded_offset_addresses || [0]
-      upper_address_list.product(local_address_list).map(&:sum)
-    end
-
-    def local_address_list
-      Array.new(register.count) do |i|
-        if shared_address?
-          register.offset_address
-        else
-          register.offset_address + register.byte_width * i
-        end
-      end
+      register.expanded_offset_addresses
     end
 
     def array_suffix
       index_list = array_size.map { |size| size.times.to_a }
       index_list.first.product(*index_list[1..]).map { |index| index.join('_') }
     end
-
-    def array_size_upper_layer
-      register_files.flat_map(&:array_size).compact
-    end
-
-    def array_size
-      [*register_files, register].flat_map(&:array_size).compact
-    end
   end
 end

data/lib/rggen/c_header/register_block/c_header.rb

@@ -20,10 +20,8 @@ RgGen.define_simple_feature(:register_block, :c_header) do
     write_file '<%= register_block.name %>.h' do |f|
       f.include_guard
       f.include_file 'stdint.h'
+      f.macro_definitions register_block.macro_definitions
       f.body do |code|
-        register_block.macro_definitions.each do |macro|
-          code << macro << nl
-        end
         register_block.struct_definitions.each do |struct|
           code << struct
         end

data/lib/rggen/c_header/version.rb

@@ -2,6 +2,6 @@
 
 module RgGen
   module CHeader
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/lib/rggen/c_header.rb

@@ -3,7 +3,6 @@
 require_relative 'c_header/version'
 require_relative 'c_header/utility/declaration'
 require_relative 'c_header/utility/struct_definition'
-require_relative 'c_header/utility/macro_definition'
 require_relative 'c_header/utility/source_file'
 require_relative 'c_header/utility'
 require_relative 'c_header/struct_builder'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen-c-header
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-05 00:00:00.000000000 Z
+date: 2023-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,7 +45,6 @@ files:
 - lib/rggen/c_header/struct_builder.rb
 - lib/rggen/c_header/utility.rb
 - lib/rggen/c_header/utility/declaration.rb
-- lib/rggen/c_header/utility/macro_definition.rb
 - lib/rggen/c_header/utility/source_file.rb
 - lib/rggen/c_header/utility/struct_definition.rb
 - lib/rggen/c_header/version.rb
@@ -66,15 +65,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
-summary: rggen-c-header-0.2.0
+summary: rggen-c-header-0.3.0
 test_files: []

data/lib/rggen/c_header/utility/macro_definition.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module RgGen
-  module CHeader
-    module Utility
-      class MacroDefinition
-        def initialize(name, value = nil)
-          @name = name
-          @value = value
-        end
-
-        def to_s
-          @value && "#define #{@name} #{@value}" || "#define #{@name}"
-        end
-      end
-    end
-  end
-end