puppet 8.5.1-universal-darwin → 8.7.0-universal-darwin

data/lib/puppet/pops/parser/lexer_support.rb

@@ -200,7 +200,7 @@ module LexerSupport
     lex_error_without_pos(
       Puppet::Pops::Issues::ILLEGAL_BOM,
       { :format_name => name,
-        :bytes => "[#{bom.values[0, size].map { |b| "%X" % b }.join(" ")}]" }
+        :bytes => "[#{bom.values[0, size].map { |b| '%X' % b }.join(' ')}]" }
     )
   end
 

data/lib/puppet/pops/parser/locator.rb

@@ -141,7 +141,7 @@ class Locator
       satisfied = false
       v = nil
 
-      while low < high do
+      while low < high
         mid = low + ((high - low) / 2)
         v = (ary[mid] > value)
         if v == true
@@ -161,9 +161,9 @@ class Locator
       end
 
       return nil if low == ary.length
-      return nil if !satisfied
+      return nil unless satisfied
 
-      return low
+      low
     end
 
     def hash
@@ -192,7 +192,7 @@ class Locator
       # If not found it is after last
       # clear cache
       @prev_offset = @prev_line = nil
-      return line_index.size
+      line_index.size
     end
   end
 

data/lib/puppet/pops/parser/parser_support.rb

@@ -77,7 +77,7 @@ class Parser
   def parse_file(file)
     unless Puppet::FileSystem.exist?(file)
       unless file =~ /\.pp$/
-        file = file + ".pp"
+        file += ".pp"
       end
     end
     @lexer.file = file
@@ -193,16 +193,15 @@ class Parser
     # where the "10, notice" forms an argument list. The parser builds an Array with the expressions and includes
     # the comma tokens to enable the error to be reported against the first comma.
     #
-    begin
-      Factory.transform_calls(expressions)
-    rescue Factory::ArgsToNonCallError => e
-      # e.args[1] is the first comma token in the list
-      # e.name_expr is the function name expression
-      if e.name_expr.is_a?(Factory) && e.name_expr.model_class <= Model::QualifiedName
-        error(e.args[1], _("attempt to pass argument list to the function '%{name}' which cannot be called without parentheses") % { name: e.name_expr['value'] })
-      else
-        error(e.args[1], _("illegal comma separated argument list"))
-      end
+
+    Factory.transform_calls(expressions)
+  rescue Factory::ArgsToNonCallError => e
+    # e.args[1] is the first comma token in the list
+    # e.name_expr is the function name expression
+    if e.name_expr.is_a?(Factory) && e.name_expr.model_class <= Model::QualifiedName
+      error(e.args[1], _("attempt to pass argument list to the function '%{name}' which cannot be called without parentheses") % { name: e.name_expr['value'] })
+    else
+      error(e.args[1], _("illegal comma separated argument list"))
     end
   end
 
@@ -229,8 +228,7 @@ class Parser
     _, token = @lexer.emit_completed([:NOOP, '', 0], locator.string.bytesize)
     loc(no_op, token)
     # Program with a Noop
-    program = Factory.PROGRAM(no_op, [], locator)
-    program
+    Factory.PROGRAM(no_op, [], locator)
   end
 
   # Performs the parsing and returns the resulting model.
@@ -243,7 +241,7 @@ class Parser
       @yydebug = false
       main = yyparse(@lexer, :scan)
     end
-    return main
+    main
   ensure
     @lexer.clear
     @namestack = []

data/lib/puppet/pops/parser/pn_parser.rb

@@ -196,7 +196,7 @@ class PNParser
   end
 
   def consume_identifier(s)
-    while @char_types[peek_cp] >= TYPE_IDENTIFIER do
+    while @char_types[peek_cp] >= TYPE_IDENTIFIER
       @pos += 1
     end
     id = @text[s...@pos]
@@ -287,7 +287,7 @@ class PNParser
       c = peek_cp
     end
 
-    while @char_types[c] == TYPE_DIGIT do
+    while @char_types[c] == TYPE_DIGIT
       @pos += 1
       c = peek_cp
       count += 1
@@ -296,7 +296,7 @@ class PNParser
   end
 
   def skip_white
-    while @char_types[peek_cp] == TYPE_WS do
+    while @char_types[peek_cp] == TYPE_WS
       @pos += 1
     end
   end

data/lib/puppet/pops/parser/slurp_support.rb

@@ -13,15 +13,15 @@ module Parser
 module SlurpSupport
   include LexerSupport
 
-  SLURP_SQ_PATTERN  = /(?:[^\\]|^)(?:[\\]{2})*[']/
-  SLURP_DQ_PATTERN  = /(?:[^\\]|^)(?:[\\]{2})*(["]|[$]\{?)/
-  SLURP_UQ_PATTERN  = /(?:[^\\]|^)(?:[\\]{2})*([$]\{?|\z)/
+  SLURP_SQ_PATTERN  = /(?:[^\\]|^)(?:\\{2})*'/
+  SLURP_DQ_PATTERN  = /(?:[^\\]|^)(?:\\{2})*("|[$]\{?)/
+  SLURP_UQ_PATTERN  = /(?:[^\\]|^)(?:\\{2})*([$]\{?|\z)/
   # unquoted, no escapes
   SLURP_UQNE_PATTERN = /(\$\{?|\z)/m
   SLURP_ALL_PATTERN = /.*(\z)/m
-  SQ_ESCAPES = %w{\\ '}
-  DQ_ESCAPES = %w{\\  $ ' " r n t s u} + ["\r\n", "\n"]
-  UQ_ESCAPES = %w{\\  $ r n t s u} + ["\r\n", "\n"]
+  SQ_ESCAPES = %w[\\ ']
+  DQ_ESCAPES = %w[\\  $ ' " r n t s u] + ["\r\n", "\n"]
+  UQ_ESCAPES = %w[\\  $ r n t s u] + ["\r\n", "\n"]
 
   def slurp_sqstring
     # skip the leading '
@@ -76,14 +76,14 @@ module SlurpSupport
     # If later a \u is found it is warned not to be a unicode escape
     if escapes.include?('u')
       # gsub must be repeated to cater for adjacent escapes
-      while (str.gsub!(/((?:[^\\]|^)(?:[\\]{2})*)\\u(?:([\da-fA-F]{4})|\{([\da-fA-F]{1,6})\})/m) { $1 + [($2 || $3).hex].pack("U") })
+      while str.gsub!(/((?:[^\\]|^)(?:\\{2})*)\\u(?:([\da-fA-F]{4})|\{([\da-fA-F]{1,6})\})/m) { ::Regexp.last_match(1) + [(::Regexp.last_match(2) || ::Regexp.last_match(3)).hex].pack("U") }
         # empty block. Everything happens in the gsub block
       end
     end
 
     begin
       str.gsub!(/\\([^\r\n]|(?:\r?\n))/m) {
-        ch = $1
+        ch = ::Regexp.last_match(1)
         if escapes.include? ch
           case ch
           when 'r'; "\r"

data/lib/puppet/pops/patterns.rb

@@ -13,48 +13,48 @@ module Puppet::Pops::Patterns
   # Thus, a hex number has group 3 value, an octal value has group 4 (if it starts with 0), and no group 3
   # and a floating point value has group 4 and group 5.
   #
-  NUMERIC = %r{\A[[:blank:]]*([-+]?)[[:blank:]]*((0[xX][0-9A-Fa-f]+)|(0?\d+)((?:\.\d+)?(?:[eE]-?\d+)?))[[:blank:]]*\z}
+  NUMERIC = /\A[[:blank:]]*([-+]?)[[:blank:]]*((0[xX][0-9A-Fa-f]+)|(0?\d+)((?:\.\d+)?(?:[eE]-?\d+)?))[[:blank:]]*\z/
 
   # Special expression that tests if there is whitespace between sign and number. The expression is used
   # to strip such whitespace when normal Float or Integer conversion fails.
-  WS_BETWEEN_SIGN_AND_NUMBER = %r{\A([+-])[[:blank:]]+(.*)\z}
+  WS_BETWEEN_SIGN_AND_NUMBER = /\A([+-])[[:blank:]]+(.*)\z/
 
   # ILLEGAL_P3_1_HOSTNAME matches if a hostname contains illegal characters.
   # This check does not prevent pathological names like 'a....b', '.....', "---". etc.
-  ILLEGAL_HOSTNAME_CHARS = %r{[^-\w.]}
+  ILLEGAL_HOSTNAME_CHARS = /[^-\w.]/
 
   # NAME matches a name the same way as the lexer.
-  NAME = %r{\A((::)?[a-z]\w*)(::[a-z]\w*)*\z}
+  NAME = /\A((::)?[a-z]\w*)(::[a-z]\w*)*\z/
 
   # CLASSREF_EXT matches a class reference the same way as the lexer - i.e. the external source form
   # where each part must start with a capital letter A-Z.
   #
-  CLASSREF_EXT = %r{\A((::){0,1}[A-Z][\w]*)+\z}
+  CLASSREF_EXT = /\A((::){0,1}[A-Z]\w*)+\z/
 
   # Same as CLASSREF_EXT but cannot start with '::'
   #
-  CLASSREF_EXT_DECL = %r{\A[A-Z][\w]*(?:::[A-Z][\w]*)*\z}
+  CLASSREF_EXT_DECL = /\A[A-Z]\w*(?:::[A-Z]\w*)*\z/
 
   # CLASSREF matches a class reference the way it is represented internally in the
   # model (i.e. in lower case).
   #
-  CLASSREF = %r{\A((::){0,1}[a-z][\w]*)+\z}
+  CLASSREF = /\A((::){0,1}[a-z]\w*)+\z/
 
   # Same as CLASSREF but cannot start with '::'
   #
-  CLASSREF_DECL = %r{\A[a-z][\w]*(?:::[a-z][\w]*)*\z}
+  CLASSREF_DECL = /\A[a-z]\w*(?:::[a-z]\w*)*\z/
 
   # DOLLAR_VAR matches a variable name including the initial $ character
-  DOLLAR_VAR = %r{\$(::)?(\w+::)*\w+}
+  DOLLAR_VAR = /\$(::)?(\w+::)*\w+/
 
   # VAR_NAME matches the name part of a variable (The $ character is not included)
   # Note, that only the final segment may start with an underscore.
   # Note, regexp sensitive to backtracking
-  VAR_NAME = %r{\A(?:::)?(?:[a-z]\w*::)*[a-z_]\w*\z}
+  VAR_NAME = /\A(?:::)?(?:[a-z]\w*::)*[a-z_]\w*\z/
 
   # PARAM_NAME matches the name part of a parameter (The $ character is not included)
-  PARAM_NAME = %r{\A[a-z_]\w*\z}
+  PARAM_NAME = /\A[a-z_]\w*\z/
 
   # A Numeric var name must be the decimal number 0, or a decimal number not starting with 0
-  NUMERIC_VAR_NAME = %r{\A(?:0|(?:[1-9][0-9]*))\z}
+  NUMERIC_VAR_NAME = /\A(?:0|(?:[1-9][0-9]*))\z/
 end

data/lib/puppet/pops/pcore.rb

@@ -10,7 +10,7 @@ module Pcore
   TYPE_URI = Types::TypeFactory.pattern(TYPE_URI_RX)
   TYPE_URI_ALIAS = Types::PTypeAliasType.new('Pcore::URI', nil, TYPE_URI)
   TYPE_SIMPLE_TYPE_NAME = Types::TypeFactory.pattern(/\A[A-Z]\w*\z/)
-  TYPE_QUALIFIED_REFERENCE = Types::TypeFactory.pattern(/\A[A-Z][\w]*(?:::[A-Z][\w]*)*\z/)
+  TYPE_QUALIFIED_REFERENCE = Types::TypeFactory.pattern(/\A[A-Z]\w*(?:::[A-Z]\w*)*\z/)
   TYPE_MEMBER_NAME = Types::PPatternType.new([Types::PRegexpType.new(Patterns::PARAM_NAME)])
 
   KEY_PCORE_URI = 'pcore_uri'

data/lib/puppet/pops/pn.rb

@@ -116,7 +116,7 @@ module PN
     end
 
     def to_data
-      { '^' => [@name] + @elements.map { |e| e.to_data } }
+      { '^' => [@name] + @elements.map(&:to_data) }
     end
   end
 
@@ -166,7 +166,7 @@ module PN
     end
 
     def to_data
-      @elements.map { |e| e.to_data }
+      @elements.map(&:to_data)
     end
   end
 

data/lib/puppet/pops/puppet_stack.rb

@@ -32,7 +32,7 @@ module Puppet
       @stack = Puppet::ThreadLocal.new { Array.new }
 
       def self.stack(file, line, obj, message, args, &block)
-        file = 'unknown' if (file.nil? || file == '')
+        file = 'unknown' if file.nil? || file == ''
         line = 0 if line.nil?
 
         result = nil

data/lib/puppet/pops/resource/resource_type_impl.rb

@@ -75,7 +75,7 @@ class ResourceTypeImpl
     return nil unless other.is_a?(Puppet::CompilableResourceType)
 
     # against other type instances.
-    self.ref <=> other.ref
+    ref <=> other.ref
   end
 
   METAPARAMS = [

data/lib/puppet/pops/serialization/abstract_reader.rb

@@ -143,7 +143,7 @@ class AbstractReader
       read_payload(data) do |ep|
         sec = ep.read
         nsec = ep.read
-        Time::Timestamp.new(sec * 1000000000 + nsec)
+        Time::Timestamp.new(sec * 1_000_000_000 + nsec)
       end
     end
 
@@ -151,7 +151,7 @@ class AbstractReader
       read_payload(data) do |ep|
         sec = ep.read
         nsec = ep.read
-        Time::Timespan.new(sec * 1000000000 + nsec)
+        Time::Timespan.new(sec * 1_000_000_000 + nsec)
       end
     end
 

data/lib/puppet/pops/serialization/abstract_writer.rb

@@ -178,11 +178,11 @@ class AbstractWriter
     end
 
     register_type(Extension::TIME, Time::Timestamp) do |o|
-      build_payload { |ep| nsecs = o.nsecs; ep.write(nsecs / 1000000000); ep.write(nsecs % 1000000000) }
+      build_payload { |ep| nsecs = o.nsecs; ep.write(nsecs / 1_000_000_000); ep.write(nsecs % 1_000_000_000) }
     end
 
     register_type(Extension::TIMESPAN, Time::Timespan) do |o|
-      build_payload { |ep| nsecs = o.nsecs; ep.write(nsecs / 1000000000); ep.write(nsecs % 1000000000) }
+      build_payload { |ep| nsecs = o.nsecs; ep.write(nsecs / 1_000_000_000); ep.write(nsecs % 1_000_000_000) }
     end
 
     register_type(Extension::VERSION, SemanticPuppet::Version) do |o|
@@ -213,7 +213,7 @@ class AbstractWriter
   end
 
   def to_s
-    "#{self.class.name}"
+    self.class.name.to_s
   end
 
   def inspect

data/lib/puppet/pops/time/timestamp.rb

@@ -107,7 +107,7 @@ class Timestamp < TimeData
     fraction = parsed[:sec_fraction]
 
     # Convert msec rational found in _strptime hash to usec
-    fraction = fraction * 1000000 unless fraction.nil?
+    fraction *= 1_000_000 unless fraction.nil?
 
     # Create the Time instance and adjust for timezone
     parsed_time = ::Time.utc(parsed[:year], parsed[:mon], parsed[:mday], parsed[:hour], parsed[:min], parsed[:sec], fraction)

data/lib/puppet/pops/types/class_loader.rb

@@ -37,7 +37,7 @@ class ClassLoader
   def self.provide_from_type(type)
     case type
     when PRuntimeType
-      raise ArgumentError.new("Only Runtime type 'ruby' is supported, got #{type.runtime}") unless type.runtime == :ruby
+      raise ArgumentError, "Only Runtime type 'ruby' is supported, got #{type.runtime}" unless type.runtime == :ruby
 
       provide_from_string(type.runtime_type_name)
 
@@ -105,11 +105,9 @@ class ClassLoader
 
   def self.find_class(name_path)
     name_path.reduce(Object) do |ns, name|
-      begin
-        ns.const_get(name, false) # don't search ancestors
-      rescue NameError
-        return nil
-      end
+      ns.const_get(name, false) # don't search ancestors
+    rescue NameError
+      return nil
     end
   end
   private_class_method :find_class

data/lib/puppet/pops/types/iterable.rb

@@ -32,7 +32,7 @@ module Puppet::Pops::Types
     # @raise [ArgumentError] In case an `Iterable` cannot be produced
     # @api public
     def self.asserted_iterable(my_caller, obj, infer_elements = false)
-      iter = self.on(obj, nil, infer_elements)
+      iter = on(obj, nil, infer_elements)
       raise ArgumentError, "#{my_caller.class}(): wrong argument type (#{obj.class}; is not Iterable." if iter.nil?
 
       iter

data/lib/puppet/pops/types/p_binary_type.rb

@@ -122,7 +122,7 @@ class PBinaryType < PAnyType
     end
 
     def ==(o)
-      self.eql?(o)
+      eql?(o)
     end
 
     def length

data/lib/puppet/pops/types/p_init_type.rb

@@ -152,7 +152,7 @@ class PInitType < PTypeWithContainedType
       # The Optional is the same as Variant[T,Undef].
       # The NotUndef is not meaningful to create instances of
       if @type.instance_of?(PInitType) || @type.instance_of?(POptionalType) || @type.instance_of?(PNotUndefType)
-        raise ArgumentError.new
+        raise ArgumentError
       end
 
       new_func = @type.new_function

data/lib/puppet/pops/types/p_object_type.rb

@@ -170,7 +170,7 @@ class PObjectType < PMetaType
     # @raises [Puppet::ParseError] if the assertion fails
     # @api private
     def assert_can_be_overridden(member)
-      unless self.instance_of?(member.class)
+      unless instance_of?(member.class)
         raise Puppet::ParseError, _("%{member} attempts to override %{label}") % { member: member.label, label: label }
       end
       if @final && !(constant? && member.constant?)
@@ -261,7 +261,7 @@ class PObjectType < PMetaType
     # @api private
     def create_dispatch(instance)
       # TODO: Assumes Ruby implementation for now
-      if (callable_type.is_a?(PVariantType))
+      if callable_type.is_a?(PVariantType)
         callable_type.types.map do |ct|
           Functions::Dispatch.new(ct, RubyGenerator.protect_reserved_name(name), [], false, ct.block_type.nil? ? nil : 'block')
         end
@@ -656,7 +656,7 @@ class PObjectType < PMetaType
           index = param_names.index(ip)
           if index.nil?
             raise Serialization::SerializationError,
-                  "Initializer for class #{impl_class.name} parameter '#{ip}' does not match any of the the attributes of type #{name}"
+                  "Initializer for class #{impl_class.name} parameter '#{ip}' does not match any of the attributes of type #{name}"
           end
           new_param_types << param_types[index]
         end
@@ -901,7 +901,7 @@ class PObjectType < PMetaType
       tc = TypeCalculator.singleton
       constants, others = @attributes.partition do |_, a|
         a.kind == ATTRIBUTE_KIND_CONSTANT && a.type == tc.infer(a.value).generalize
-      end.map { |ha| ha.to_h }
+      end.map(&:to_h)
 
       result[KEY_ATTRIBUTES] = compressed_members_hash(others) unless others.empty?
       unless constants.empty?
@@ -1111,7 +1111,7 @@ class PObjectType < PMetaType
   # @return [PObjectType] the topmost parent who's #equality_attributes include the given _attr_
   def find_equality_definer_of(attr)
     type = self
-    while !type.nil? do
+    until type.nil?
       p = type.resolved_parent
       return type unless p.is_a?(PObjectType)
       return type unless p.equality_attributes.include?(attr.name)

data/lib/puppet/pops/types/p_object_type_extension.rb

@@ -209,12 +209,10 @@ class PObjectTypeExtension < PAnyType
   def test_instance?(o, guard)
     eval = Parser::EvaluatingParser.singleton.evaluator
     @parameters.keys.all? do |pn|
-      begin
-        m = o.public_method(pn)
-        m.arity == 0 ? eval.match?(m.call, @parameters[pn]) : false
-      rescue NameError
-        false
-      end
+      m = o.public_method(pn)
+      m.arity == 0 ? eval.match?(m.call, @parameters[pn]) : false
+    rescue NameError
+      false
     end
   end
 

data/lib/puppet/pops/types/p_sem_ver_range_type.rb

@@ -158,7 +158,7 @@ class PSemVerRangeType < PAnyType
       end
 
       def from_hash(hash)
-        from_versions(hash['min'], hash.fetch('max') { :default }, hash.fetch('exclude_max') { false })
+        from_versions(hash['min'], hash.fetch('max', :default), hash.fetch('exclude_max', false))
       end
     end
   end

data/lib/puppet/pops/types/p_sensitive_type.rb

@@ -72,7 +72,7 @@ class PSensitiveType < PTypeWithContainedType
   private
 
   def _assignable?(o, guard)
-    self.instance_of?(o.class) && @type.assignable?(o.type, guard)
+    instance_of?(o.class) && @type.assignable?(o.type, guard)
   end
 
   DEFAULT = PSensitiveType.new

data/lib/puppet/pops/types/p_timespan_type.rb

@@ -17,7 +17,7 @@ module Types
     # @return [Boolean] `true` if this range intersects with the other range
     # @api public
     def intersect?(o)
-      self.instance_of?(o.class) && !(@to < o.numeric_from || o.numeric_to < @from)
+      instance_of?(o.class) && !(@to < o.numeric_from || o.numeric_to < @from)
     end
 
     # Returns the lower bound of the numeric range or `nil` if no lower bound is set.
@@ -94,7 +94,7 @@ module Types
     end
 
     def _assignable?(o, guard)
-      self.instance_of?(o.class) && numeric_from <= o.numeric_from && numeric_to >= o.numeric_to
+      instance_of?(o.class) && numeric_from <= o.numeric_from && numeric_to >= o.numeric_to
     end
   end
 

data/lib/puppet/pops/types/p_type_set_type.rb

@@ -183,7 +183,7 @@ class PTypeSetType < PMetaType
     result[KEY_NAME] = @name
     result[KEY_VERSION] = @version.to_s unless @version.nil?
     result[KEY_TYPES] = @types unless @types.empty?
-    result[KEY_REFERENCES] = @references.transform_values { |ref| ref._pcore_init_hash } unless @references.empty?
+    result[KEY_REFERENCES] = @references.transform_values(&:_pcore_init_hash) unless @references.empty?
     result
   end
 
@@ -359,20 +359,20 @@ class PTypeSetType < PMetaType
   end
 
   DEFAULT =
-    self
-    .new({
-           KEY_NAME => 'DefaultTypeSet',
-           KEY_NAME_AUTHORITY => Pcore::RUNTIME_NAME_AUTHORITY,
-           Pcore::KEY_PCORE_URI => Pcore::PCORE_URI,
-           Pcore::KEY_PCORE_VERSION => Pcore::PCORE_VERSION,
-           KEY_VERSION => SemanticPuppet::Version.new(0, 0, 0)
-         })
+
+    new({
+          KEY_NAME => 'DefaultTypeSet',
+          KEY_NAME_AUTHORITY => Pcore::RUNTIME_NAME_AUTHORITY,
+          Pcore::KEY_PCORE_URI => Pcore::PCORE_URI,
+          Pcore::KEY_PCORE_VERSION => Pcore::PCORE_VERSION,
+          KEY_VERSION => SemanticPuppet::Version.new(0, 0, 0)
+        })
 
   protected
 
   # @api_private
   def _assignable?(o, guard)
-    self.instance_of?(o.class) && (self == DEFAULT || eql?(o))
+    instance_of?(o.class) && (self == DEFAULT || eql?(o))
   end
 
   private

data/lib/puppet/pops/types/p_uri_type.rb

@@ -34,7 +34,7 @@ class PURIType < PAnyType
     TypeFactory.optional(PATH) => PStringType::NON_EMPTY,
     TypeFactory.optional(QUERY) => PStringType::NON_EMPTY,
     TypeFactory.optional(FRAGMENT) => PStringType::NON_EMPTY,
-    TypeFactory.optional(OPAQUE) => PStringType::NON_EMPTY,
+    TypeFactory.optional(OPAQUE) => PStringType::NON_EMPTY
   )
 
   TYPE_STRING_PARAM =
@@ -46,7 +46,7 @@ class PURIType < PAnyType
                TypeFactory.type_type(PPatternType::DEFAULT),
                TypeFactory.type_type(PEnumType::DEFAULT),
                TypeFactory.type_type(PNotUndefType::DEFAULT),
-               TypeFactory.type_type(PUndefType::DEFAULT),
+               TypeFactory.type_type(PUndefType::DEFAULT)
              ]))
 
   TYPE_INTEGER_PARAM =
@@ -55,7 +55,7 @@ class PURIType < PAnyType
         .new([
                PIntegerType.new(0),
                TypeFactory.type_type(PNotUndefType::DEFAULT),
-               TypeFactory.type_type(PUndefType::DEFAULT),
+               TypeFactory.type_type(PUndefType::DEFAULT)
              ]))
 
   TYPE_URI_PARAM_HASH_TYPE = TypeFactory.struct(
@@ -66,7 +66,7 @@ class PURIType < PAnyType
     TypeFactory.optional(PATH) => TYPE_STRING_PARAM,
     TypeFactory.optional(QUERY) => TYPE_STRING_PARAM,
     TypeFactory.optional(FRAGMENT) => TYPE_STRING_PARAM,
-    TypeFactory.optional(OPAQUE) => TYPE_STRING_PARAM,
+    TypeFactory.optional(OPAQUE) => TYPE_STRING_PARAM
   )
 
   TYPE_URI_PARAM_TYPE = PVariantType.new([PStringType::NON_EMPTY, TYPE_URI_PARAM_HASH_TYPE])

data/lib/puppet/pops/types/recursion_guard.rb

@@ -46,7 +46,7 @@ class RecursionGuard
   def with_this(instance)
     if (@state & SELF_RECURSION_IN_THIS) == 0
       tc = this_count
-      @state = @state | SELF_RECURSION_IN_THIS if this_put(instance)
+      @state |= SELF_RECURSION_IN_THIS if this_put(instance)
       if tc < this_count
         # recursive state detected
         result = yield(@state)
@@ -66,7 +66,7 @@ class RecursionGuard
   def with_that(instance)
     if (@state & SELF_RECURSION_IN_THAT) == 0
       tc = that_count
-      @state = @state | SELF_RECURSION_IN_THAT if that_put(instance)
+      @state |= SELF_RECURSION_IN_THAT if that_put(instance)
       if tc < that_count
         # recursive state detected
         result = yield(@state)
@@ -85,7 +85,7 @@ class RecursionGuard
   # @return [Integer] the resulting state
   def add_this(instance)
     if (@state & SELF_RECURSION_IN_THIS) == 0
-      @state = @state | SELF_RECURSION_IN_THIS if this_put(instance)
+      @state |= SELF_RECURSION_IN_THIS if this_put(instance)
     end
     @state
   end
@@ -95,7 +95,7 @@ class RecursionGuard
   # @return [Integer] the resulting state
   def add_that(instance)
     if (@state & SELF_RECURSION_IN_THAT) == 0
-      @state = @state | SELF_RECURSION_IN_THAT if that_put(instance)
+      @state |= SELF_RECURSION_IN_THAT if that_put(instance)
     end
     @state
   end

data/lib/puppet/pops/types/ruby_generator.rb

@@ -64,7 +64,7 @@ class RubyGenerator < TypeFormatter
         class_body(key, EMPTY_ARRAY, class_def)
         cls = Class.new(parent_class)
         cls.class_eval(class_def)
-        cls.define_singleton_method(:_pcore_type) { return key }
+        cls.define_singleton_method(:_pcore_type) { key }
         key.implementation_class = cls
       end
       hash[key] = cls
@@ -220,7 +220,7 @@ class RubyGenerator < TypeFormatter
     end
 
     init_params = others.reject { |a| a.kind == PObjectType::ATTRIBUTE_KIND_DERIVED }
-    opt, non_opt = init_params.partition { |ip| ip.value? }
+    opt, non_opt = init_params.partition(&:value?)
     derived_attrs, obj_attrs = others.select { |a| a.container.equal?(obj) }.partition { |ip| ip.kind == PObjectType::ATTRIBUTE_KIND_DERIVED }
 
     include_type = obj.equality_include_type? && !(obj.parent.is_a?(PObjectType) && obj.parent.equality_include_type?)