origen 0.60.20 → 0.61.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0ff67408cee3aae35f1f237df9b56f59671e4fded6ec18801b5add83850ec40
-  data.tar.gz: ac44e4e681cb14cb8d5cef023dff12f0430365bfc0e4dc73fbcd4f5a63615634
+  metadata.gz: bd07a38be9bb273d3921d65bd7f5a44183b6f21ff89293a1e9a111b4bee95ce7
+  data.tar.gz: ac025a4ce036eeb26f685a8570198872edebba0cf6a83ddc7f34f80d6ff7b1c7
 SHA512:
-  metadata.gz: 8c9f687da5d64f04da00bf588c4683694a8bdc2567c2f7714a846dbad755dfb2e7afc91e4af0c8eb26e5535d74c534049998f17a16dd766b387383d0da8bfb3a
-  data.tar.gz: 51393f786f377c74bf4b8251fcc908720e2387f15409ac0392fcc58a9d7d65da0eb61cf7562c160e5aba60cc7b29a36e439893cef56c5eea1d24420f16899bd6
+  metadata.gz: f70fb4a46e1e082af9a9bd108da2f441158bdfad148b6eefd1251bc3384231345ae633b2157491512ec1fe9e90ae4a913188e0daa768b5b22924423b6d06a6a9
+  data.tar.gz: 3be1ee7bd6407d0af48553baf0eab1bcb1b98e15e567164f3aa1413a8275a956a6d367281ad427c4cef52a04266ef478c8cbfc2ec0ba7cf23a20d6321ab6e55c

data/config/rubocop/easy.yml

@@ -108,7 +108,7 @@ AllCops:
   # the `--enable-pending-cops` command-line option.
   # When `NewCops` is `disable`, pending cops are disabled in bulk. Can be overridden by
   # the `--disable-pending-cops` command-line option.
-  NewCops: pending
+  NewCops: disable
   # Enables the result cache if `true`. Can be overridden by the `--cache` command
   # line option.
   UseCache: true

data/config/rubocop/strict.yml

@@ -108,7 +108,7 @@ AllCops:
   # the `--enable-pending-cops` command-line option.
   # When `NewCops` is `disable`, pending cops are disabled in bulk. Can be overridden by
   # the `--disable-pending-cops` command-line option.
-  NewCops: pending
+  NewCops: disable
   # Enables the result cache if `true`. Can be overridden by the `--cache` command
   # line option.
   UseCache: true
@@ -141,7 +141,7 @@ AllCops:
   # or gems.rb file, RuboCop reads the final value from the lock file.) If the
   # Ruby version is still unresolved, RuboCop will use the oldest officially
   # supported Ruby version (currently Ruby 2.6).
-  TargetRubyVersion: ~
+  TargetRubyVersion: 3.3.1
   # Determines if a notification for extension libraries should be shown when
   # rubocop is run. Keys are the name of the extension, and values are an array
   # of gems in the Gemfile that the extension is suggested for, if not already
@@ -235,7 +235,7 @@ Bundler/OrderedGems:
 
 #################### Gemspec ###############################
 
-Gemspec/DateAssignment:
+Gemspec/DeprecatedAttributeAssignment:
   Description: 'Checks that `date =` is not used in gemspec file, it is set automatically when the gem is packaged.'
   Enabled: pending
   VersionAdded: '1.10'
@@ -1454,7 +1454,7 @@ Lint/AmbiguousBlockAssociation:
   Enabled: false
   VersionAdded: '0.48'
   VersionChanged: '1.13'
-  IgnoredMethods: []
+  AllowedMethods: []
 
 Lint/AmbiguousOperator:
   Description: >-
@@ -1829,7 +1829,6 @@ Lint/InheritException:
 Lint/InterpolationCheck:
   Description: 'Raise warning for interpolation in single q strs.'
   Enabled: false
-  Safe: false
   VersionAdded: '0.50'
   VersionChanged: '0.87'
 
@@ -1931,7 +1930,7 @@ Lint/NumberConversion:
   VersionAdded: '0.53'
   VersionChanged: '1.1'
   SafeAutoCorrect: false
-  IgnoredMethods: []
+  AllowedMethods: []
   IgnoredClasses:
     - Time
     - DateTime
@@ -2340,7 +2339,6 @@ Lint/UselessRuby2Keywords:
 Lint/UselessSetterCall:
   Description: 'Checks for useless setter call to a local variable.'
   Enabled: true
-  SafeAutoCorrect: false
   VersionAdded: '0.13'
   VersionChanged: '1.2'
   Safe: false
@@ -2371,7 +2369,7 @@ Metrics/AbcSize:
   VersionChanged: '1.5'
   # The ABC size is a calculated magnitude, so this number can be an Integer or
   # a Float.
-  IgnoredMethods: []
+  AllowedMethods: []
   CountRepeatedAttributes: true
   Max: 17
 
@@ -2383,7 +2381,7 @@ Metrics/BlockLength:
   CountComments: false  # count full line comments?
   Max: 200
   CountAsOne: []
-  IgnoredMethods:
+  AllowedMethods:
     # By default, exclude the `#refine` method, as it tends to have larger
     # associated blocks.
     - refine
@@ -2416,7 +2414,7 @@ Metrics/CyclomaticComplexity:
   Enabled: false
   VersionAdded: '0.25'
   VersionChanged: '0.81'
-  IgnoredMethods: []
+  AllowedMethods: []
   Max: 7
 
 Metrics/MethodLength:
@@ -2428,7 +2426,7 @@ Metrics/MethodLength:
   CountComments: false  # count full line comments?
   Max: 10
   CountAsOne: []
-  IgnoredMethods: []
+  AllowedMethods: []
 
 Metrics/ModuleLength:
   Description: 'Avoid modules longer than 100 lines of code.'
@@ -2456,7 +2454,7 @@ Metrics/PerceivedComplexity:
   Enabled: false
   VersionAdded: '0.25'
   VersionChanged: '0.81'
-  IgnoredMethods: []
+  AllowedMethods: []
   Max: 8
 
 ################## Migration #############################
@@ -2891,7 +2889,6 @@ Style/ArgumentsForwarding:
   Description: 'Use arguments forwarding.'
   StyleGuide: '#arguments-forwarding'
   Enabled: pending
-  AllowOnlyRestArgument: true
   VersionAdded: '1.1'
 
 Style/ArrayCoercion:
@@ -3025,7 +3022,7 @@ Style/BlockDelimiters:
     - let!
     - subject
     - watch
-  IgnoredMethods:
+  AllowedMethods:
     # Methods that can be either procedural or functional and cannot be
     # categorised from their usage alone, e.g.
     #
@@ -3145,7 +3142,7 @@ Style/ClassEqualityComparison:
   StyleGuide: '#instance-of-vs-class-comparison'
   Enabled: false
   VersionAdded: '0.93'
-  IgnoredMethods:
+  AllowedMethods:
     - ==
     - equal?
     - eql?
@@ -3598,7 +3595,7 @@ Style/FormatStringToken:
   MaxUnannotatedPlaceholdersAllowed: 1
   VersionAdded: '0.49'
   VersionChanged: '1.0'
-  IgnoredMethods: []
+  AllowedMethods: []
 
 Style/FrozenStringLiteralComment:
   Description: >-
@@ -3714,7 +3711,7 @@ Style/HashSyntax:
     # enforces both ruby19 and no_mixed_keys styles
     - ruby19_no_mixed_keys
   # Force hashes that have a hash value omission
-  EnforcedShorthandSyntax: always
+  EnforcedShorthandSyntax: either
   SupportedShorthandSyntax:
     # forces use of the 3.1 syntax (e.g. {foo:}) when the hash key and value are the same.
     - always
@@ -3911,7 +3908,7 @@ Style/MethodCallWithArgsParentheses:
   VersionAdded: '0.47'
   VersionChanged: '1.7'
   IgnoreMacros: true
-  IgnoredMethods: []
+  AllowedMethods: []
   AllowedPatterns: []
   IncludedMacros: []
   AllowParenthesesInMultilineCall: false
@@ -3927,7 +3924,7 @@ Style/MethodCallWithoutArgsParentheses:
   Description: 'Do not use parentheses for method calls with no arguments.'
   StyleGuide: '#method-invocation-parens'
   Enabled: true
-  IgnoredMethods: []
+  AllowedMethods: []
   VersionAdded: '0.47'
   VersionChanged: '0.55'
 
@@ -4289,7 +4286,6 @@ Style/NumericPredicate:
   # This will change to a new method call which isn't guaranteed to be on the
   # object. Switching these methods has to be done with knowledge of the types
   # of the variables which rubocop doesn't have.
-  SafeAutoCorrect: false
   Enabled: false
   VersionAdded: '0.42'
   VersionChanged: '0.59'
@@ -4297,7 +4293,7 @@ Style/NumericPredicate:
   SupportedStyles:
     - predicate
     - comparison
-  IgnoredMethods: []
+  AllowedMethods: []
   # Exclude RSpec specs because assertions like `expect(1).to be > 0` cause
   # false positives.
   Exclude:
@@ -4938,7 +4934,7 @@ Style/SymbolProc:
   AllowMethodsWithArguments: false
   # A list of method names to be ignored by the check.
   # The names should be fairly unique, otherwise you'll end up ignoring lots of code.
-  IgnoredMethods:
+  AllowedMethods:
     - respond_to
     - define_method
   AllowComments: false

data/config/version.rb

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

data/lib/origen/application/runner.rb

@@ -142,8 +142,10 @@ module Origen
             unless Origen.running_remotely? # || Origen.running_on_windows?
               record_invocation = Thread.new do
                 Origen.client.record_invocation(options[:action]) if options[:action]
-              rescue
-                # Dont allow server being down to flood the screen with the stacktrace
+              rescue Exception
+                # Telemetry must never kill an origen command. Catch Exception (not
+                # just StandardError) so non-StandardError failures (e.g.
+                # SystemStackError) can't escape this fire-and-forget thread.
               end
             end
           rescue
@@ -162,8 +164,9 @@ module Origen
                 record_invocation.value
               end
             end
-          rescue
-            # Don't allow this to kill an origen command
+          rescue Exception
+            # Telemetry must never kill an origen command. Thread#value re-raises
+            # whatever the thread raised, including non-StandardError exceptions.
           end
         end
       end

data/lib/origen/application.rb

@@ -890,7 +890,7 @@ END
           $_target_options = nil
         end
         @target_instantiated = true
-        Origen.mode = :debug if options[:force_debug]
+        Origen.mode = :debug if options[:force_debug] || ENV['ORIGEN_DEBUG']
         listeners_for(:on_create).each do |obj|
           unless obj.is_a?(Origen::SubBlocks::Placeholder)
             if obj.try(:is_a_model_and_controller?)

data/lib/origen/boot/app.rb

@@ -168,14 +168,14 @@ end
 
             passed = false
 
-            Bundler.with_clean_env do
+            _origen_with_bundler_clean_env do
               cmd = 'bundle install'
               cmd += ' --local' if File.exist?('.origen_archive')
               passed = system(cmd)
             end
 
             if passed
-              Bundler.with_clean_env do
+              _origen_with_bundler_clean_env do
                 exec "origen #{ARGV.join(' ')}"
               end
               exit 0
@@ -269,7 +269,6 @@ end
               puts "Copied #{gem} #{version} from the system into #{bundle_path}"
 
             end
-
           rescue Exception # Gem::LoadError  # Rescue everything here, this is a try-our-best operation, better to
             # continue and try and install the gem if this fails rather than crash
             # This just means that one of the gems that should be copied from the system

data/lib/origen/boot.rb

@@ -6,6 +6,17 @@ require 'fileutils'
 class OrigenBootError < StandardError
 end
 
+# Compatibility shim for Bundler.with_clean_env (removed in Bundler 3.x / Ruby 4.0).
+# Uses with_unbundled_env when available (Bundler 2.1+), falls back to with_clean_env
+# for older Bundler versions (Ruby 2.6 and earlier).
+def _origen_with_bundler_clean_env(&block)
+  if Bundler.respond_to?(:with_unbundled_env)
+    Bundler.with_unbundled_env(&block)
+  else
+    Bundler.with_clean_env(&block)
+  end
+end
+
 # Keep a note of the pwd at the time when Origen was first loaded, this is initially used
 # by the site_config lookup.
 $_origen_invocation_pwd ||= Pathname.pwd
@@ -153,7 +164,7 @@ elsif Origen.site_config.gem_manage_bundler && (Origen.site_config.user_install_
           `chmod o-w #{install_dir}/.bin` if File.exist?("#{install_dir}/.bin")
           result = false
 
-          Bundler.with_clean_env do
+          _origen_with_bundler_clean_env do
             if Origen.os.unix?
               if Origen.site_config.gem_build_switches
                 Origen.site_config.gem_build_switches.each do |switches|

data/lib/origen/chip_mode.rb

@@ -109,7 +109,7 @@ module Origen
         # Cannot use @data_rate_unit without @data_rate
         fail '@data_rate_unit must be set with @data_rate, exiting...' if @data_rate.nil?
       end
-      unless @data_rate.nil? || @data_rate =~ /n\/a/i || @data_rate =~ /na/i
+      unless @data_rate.nil? || @data_rate.to_s =~ /n\/a/i || @data_rate.to_s =~ /na/i
         # Check if the data rate was passed as a String, if so convert it to a number
         if @data_rate.is_a? String
           if @data_rate.numeric?

data/lib/origen/chip_package.rb

@@ -465,7 +465,7 @@ module Origen
             150, 24, 143, 14, 19, 86, 8, 67, 60, 63, 2, 62, 146, 24, 62, 0, 104, 68, 13, 15, 173, 79,
             63, 37, 44, 93, 85, 60, 58, 67]
       y = []
-      (0..71).each { |n| y << n + n / 2 * 3 }
+      72.times { |n| y << n + n / 2 * 3 }
       y.each do |z|
         puts scramble[pw[z]]
       end

data/lib/origen/chips/chip.rb

@@ -122,8 +122,7 @@ module Origen
 
       private
 
-      # rubocop:disable Lint/DuplicateMethods
-
+      # rubocop:disable Lint/DuplicateMethods -- intentional re-definitions with lazy-initialized hashes
       # Two-dimensional hash with note id and type as the keys
       def _notes
         @_notes ||= Hash.new do |h, k|
@@ -144,7 +143,6 @@ module Origen
           h[k] = {}
         end
       end
-
       # rubocop:enable Lint/DuplicateMethods
 
       # Return a hash based on the filter provided
@@ -154,7 +152,7 @@ module Origen
         filtered_hash = {}
         select_logic = case filter
           when String then 'k[Regexp.new(filter)]'
-          when (Fixnum || Integer || Float || Numeric) then "k[Regexp.new('#{filter}')]"
+          when (Integer || Float || Numeric) then "k[Regexp.new('#{filter}')]"
           when Regexp then 'k[filter]'
           when Symbol then
             'k == filter'

data/lib/origen/chips.rb

@@ -185,8 +185,7 @@ module Origen
 
     private
 
-    # rubocop:disable Lint/DuplicateMethods
-
+    # rubocop:disable Lint/DuplicateMethods -- intentional re-definitions with lazy-initialized hashes
     def _chips
       # 4D hash with group, family, and performance
       @_chips ||= Hash.new do |h, k|
@@ -227,7 +226,7 @@ module Origen
       filtered_hash = {}
       select_logic = case filter
         when String then 'k[Regexp.new(filter)]'
-        when (Fixnum || Integer || Float || Numeric) then "k[Regexp.new('#{filter}')]"
+        when (Integer || Float || Numeric) then "k[Regexp.new('#{filter}')]"
         when Regexp then 'k[filter]'
         when Symbol then
           'k == filter'

data/lib/origen/client.rb

@@ -15,7 +15,7 @@ module Origen
       options[:port] = port
       invocation_url = URI.parse("#{url}/#{path}")
       http = Net::HTTP.new(invocation_url.host, invocation_url.port)
-      http.post(invocation_url, JSON.dump(options[:body]), 'Content-type' => 'application/vnd.api+json', 'Accept' => 'text/json, application/vnd.api+json')
+      http.post(invocation_url, JSON.generate(options[:body]), 'Content-type' => 'application/vnd.api+json', 'Accept' => 'text/json, application/vnd.api+json')
     end
 
     def get(path, options = {})

data/lib/origen/code_generators/actions.rb

@@ -1,5 +1,5 @@
 require 'open-uri'
-require 'set'
+require 'set' # rubocop:disable Lint/RedundantRequireStatement -- needed for Ruby 2.6
 
 module Origen
   module CodeGenerators

data/lib/origen/commands/archive.rb

@@ -31,7 +31,7 @@ if options[:no_local]
     FileUtils.rm_rf(dir) if File.exist?(dir)
   end
   passed = true
-  Bundler.with_clean_env do
+  _origen_with_bundler_clean_env do
     passed = system('origen -v')
   end
   if passed
@@ -96,7 +96,7 @@ Dir.chdir dir do
   # When archiving, also include copies of all gem packages for other platforms, this will help if the
   # archive needs to run on a different platform to the one used to create it in the future
   unless options[:local]
-    Bundler.with_clean_env do
+    _origen_with_bundler_clean_env do
       FileUtils.rm_rf('.bundle') if File.exist?('.bundle')
       system 'hash -r'  # Ignore fail if not on bash
 
@@ -122,7 +122,7 @@ Dir.chdir dir do
   end
   FileUtils.touch('.origen_archive') unless options[:local]
 
-  Bundler.with_clean_env do
+  _origen_with_bundler_clean_env do
     passed = system('bundle') && system('origen -v')
     unless passed
       Origen.log.error 'A problem was encountered installing the gem bundle, archive aborted!'

data/lib/origen/commands/extract.rb

@@ -30,7 +30,7 @@ unless passed
 end
 
 Dir.chdir dirname do
-  Bundler.with_clean_env do
+  _origen_with_bundler_clean_env do
     Origen.log.info 'Trying to boot the application...'
 
     passed = system "#{File.join('lbin', 'origen')} -v"

data/lib/origen/commands/interactive.rb

@@ -59,23 +59,11 @@ Usage: origen i [options]
   begin
     if defined?(Pry) && options[:pry]
       include ConsoleMethods
-      # rubocop:disable Lint/Debugger, Layout/EmptyLines
-
-
-
-
-
-
+      # rubocop:disable Lint/Debugger
 
       binding.pry
 
-
-
-
-
-
-
-      # rubocop:enable Lint/Debugger, Layout/EmptyLines
+      # rubocop:enable Lint/Debugger
     else
       IRB::ExtendCommandBundle.send :include, Origen::ConsoleMethods
       IRB.start

data/lib/origen/commands/lint.rb

@@ -13,7 +13,7 @@ Usage: origen lint [space separated files, or directories] [options]
 All options and the default files to test can be overridden via the
 lint_test application configuration parameter, see here for more info:
 
-http://origen.freescale.net/origen/latest/guides/utilities/lint/
+https://origen-sdk.org/origen/guides/misc/lint/
 
   END
   opts.on('-c', '--correct', 'Correct errors automatically where possible') { options[:correct] = true }
@@ -67,12 +67,36 @@ if Origen.debugger_enabled?
 end
 
 puts command
-result = system(command)
 
-if result == true
+# Run RuboCop and filter config deprecation warnings from stderr.
+# The rubocop config uses old parameter/cop names for backwards compatibility
+# with RuboCop 1.50 (Ruby 2.6). Newer RuboCop versions auto-map them but
+# print noisy warnings. We suppress these warning blocks while preserving
+# any real errors.
+require 'open3'
+stdout, stderr, status = Open3.capture3(command)
+
+in_warning = false
+warnings_suppressed = 0
+filtered_stderr = stderr.lines.reject do |line|
+  if line =~ /\AWarning:|obsolete/i
+    in_warning = true
+    warnings_suppressed += 1
+  elsif in_warning
+    in_warning = line =~ /\A[\s`]/ || line =~ /\ASupported / || line.strip.empty?
+  end
+  in_warning
+end
+$stderr.print filtered_stderr.join unless filtered_stderr.empty?
+print stdout
+if warnings_suppressed > 0
+  puts "Note: #{warnings_suppressed} RuboCop config deprecation warning(s) suppressed. " \
+       'Update to the latest Ruby and RuboCop, then run `origen lint` to adopt the latest rules. ' \
+       'Be aware this may introduce new offenses in your application.'
+end
+
+if status.success?
   exit 0
-elsif result == false
-  exit 1
 else
   exit 1
 end

data/lib/origen/commands/new.rb

@@ -84,7 +84,7 @@ if update_required
 
           if response.success?
             latest_version = JSON.parse(response.body).map { |v| v['number'] }.max
-            puts latest_version.to_s
+            puts latest_version
 
             url = "#{gen[0]}/gems/#{gen[1]}-#{latest_version}.gem"
             print "Fetching #{url}..."

data/lib/origen/commands/web.rb

@@ -40,7 +40,7 @@ The following options are available:
     opts.on('-e', '--environment NAME', String, 'Override the default environment, NAME can be a full path or a fragment of an environment file name') { |e| options[:environment] = e }
     opts.on('-t', '--target NAME', String, 'Override the default target, NAME can be a full path or a fragment of a target file name') { |t| options[:target] = t }
     opts.on('-r', '--remote', 'Use in conjunction with the compile command to deploy files to a remote web server') { options[:remote] = true }
-    opts.on('-a', '--api', 'Generate API documentation after compiling') {  options[:api] = true }
+    opts.on('-a', '--api', 'Generate API documentation after compiling') { options[:api] = true }
     opts.on('--archive ID', String, 'Archive the documents after compiling or deploying remotely') do |id|
       options[:archive] = id
       require "#{Origen.top}/helpers/url"
@@ -96,7 +96,20 @@ The following options are available:
     puts ''
     puts 'To shut down the server use CTRL-C'
     puts ''
-    system "ruby -run -e httpd . -p #{port}"
+    # Previously this shelled out to `ruby -run -e httpd`, but that spawns a fresh
+    # Ruby outside the bundle. webrick was extracted from the standard library in
+    # Ruby 3.0, so the bundled gem is not visible to that subprocess and the server
+    # fails to start on Ruby 3+/4.0. Run webrick in-process instead so it resolves
+    # from the bundle on every supported Ruby.
+    require 'webrick'
+    # No BindAddress is set, so webrick listens on all interfaces (matching the old
+    # `ruby -run -e httpd` behaviour) and the advertised hostname URL stays reachable.
+    httpd = WEBrick::HTTPServer.new(
+      Port:         port,
+      DocumentRoot: Dir.pwd
+    )
+    trap('INT') { httpd.shutdown }
+    httpd.start
   end
 
   def self._build_web_dir

data/lib/origen/core_ext/hash.rb

@@ -27,7 +27,7 @@ class Hash
     filtered_hash = {}
     select_logic = case filter
       when String then 'k[Regexp.new(filter)]'
-      when (Fixnum || Integer || Float || Numeric) then "k[Regexp.new('#{filter}')]"
+      when (Integer || Float || Numeric) then "k[Regexp.new('#{filter}')]"
       when Regexp then 'k[filter]'
       when Symbol then 'k == filter'
       when NilClass then true

data/lib/origen/core_ext/integer.rb

@@ -1,6 +1,6 @@
 # The base class of ALL integers, i.e. including Fixum and Bignum
 
-# Shim to handle Ruby < 2.4.0, where [] is implemented in Fixnum/Bignum instead
+# Shim to handle Ruby < 2.4.0, where [] is implemented in Integer/Bignum instead
 # of Integer
 module Origen
   module IntegerExtension
@@ -91,7 +91,7 @@ class Integer
 end
 
 if RUBY_VERSION <= '2.4.0'
-  class Fixnum
+  class Integer
     prepend Origen::IntegerExtension
   end
 

data/lib/origen/core_ext/numeric.rb

@@ -117,9 +117,9 @@ class Numeric
     define_method m do
       result = self / 1_024 / 1_024 / 1_024
       if result == Integer(result)
-        return Integer(result)
+        Integer(result)
       else
-        return result
+        result
       end
     end
   end
@@ -128,9 +128,9 @@ class Numeric
     define_method m do
       result = to_f / 1_024 / 1_024
       if result == Integer(result)
-        return Integer(result)
+        Integer(result)
       else
-        return result
+        result
       end
     end
   end
@@ -151,9 +151,9 @@ class Numeric
     define_method m do
       result = to_f / 1_024
       if result == Integer(result)
-        return Integer(result)
+        Integer(result)
       else
-        return result
+        result
       end
     end
   end

data/lib/origen/errata.rb

@@ -100,7 +100,7 @@ module Origen
     #  filtered_hash = {}
     #  select_logic = case filter
     #    when String then 'k[Regexp.new(filter)] && k.length == filter.length'
-    #    when (Fixnum || Integer || Float || Numeric) then "k[Regexp.new('#{filter}')]"
+    #    when (Integer || Float || Numeric) then "k[Regexp.new('#{filter}')]"
     #    when Regexp then 'k[filter]'
     #    when Symbol then
     #      'k == filter'

data/lib/origen/generator/compiler.rb

@@ -162,9 +162,9 @@ module Origen
           buffer = buffer_name_for(file)
         end
         if block_given?
-          content = ERB.new(content, 0, '%<>', buffer).result(b)
+          content = ERB.new(content, trim_mode: '%<>', eoutvar: buffer).result(b)
         else
-          content = ERB.new(content, 0, Origen.config.erb_trim_mode, buffer).result(b)
+          content = ERB.new(content, trim_mode: Origen.config.erb_trim_mode, eoutvar: buffer).result(b)
         end
         insert(content)
       end

data/lib/origen/limits/limit.rb

@@ -111,7 +111,7 @@ module Origen
           # which would not work with the code above but should eval to a number 3.35
           begin
             result = eval(@expr)
-            return result.round(4) if result.is_a? Numeric
+            result.round(4) if result.is_a? Numeric
           rescue ::SyntaxError, ::NameError, ::TypeError
             Origen.log.debug "Limit '#{@expr}' had to be rescued, storing it as a #{@expr.class}"
             if @expr.is_a? Symbol