origen_testers 0.52.3 → 0.52.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5349ea4cd6f5b1ed7997b2565c6eda09ad601070a71195d40375d1f70faab52d
-  data.tar.gz: 571441a791984b34c8fe1205a05ede6fe1b6f89973d090fc2e6f7ba52da51a35
+  metadata.gz: 68bd4c35fef793a404ccab7d41d8212fccbdc69e2b92f7cbcbf1c711cca27b64
+  data.tar.gz: d641609bc1bccd7476dbbdce14b01745726bfdc66062709d2991f3cdf8dd6d8c
 SHA512:
-  metadata.gz: 1b133340695a1ddab2db3f1e651748b15eebeb1f524866efcf04e1f5ca45bbfacfd753be0a31cd5b6c99b51b47df4c78229c09699c4271c4b03c57ef8760bcf7
-  data.tar.gz: 45fd99e42edb9e438ec6930eeb6bc4a492e8f70f957cae8ffb2187863087c39b8f0bf97adfac9c6330e1374ebf457b158eddcbeca194d2affbd5fb1f0d30e355
+  metadata.gz: df597ce4879df80783faa634975b7c5531594d60a6f230fc6495927a384ea56e2608f004d3ae5ad4ddbe9cc31609324e4c2f0b410aaf9a003e148082e50f2431
+  data.tar.gz: f3f6c2d67eabb103d31f375262729cceb99170adaba9f38d2f567fbff6ad6b6c92cdf1708aebfe77dfdb761642304a96a642f8f244cc7f0709683a0a06acf1c4

data/config/version.rb

@@ -1,7 +1,7 @@
 module OrigenTesters
   MAJOR = 0
   MINOR = 52
-  BUGFIX = 3
+  BUGFIX = 5
   DEV = nil
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')
 end

data/lib/origen_testers/atp/flow.rb

@@ -626,37 +626,32 @@ module OrigenTesters::ATP
     end
 
     def loop(*args, &block)
-      if args[0].except(:source_file, :source_line_number).empty?
-        # not a flow api call, just a loop block
-        super(&block)
-      else
-        unless args[0].keys.include?(:from) && args[0].keys.include?(:to)
-          fail 'Loop must specify :from, :to'
-        end
-        # assume 1 if :step not provided
-        unless args[0].keys.include?(:step)
-          args[0][:step] = 1
-        end
-        # assume 1 if :test_num_inc not provided
-        unless args[0].keys.include?(:test_num_inc)
-          args[0][:test_num_inc] = 1
-        end
-        # Add node for set of flag to be used for loop
-        unless args[0][:var].nil?
-          unless tester.smt8?
-            set(args[0][:var], 0)
-          end
+      unless args[0].keys.include?(:from) && args[0].keys.include?(:to)
+        fail 'Loop must specify :from, :to'
+      end
+      # assume 1 if :step not provided
+      unless args[0].keys.include?(:step)
+        args[0][:step] = 1
+      end
+      # assume 1 if :test_num_inc not provided
+      unless args[0].keys.include?(:test_num_inc)
+        args[0][:test_num_inc] = 1
+      end
+      # Add node for set of flag to be used for loop
+      unless args[0][:var].nil?
+        unless tester.smt8?
+          set(args[0][:var], 0)
         end
-        extract_meta!(options) do
-          apply_conditions(options) do
-            # always pass 5-element array to loop node to simplify downstream parser
-            #   element, 'var', will be nil if not specified by loop call
-            params = [args[0][:from], args[0][:to], args[0][:step], args[0][:var], args[0][:test_num_inc]]
+      end
+      extract_meta!(options) do
+        apply_conditions(options) do
+          # always pass 5-element array to loop node to simplify downstream parser
+          #   element, 'var', will be nil if not specified by loop call
+          params = [args[0][:from], args[0][:to], args[0][:step], args[0][:var], args[0][:test_num_inc]]
 
-            node = n(:loop, params)
-            node = append_to(node) { block.call }
-            node
-          end
+          node = n(:loop, params)
+          node = append_to(node) { block.call }
+          node
         end
       end
     end

data/lib/origen_testers/atp/flow_api.rb

@@ -9,7 +9,7 @@ module OrigenTesters::ATP
     end
 
     ([:test, :bin, :pass, :continue, :cz, :log, :sub_test, :volatile, :add_global_flag, :set_flag, :unset_flag, :add_flag, :set, :enable, :disable, :render,
-      :context_changed?, :ids, :describe_bin, :describe_softbin, :describe_soft_bin, :loop, :add_auxiliary_flow] +
+      :context_changed?, :ids, :describe_bin, :describe_softbin, :describe_soft_bin, :add_auxiliary_flow] +
       OrigenTesters::ATP::Flow::CONDITION_KEYS.keys + OrigenTesters::ATP::Flow::RELATIONAL_OPERATORS).each do |method|
       define_method method do |*args, &block|
         options = args.pop if args.last.is_a?(Hash)
@@ -23,6 +23,19 @@ module OrigenTesters::ATP
 
     alias_method :logprint, :log
 
+    def loop(*args, &block)
+      if args.empty?
+        super(&block)
+      else
+        options = args.pop if args.last.is_a?(Hash)
+        options ||= {}
+        add_meta!(options) if respond_to?(:add_meta!, true)
+        add_description!(options) if respond_to?(:add_description!, true)
+        args << options
+        atp.send(:loop, *args, &block)
+      end
+    end
+
     def lo_limit(value, options)
       {
         value:    value,

data/lib/origen_testers/smartest_based_tester/base/flow.rb

@@ -188,6 +188,9 @@ module OrigenTesters
           if smt8?
             return unless top_level? || options[:called_by_top_level]
             super
+            # Refresh the ast before finalized gets set to true
+            # If ast gets called by the user the finalized flag will lock it to the incorrect value
+            ast
             @finalized = true
             # All flows have now been executed and the top-level contains the final AST.
             # The AST contained in each child flow may not be complete since it has not been subject to the

data/lib/origen_testers/smartest_based_tester/v93k_smt8/test_suite.rb

@@ -124,7 +124,7 @@ module OrigenTesters
               # Guarentee hash is using all symbol keys
               # Since we cannot guarentee ruby version is greater than 2.5, we have to use an older syntax to
               value_hash = value_hash.inject({}) { |memo, (k, v)| memo[k.to_sym] = v; memo }
-              nested_key = nested_param.first.to_sym
+              nested_key = nested_param.first.to_s.gsub('.', '_').to_sym
               nested_key_underscore = nested_key.to_s.underscore.to_sym
               nested_params_accepted_keys << nested_key
               nested_params_accepted_keys << nested_key_underscore

data/lib/origen_testers/test/interface.rb

@@ -57,14 +57,16 @@ module OrigenTesters
                   'hashParameter':        [{ param_name0: [:string, 'NO'], param_name1: [:integer, 0] }],
                   'hashParameter2':       [{ param_name0: [:string, 'NO'], param_name1: [:integer, 0] }],
                   'nestedHashParameter':  [{
-                    param_name0:        [:string, ''],
-                    param_list_strings: [:list_strings, %w(E1 E2)],
-                    param_list_classes: [:list_classes, %w(E1 E2)],
-                    param_name1:        [{
-                      param_name_int:     [:integer, 0],
-                      param_name_double:  [:double,  0],
-                      param_list_strings: [:list_strings, %w(E1 E2)],
-                      param_list_classes: [:list_classes, %w(E1 E2)]
+                    param_name0:          [:string, ''],
+                    param_list_strings:   [:list_strings, %w(E1 E2)],
+                    param_list_classes:   [:list_classes, %w(E1 E2)],
+                    'param_group.param0': [:string, ''],
+                    param_name1:          [{
+                      param_name_int:       [:integer, 0],
+                      param_name_double:    [:double,  0],
+                      param_list_strings:   [:list_strings, %w(E1 E2)],
+                      param_list_classes:   [:list_classes, %w(E1 E2)],
+                      'param_group.param1': [:string, '']
                     }]
                   }],
                   'nestedHashParameter2': [{
@@ -320,11 +322,13 @@ module OrigenTesters
             }
             tm.nestedHashParameter = {
               my_param_name0: {
-                param_name0: 'hello',
-                param_name1: {
+                param_name0:        'hello',
+                param_group_param0: 'test_group',
+                param_name1:        {
                   my_param_name1: {
-                    param_name_int:    '1',
-                    param_name_double: '1.0'
+                    param_name_int:     '1',
+                    param_name_double:  '1.0',
+                    param_group_param1: 'test_nested_group'
                   },
                   my_param_name2: {
                     param_name_int:    2,

data/templates/origen_guides/program/flowapi.md.erb

@@ -375,6 +375,7 @@ end
 Indicating step value is optional, default is 1.
 
 These loops can also be nested:
+
 ~~~ruby
 loop from: 0, to: 9, step: 2, var: '$LOOP_VARIABLE1'do
   loop from: 1, to: 10, step: 1, var: '$LOOP_VARIABLE2' do
@@ -386,6 +387,7 @@ end
 ~~~
 
 You can also indicate a test number increment if desired (default is 1):
+
 ~~~ruby
 loop from: 0, to: 5, var: '$LOOP_VARIABLE', test_num_inc: 2 do
     func :test_myloop3, number: 56200
@@ -393,6 +395,7 @@ end
 ~~~
 
 You can also provide a variable starting point:
+
 ~~~ruby
 loop from: '$TEST_VARIABLE', to: 5, var: '$LOOP_VARIABLE' do
     func :test_myloop6, number: 56600

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.52.3
+  version: 0.52.5
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-20 00:00:00.000000000 Z
+date: 2024-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -615,7 +615,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: This plugin provides Origen tester models to drive ATE type testers like