rggen-default-register-map 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a07cecea3878d609e000fc36d1e8f41e045686d28548774ba19b44d00089986f
-  data.tar.gz: 8347d41f0d9ffea4fa01e2d0860f2df4fcc2ab0e8d65ff9f1f7ab6ac84a79590
+  metadata.gz: 4ed4f7d03fe2c3b316ce912c5080070214841e66c0b6c6e84d77beb2873c845d
+  data.tar.gz: 52521afda2eaea55d94fa19310b6c02db2fcb0d5f3ca5af7d7a22f62d5144aa8
 SHA512:
-  metadata.gz: d6375a8b050dbb6ea1a22f384555272cb6b1afc63860d0307625447501b1121941a1fe350f6952f1057eed370e833173ec0497981f85c69ca6973cf518198ac1
-  data.tar.gz: 54fda95836bd1ab2442885e43e3bb405f81e80918c58f05d0213f09de34a58062de302896492bc157a460a3247d8e658cace7434219d03b5942b9c7a9b1cc5a2
+  metadata.gz: 29148e29d7cdc8ac258f538a2c4c090746a6350d43d4cec5aa201af6b2dd59de421a916c55d727aad48fc7a52051fd7b8670d6cdd4e7908ae859c403ffb28d7a
+  data.tar.gz: dd74e27ee704d145f6009e544308c6884361d27a63c4f6e75e428f25a9656b0e62a8098a8982a2efac548a226564787907b20d72865ac97e4b7f549c05d6cb08

data/lib/rggen/default_register_map/bit_field/initial_value.rb

@@ -2,16 +2,35 @@
 
 RgGen.define_simple_feature(:bit_field, :initial_value) do
   register_map do
-    property :initial_value, default: 0
-    property :initial_value?, body: -> { !@initial_value.nil? }
+    property :initial_value
+    property :initial_values
+    property :initial_value?, forward_to: :initial_value_set?
+    property :fixed_initial_value?, forward_to: :fixed?
+    property :initial_value_array?, forward_to: :array?
+
+    input_pattern parameterized: /default:(#{integer})/,
+                  array: /#{integer}(?:[,\n]#{integer})+/
 
     build do |value|
-      @initial_value =
-        begin
-          Integer(value)
-        rescue ArgumentError, TypeError
-          error "cannot convert #{value.inspect} into initial value"
+      @input_format =
+        if value.is_a?(Hash) || match_index == :parameterized
+          :parameterized
+        elsif value.is_a?(Array) || match_index == :array
+          :array
+        else
+          :single
         end
+      @initial_value, @initial_values = parse_initial_value(value)
+    end
+
+    define_helpers do
+      def verify_initial_value(&block)
+        initial_value_verifiers << create_verifier(&block)
+      end
+
+      def initial_value_verifiers
+        @initial_value_verifiers ||= []
+      end
     end
 
     verify(:component) do
@@ -20,40 +39,130 @@ RgGen.define_simple_feature(:bit_field, :initial_value) do
     end
 
     verify(:component) do
-      error_condition { initial_value? && initial_value < min_initial_value }
+      error_condition do
+        @input_format == :array && !bit_field.sequential?
+      end
       message do
-        'input initial value is less than minimum initial value: ' \
-        "initial value #{initial_value} " \
-        "minimum initial value #{min_initial_value}"
+        'arrayed initial value is not allowed for non sequential bit field'
       end
     end
 
     verify(:component) do
-      error_condition { initial_value? && initial_value > max_initial_value }
-      message do
-        'input initial value is greater than maximum initial value: ' \
-        "initial value #{initial_value} " \
-        "maximum initial value #{max_initial_value}"
+      error_condition do
+        @input_format == :array && initial_values.size > bit_field.sequence_size
       end
+      message { 'too many initial values are given' }
     end
 
     verify(:component) do
-      error_condition { initial_value? && !match_valid_condition? }
-      message do
-        "does not match the valid initial value condition: #{initial_value}"
+      error_condition do
+        @input_format == :array && initial_values.size < bit_field.sequence_size
+      end
+      message { 'few initial values are given' }
+    end
+
+    verify(:component) do
+      check_error do
+        Array(initial_value || initial_values)
+          .each(&method(:verify_initial_value))
+      end
+    end
+
+    verify_initial_value do
+      error_condition { |value| value < min_initial_value }
+      message do |value|
+        'input initial value is less than minimum initial value: ' \
+        "initial value #{value} minimum initial value #{min_initial_value}"
+      end
+    end
+
+    verify_initial_value do
+      error_condition { |value| value > max_initial_value }
+      message do |value|
+        'input initial value is greater than maximum initial value: ' \
+        "initial value #{value} maximum initial value #{max_initial_value}"
+      end
+    end
+
+    verify_initial_value do
+      error_condition { |value| !match_valid_condition?(value) }
+      message do |value|
+        "does not match the valid initial value condition: #{value}"
       end
     end
 
     printable(:initial_value) do
-      @initial_value &&
-        begin
-          print_width = (bit_field.width + 3) / 4
-          format('0x%0*x', print_width, @initial_value)
-        end
+      if @input_format == :parameterized
+        "default: #{format_value(initial_value)}"
+      elsif @input_format == :array
+        initial_values.map(&method(:format_value))
+      elsif initial_value?
+        format_value(initial_value)
+      end
     end
 
     private
 
+    def initial_value_format
+      @initial_value_format ||=
+        if @input_format == :parameterized
+          bit_field.sequential? && :array || :single
+        else
+          @input_format
+        end
+    end
+
+    def array?
+      initial_value_format == :array
+    end
+
+    def fixed?
+      [:array, :single].include?(@input_format)
+    end
+
+    def parse_initial_value(input_value)
+      if @input_format == :parameterized
+        [parse_parameterized_initial_value(input_value), nil]
+      elsif @input_format == :array
+        [nil, parse_arrayed_initial_value(input_value)]
+      else
+        [parse_value(input_value), nil]
+      end
+    end
+
+    def parse_parameterized_initial_value(input_value)
+      value =
+        if pattern_matched?
+          match_data.captures.first
+        else
+          input_value
+            .fetch(:default) { error 'no default value is given' }
+        end
+      parse_value(value)
+    end
+
+    def parse_arrayed_initial_value(input_value)
+      values =
+        if pattern_matched?
+          input_value.split(/[,\n]/)
+        else
+          input_value
+        end
+      values.map(&method(:parse_value))
+    end
+
+    def parse_value(value)
+      Integer(value)
+    rescue ArgumentError, TypeError
+      error "cannot convert #{value.inspect} into initial value"
+    end
+
+    def verify_initial_value(value)
+      helper.initial_value_verifiers.each do |verifier|
+        verifier.verify(self, value)
+      end
+    end
+
     def settings
       @settings ||=
         (bit_field.settings && bit_field.settings[:initial_value]) || {}
@@ -67,9 +176,18 @@ RgGen.define_simple_feature(:bit_field, :initial_value) do
       2**bit_field.width - 1
     end
 
-    def match_valid_condition?
+    def match_valid_condition?(value)
       !settings.key?(:valid_condition) ||
-        instance_exec(@initial_value, &settings[:valid_condition])
+        instance_exec(value, &settings[:valid_condition])
+    end
+
+    def initial_value_set?
+      [@initial_value, @initial_values].any?
+    end
+
+    def format_value(value)
+      print_width = (bit_field.width + 3) / 4
+      format('0x%0*x', print_width, value)
     end
   end
 end

data/lib/rggen/default_register_map/register/type/indirect.rb

@@ -3,35 +3,8 @@
 RgGen.define_list_item_feature(:register, :type, :indirect) do
   register_map do
     define_helpers do
-      index_verifier = Class.new do
-        def initialize(&block)
-          instance_eval(&block)
-        end
-
-        def error_condition(&block)
-          @error_condition = block
-        end
-
-        def message(&block)
-          @message = block
-        end
-
-        def verify(feature, index)
-          error?(feature, index) && raise_error(feature, index)
-        end
-
-        def error?(feature, index)
-          feature.instance_exec(index, &@error_condition)
-        end
-
-        def raise_error(feature, index)
-          error_message = feature.instance_exec(index, &@message)
-          feature.__send__(:error, error_message)
-        end
-      end
-
-      define_method(:verify_index) do |&block|
-        index_verifiers << index_verifier.new(&block)
+      def verify_index(&block)
+        index_verifiers << create_verifier(&block)
       end
 
       def index_verifiers
@@ -95,7 +68,7 @@ RgGen.define_list_item_feature(:register, :type, :indirect) do
         register.array? &&
           register.array_size.length > array_index_fields.length
       end
-      message { 'less array indices are given' }
+      message { 'few array indices are given' }
     end
 
     verify(:all) do

data/lib/rggen/default_register_map/version.rb

@@ -2,6 +2,6 @@
 
 module RgGen
   module DefaultRegisterMap
-    VERSION = '0.16.0'
+    VERSION = '0.17.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen-default-register-map
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-01 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,5 +92,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: rggen-default-register-map-0.16.0
+summary: rggen-default-register-map-0.17.0
 test_files: []