puppet 8.4.0-x64-mingw32 → 8.5.1-x64-mingw32

data/lib/puppet/pops/evaluator/json_strict_literal_evaluator.rb

@@ -70,15 +70,14 @@ class Puppet::Pops::Evaluator::JsonStrictLiteralEvaluator
   end
 
   def literal_LiteralList(o)
-    o.values.map {|v| literal(v) }
+    o.values.map { |v| literal(v) }
   end
 
   def literal_LiteralHash(o)
-    o.entries.reduce({}) do |result, entry|
+    o.entries.each_with_object({}) do |entry, result|
       key = literal(entry.key)
       throw :not_literal unless key.is_a?(String)
       result[key] = literal(entry.value)
-      result
     end
   end
 end

data/lib/puppet/pops/evaluator/literal_evaluator.rb

@@ -12,9 +12,8 @@ module Evaluator
 # QualifiedName
 # Default (produced :default)
 # Regular Expression (produces ruby regular expression)
-#
-# Not considered literal
-# QualifiedReference  # i.e. File, FooBar
+# QualifiedReference
+# AccessExpresion
 #
 class LiteralEvaluator
   COMMA_SEPARATOR = ', '
@@ -67,6 +66,20 @@ class LiteralEvaluator
     o.value
   end
 
+  def literal_QualifiedReference(o)
+    o.value
+  end
+
+  def literal_AccessExpression(o)
+    # to prevent parameters with [[]] like Optional[[String]]
+    throw :not_literal if o.keys.size == 1 && o.keys[0].is_a?(Model::LiteralList)
+    o.keys.map { |v| literal(v) }
+  end
+
+  def literal_UnaryMinusExpression(o)
+    -literal(o.expr)
+  end
+
   def literal_ConcatenatedString(o)
     # use double quoted string value if there is no interpolation
     throw :not_literal unless o.segments.size == 1 && o.segments[0].is_a?(Model::LiteralString)
@@ -74,13 +87,12 @@ class LiteralEvaluator
   end
 
   def literal_LiteralList(o)
-    o.values.map {|v| literal(v) }
+    o.values.map { |v| literal(v) }
   end
 
   def literal_LiteralHash(o)
-    o.entries.reduce({}) do |result, entry|
+    o.entries.each_with_object({}) do |entry, result|
       result[literal(entry.key)] = literal(entry.value)
-      result
     end
   end
 end

data/lib/puppet/pops/evaluator/puppet_proc.rb

@@ -49,11 +49,11 @@ class Puppet::Pops::Evaluator::PuppetProc < Proc
     @closure.parameters.map do |param|
       sym = param.name.to_sym
       if param.captures_rest
-        [ :rest, sym ]
+        [:rest, sym]
       elsif param.value
-        [ :opt, sym ]
+        [:opt, sym]
       else
-        [ :req, sym ]
+        [:req, sym]
       end
     end
   end

data/lib/puppet/pops/evaluator/relationship_operator.rb

@@ -90,7 +90,7 @@ class RelationshipOperator
 
   # Array content needs to be transformed
   def transform_Array(o, scope)
-    o.map{|x| transform(x, scope) }
+    o.map { |x| transform(x, scope) }
   end
 
   # Asserts (and returns) the type if it is a PCatalogEntryType
@@ -127,7 +127,7 @@ class RelationshipOperator
     # assert operator (should have been validated, but this logic makes assumptions which would
     # screw things up royally). Better safe than sorry.
     unless RELATIONSHIP_OPERATORS.include?(relationship_expression.operator)
-      fail(Issues::UNSUPPORTED_OPERATOR, relationship_expression, {:operator => relationship_expression.operator})
+      fail(Issues::UNSUPPORTED_OPERATOR, relationship_expression, { :operator => relationship_expression.operator })
     end
 
     begin
@@ -143,7 +143,7 @@ class RelationshipOperator
       # into an array, and thus the resulting left and right must be flattened individually
       # Once flattened, the operands should be sets (to remove duplicate entries)
       #
-      real = left_right_evaluated.collect {|x| [x].flatten.collect {|y| transform(y, scope) }}
+      real = left_right_evaluated.collect { |x| [x].flatten.collect { |y| transform(y, scope) } }
       real[0].flatten!
       real[1].flatten!
       real[0].uniq!
@@ -153,7 +153,7 @@ class RelationshipOperator
       source, target = reverse_operator?(relationship_expression) ? real.reverse : real
 
       # Add the relationships to the catalog
-      source.each {|s| target.each {|t| add_relationship(s, t, RELATION_TYPE[relationship_expression.operator], scope) }}
+      source.each { |s| target.each { |t| add_relationship(s, t, RELATION_TYPE[relationship_expression.operator], scope) } }
 
       # The result is the transformed source RHS unless it is empty, in which case the transformed LHS is returned.
       # This closes the gap created by an empty set of references in a chain of relationship
@@ -174,9 +174,9 @@ class RelationshipOperator
       end
       result
     rescue NotCatalogTypeError => e
-      fail(Issues::NOT_CATALOG_TYPE, relationship_expression, {:type => @type_calculator.string(e.type)})
+      fail(Issues::NOT_CATALOG_TYPE, relationship_expression, { :type => @type_calculator.string(e.type) })
     rescue IllegalRelationshipOperandError => e
-      fail(Issues::ILLEGAL_RELATIONSHIP_OPERAND_TYPE, relationship_expression, {:operand => e.operand})
+      fail(Issues::ILLEGAL_RELATIONSHIP_OPERAND_TYPE, relationship_expression, { :operand => e.operand })
     end
   end
 

data/lib/puppet/pops/evaluator/runtime3_converter.rb

@@ -48,7 +48,7 @@ class Runtime3Converter
   # @return [Array] The converted values
   #
   def map_args(args, scope, undef_value)
-    args.map {|a| convert(a, scope, undef_value) }
+    args.map { |a| convert(a, scope, undef_value) }
   end
 
   # Converts a 4x supported value to a 3x value.
@@ -94,13 +94,13 @@ class Runtime3Converter
 
   def convert_Array(o, scope, undef_value)
     ic = @inner_converter
-    o.map {|x| ic.convert(x, scope, undef_value) }
+    o.map { |x| ic.convert(x, scope, undef_value) }
   end
 
   def convert_Hash(o, scope, undef_value)
     result = {}
     ic = @inner_converter
-    o.each {|k,v| result[ic.convert(k, scope, undef_value)] = ic.convert(v, scope, undef_value) }
+    o.each { |k, v| result[ic.convert(k, scope, undef_value)] = ic.convert(v, scope, undef_value) }
     result
   end
 
@@ -153,7 +153,7 @@ class Runtime3Converter
     else
       # TRANSLATORS 'PClassType' and 'PResourceType' are Puppet types and should not be translated
       raise ArgumentError, _("Cannot split the type %{class_name}, it represents neither a PClassType, nor a PResourceType.") %
-          { class_name: catalog_type.class }
+                           { class_name: catalog_type.class }
     end
   end
 
@@ -206,13 +206,14 @@ class Runtime3FunctionArgumentConverter < Runtime3Converter
   # Converts result back to 4.x by replacing :undef with nil in Array and Hash objects
   #
   def self.convert_return(val3x)
-    if val3x == :undef
+    case val3x
+    when :undef
       nil
-    elsif val3x.is_a?(Array)
-      val3x.map {|v| convert_return(v) }
-    elsif val3x.is_a?(Hash)
+    when Array
+      val3x.map { |v| convert_return(v) }
+    when Hash
       hsh = {}
-      val3x.each_pair {|k,v| hsh[convert_return(k)] = convert_return(v)}
+      val3x.each_pair { |k, v| hsh[convert_return(k)] = convert_return(v) }
       hsh
     else
       val3x

data/lib/puppet/pops/evaluator/runtime3_support.rb

@@ -18,7 +18,7 @@ module Runtime3Support
   # @return [!] this method does not return
   # @raise [Puppet::ParseError] an evaluation error initialized from the arguments (TODO: Change to EvaluationError?)
   #
-  def fail(issue, semantic, options={}, except=nil)
+  def fail(issue, semantic, options = {}, except = nil)
     optionally_fail(issue, semantic, options, except)
     # an error should have been raised since fail always fails
     raise ArgumentError, _("Internal Error: Configuration of runtime error handling wrong: should have raised exception")
@@ -33,7 +33,7 @@ module Runtime3Support
   # @return [!] this method does not return
   # @raise [Puppet::ParseError] an evaluation error initialized from the arguments (TODO: Change to EvaluationError?)
   #
-  def optionally_fail(issue, semantic, options={}, except=nil)
+  def optionally_fail(issue, semantic, options = {}, except = nil)
     if except.nil? && diagnostic_producer.severity_producer[issue] == :error
       # Want a stacktrace, and it must be passed as an exception
       begin
@@ -54,12 +54,12 @@ module Runtime3Support
   # @return [!] this method may not return, nil if it does
   # @raise [Puppet::ParseError] an evaluation error initialized from the arguments
   #
-  def runtime_issue(issue, options={})
+  def runtime_issue(issue, options = {})
     # Get position from puppet runtime stack
     file, line = Puppet::Pops::PuppetStack.top_of_stack
 
     # Use a SemanticError as the sourcepos
-    semantic = Puppet::Pops::SemanticError.new(issue, nil, options.merge({:file => file, :line => line}))
+    semantic = Puppet::Pops::SemanticError.new(issue, nil, options.merge({ :file => file, :line => line }))
     optionally_fail(issue, semantic)
     nil
   end
@@ -80,14 +80,14 @@ module Runtime3Support
     # TODO: Improve the messy implementation in Scope.
     #
     if name == "server_facts"
-      fail(Issues::ILLEGAL_RESERVED_ASSIGNMENT, o, {:name => name} )
+      fail(Issues::ILLEGAL_RESERVED_ASSIGNMENT, o, { :name => name })
     end
 
     if scope.bound?(name)
       if Puppet::Parser::Scope::RESERVED_VARIABLE_NAMES.include?(name)
-        fail(Issues::ILLEGAL_RESERVED_ASSIGNMENT, o, {:name => name} )
+        fail(Issues::ILLEGAL_RESERVED_ASSIGNMENT, o, { :name => name })
       else
-        fail(Issues::ILLEGAL_REASSIGNMENT, o, {:name => name} )
+        fail(Issues::ILLEGAL_REASSIGNMENT, o, { :name => name })
       end
     end
     scope.setvar(name, value)
@@ -110,7 +110,7 @@ module Runtime3Support
     # if not set by a match expression.
     #
     unless name =~ Puppet::Pops::Patterns::NUMERIC_VAR_NAME
-      optionally_fail(Puppet::Pops::Issues::UNKNOWN_VARIABLE, o, {:name => name})
+      optionally_fail(Puppet::Pops::Issues::UNKNOWN_VARIABLE, o, { :name => name })
     end
     nil # in case unknown variable is configured as a warning or ignore
   end
@@ -257,11 +257,11 @@ module Runtime3Support
 
     n = Utils.to_n(v)
     unless n
-      fail(Issues::NOT_NUMERIC, o, {:value => v})
+      fail(Issues::NOT_NUMERIC, o, { :value => v })
     end
 
     # this point is reached if there was a conversion
-    optionally_fail(Issues::NUMERIC_COERCION, o, {:before => v, :after => n})
+    optionally_fail(Issues::NUMERIC_COERCION, o, { :before => v, :after => n })
     n
   end
 
@@ -310,7 +310,7 @@ module Runtime3Support
       end
     end
     # Call via 3x API if function exists there without having been autoloaded
-    fail(Issues::UNKNOWN_FUNCTION, o, {:name => name}) unless Puppet::Parser::Functions.function(name)
+    fail(Issues::UNKNOWN_FUNCTION, o, { :name => name }) unless Puppet::Parser::Functions.function(name)
 
     # Arguments must be mapped since functions are unaware of the new and magical creatures in 4x.
     # NOTE: Passing an empty string last converts nil/:undef to empty string
@@ -375,7 +375,7 @@ module Runtime3Support
     evaluated_parameters = evaluated_parameters.flatten
     evaluated_resources.each do |r|
       unless r.is_a?(Types::PResourceType) && r.type_name != 'class'
-        fail(Issues::ILLEGAL_OVERRIDDEN_TYPE, o, {:actual => r} )
+        fail(Issues::ILLEGAL_OVERRIDDEN_TYPE, o, { :actual => r })
       end
 
       t = Runtime3ResourceSupport.find_resource_type(scope, r.type_name)
@@ -474,7 +474,8 @@ module Runtime3Support
     Validation::DiagnosticProducer.new(
       ExceptionRaisingAcceptor.new(), # Raises exception on all issues
       SeverityProducer.new(), # All issues are errors
-      Model::ModelLabelProvider.new())
+      Model::ModelLabelProvider.new()
+    )
   end
 
   # Configure the severity of failures
@@ -517,7 +518,7 @@ module Runtime3Support
       super
       IssueReporter.assert_and_report(self, {
                                         :message => "Evaluation Error:",
-                                        :emit_warnings => true,  # log warnings
+                                        :emit_warnings => true, # log warnings
                                         :exception_class => Puppet::PreformattedError
                                       })
       if errors?

data/lib/puppet/pops/functions/dispatch.rb

@@ -90,15 +90,13 @@ class Dispatch < Evaluator::CallableSignature
             else
               raise ArgumentError, _("Unknown injection %{injection_name}") % { injection_name: injection_name }
             end
-        else
+        elsif knit < 0
           # Careful so no new nil arguments are added since they would override default
           # parameter values in the received
-          if knit < 0
-            idx = -knit - 1
-            new_args += args[idx..-1] if idx < args.size
-          else
-            new_args << args[knit] if knit < args.size
-          end
+          idx = -knit - 1
+          new_args += args[idx..] if idx < args.size
+        elsif knit < args.size
+          new_args << args[knit]
         end
       end
       new_args

data/lib/puppet/pops/functions/dispatcher.rb

@@ -9,8 +9,8 @@ class Puppet::Pops::Functions::Dispatcher
   attr_reader :dispatchers
 
   # @api private
-  def initialize()
-    @dispatchers = [ ]
+  def initialize
+    @dispatchers = []
   end
 
   # Answers if dispatching has been defined
@@ -58,11 +58,11 @@ class Puppet::Pops::Functions::Dispatcher
   # Produces a CallableType for a single signature, and a Variant[<callables>] otherwise
   #
   # @api private
-  def to_type()
+  def to_type
     # make a copy to make sure it can be contained by someone else (even if it is not contained here, it
     # should be treated as immutable).
     #
-    callables = dispatchers.map { | dispatch | dispatch.type }
+    callables = dispatchers.map { |dispatch| dispatch.type }
 
     # multiple signatures, produce a Variant type of Callable1-n (must copy them)
     # single signature, produce single Callable

data/lib/puppet/pops/functions/function.rb

@@ -109,7 +109,7 @@ class Puppet::Pops::Functions::Function
     the_loader = loader
     unless the_loader
       raise ArgumentError, _("Function %{class_name}(): cannot call function '%{function_name}' - no loader specified") %
-          { class_name: self.class.name, function_name: function_name }
+                           { class_name: self.class.name, function_name: function_name }
     end
 
     func = the_loader.load(:function, function_name)
@@ -125,7 +125,7 @@ class Puppet::Pops::Functions::Function
     func_3x = Puppet::Parser::Functions.function(function_name, loader_scope.environment) if loader_scope.is_a?(Puppet::Parser::Scope)
     unless func_3x
       raise ArgumentError, _("Function %{class_name}(): Unknown function: '%{function_name}'") %
-          { class_name: self.class.name, function_name: function_name }
+                           { class_name: self.class.name, function_name: function_name }
     end
 
     # Call via 3x API

data/lib/puppet/pops/issue_reporter.rb

@@ -72,10 +72,10 @@ class IssueReporter
       end
       giving_up_message = if (emit_warnings && warnings.size > 0)
                             _("Language validation logged %{error_count} errors, and %{warning_count} warnings. Giving up") %
-                                { error_count: errors.size, warning_count: warnings.size }
+                              { error_count: errors.size, warning_count: warnings.size }
                           else
                             _("Language validation logged %{error_count} errors. Giving up") %
-                                { error_count: errors.size }
+                              { error_count: errors.size }
                           end
       exception = emit_exception.new(giving_up_message)
       exception.file = errors[0].file
@@ -137,4 +137,4 @@ class IssueReporter
   end
   private_class_method :log_message
 end
-end
+end

data/lib/puppet/pops/issues.rb

@@ -44,7 +44,7 @@ module Issues
     # in the given `hash`.
     # @api public
     #
-    def format(hash ={})
+    def format(hash = {})
       # Create a Message Data where all hash keys become methods for convenient interpolation
       # in issue text.
       msgdata = MessageData.new(*arg_names)
@@ -211,6 +211,10 @@ module Issues
     _("The numeric parameter name '$%{name}' cannot be used (clashes with numeric match result variables)") % { name: name }
   end
 
+  ILLEGAL_NONLITERAL_PARAMETER_TYPE = issue :ILLEGAL_NONLITERAL_PARAMETER_TYPE, :name, :type_class do
+    _("The parameter '$%{name}' must be a literal type, not %{type_class}") % { name: name, type_class: label.a_an(type_class) }
+  end
+
   # In certain versions of Puppet it may be allowed to assign to a not already assigned key
   # in an array or a hash. This is an optional validation that may be turned on to prevent accidental
   # mutation.

data/lib/puppet/pops/label_provider.rb

@@ -69,9 +69,9 @@ module Puppet::Pops::LabelProvider
   private
 
   def first_letter_of(string)
-    char = string[0,1]
+    char = string[0, 1]
     if SKIPPED_CHARACTERS.include? char
-      char = string[1,1]
+      char = string[1, 1]
     end
 
     if char == ""

data/lib/puppet/pops/loader/base_loader.rb

@@ -149,7 +149,7 @@ class BaseLoader < Loader
   end
 
   def format_uri(uri)
-    (uri.scheme == 'puppet' ? 'by ' : 'at ') + uri.to_s.sub(/^puppet:/,'')
+    (uri.scheme == 'puppet' ? 'by ' : 'at ') + uri.to_s.sub(/^puppet:/, '')
   end
 
   # loads in priority order:
@@ -176,4 +176,3 @@ class BaseLoader < Loader
 end
 end
 end
-

data/lib/puppet/pops/loader/dependency_loader.rb

@@ -62,7 +62,7 @@ class Puppet::Pops::Loader::DependencyLoader < Puppet::Pops::Loader::BaseLoader
   end
 
   def to_s
-    "(DependencyLoader '#{@loader_name}' [" + @dependency_loaders.map {|loader| loader.to_s }.join(' ,') + "])"
+    "(DependencyLoader '#{@loader_name}' [" + @dependency_loaders.map { |loader| loader.to_s }.join(' ,') + "])"
   end
 
   private
@@ -90,6 +90,6 @@ class Puppet::Pops::Loader::DependencyLoader < Puppet::Pops::Loader::BaseLoader
 
   # An index of module_name to module loader used to speed up lookup of qualified names
   def index
-    @index ||= @dependency_loaders.reduce({}) { |index, loader| index[loader.module_name] = loader; index }
+    @index ||= @dependency_loaders.each_with_object({}) { |loader, index| index[loader.module_name] = loader; }
   end
 end

data/lib/puppet/pops/loader/gem_support.rb

@@ -51,4 +51,4 @@ module Puppet::Pops::Loader::GemSupport
 
     spec.full_gem_path
   end
-end
+end

data/lib/puppet/pops/loader/loader_paths.rb

@@ -90,7 +90,7 @@ module LoaderPaths
       n = ''.dup
       unless extension.empty?
         # Remove extension
-        relative_path = relative_path[0..-(extension.length+1)]
+        relative_path = relative_path[0..-(extension.length + 1)]
       end
       relative_path.split('/').each do |segment|
         n << '::' if n.size > 0
@@ -147,7 +147,7 @@ module LoaderPaths
       if start_index_in_name > 0
         return nil if start_index_in_name >= parts.size
 
-        parts = parts[start_index_in_name..-1]
+        parts = parts[start_index_in_name..]
       end
       "#{File.join(generic_path, parts)}#{extension}"
     end
@@ -157,7 +157,7 @@ module LoaderPaths
       n << module_name unless module_name.nil?
       unless extension.empty?
         # Remove extension
-        relative_path = relative_path[0..-(extension.length+1)]
+        relative_path = relative_path[0..-(extension.length + 1)]
       end
       relative_path.split('/').each do |segment|
         n << '::' if n.size > 0
@@ -335,7 +335,7 @@ module LoaderPaths
       PLAN_PATH
     end
 
-    def instantiator()
+    def instantiator
       Puppet::Pops::Loader::GenericPlanInstantiator
     end
 
@@ -354,7 +354,7 @@ module LoaderPaths
         n = ''.dup
         n << module_name unless module_name.nil?
         ext = @extensions.find { |extension| relative_path.end_with?(extension) }
-        relative_path = relative_path[0..-(ext.length+1)]
+        relative_path = relative_path[0..-(ext.length + 1)]
 
         relative_path.split('/').each do |segment|
           n << '::' if n.size > 0
@@ -371,7 +371,7 @@ module LoaderPaths
       if start_index_in_name > 0
         return nil if start_index_in_name >= parts.size
 
-        parts = parts[start_index_in_name..-1]
+        parts = parts[start_index_in_name..]
       end
       basename = File.join(generic_path, parts)
       @extensions.map { |ext| "#{basename}#{ext}" }
@@ -411,4 +411,3 @@ module LoaderPaths
 end
 end
 end
-

data/lib/puppet/pops/loader/module_loaders.rb

@@ -34,8 +34,7 @@ module ModuleLoaders
                            NAMESPACE_WILDCARD,
                            Puppet[:libdir],
                            'cached_puppet_lib',
-                           [:func_4x, :func_3x, :datatype]
-                          )
+                           [:func_4x, :func_3x, :datatype])
   end
 
   def self.system_loader_from(parent_loader, loaders)
@@ -50,8 +49,7 @@ module ModuleLoaders
                            nil,
                            puppet_lib, # may or may not have a 'lib' above 'puppet'
                            'puppet_system',
-                           [:func_4x, :func_3x, :datatype] # only load ruby functions and types from "puppet"
-                          )
+                           [:func_4x, :func_3x, :datatype]) # only load ruby functions and types from "puppet"
   end
 
   def self.environment_loader_from(parent_loader, loaders, env_path)
@@ -62,8 +60,7 @@ module ModuleLoaders
                     loaders,
                     ENVIRONMENT,
                     env_path,
-                    ENVIRONMENT
-                   )
+                    ENVIRONMENT)
     end
   end
 
@@ -72,8 +69,7 @@ module ModuleLoaders
                                  loaders,
                                  module_name,
                                  module_path,
-                                 module_name
-                                )
+                                 module_name)
   end
 
   def self.pcore_resource_type_loader_from(parent_loader, loaders, environment_path)
@@ -81,8 +77,7 @@ module ModuleLoaders
                                  loaders,
                                  nil,
                                  environment_path,
-                                 'pcore_resource_types'
-                                )
+                                 'pcore_resource_types')
   end
 
   class EmptyLoader < BaseLoader
@@ -163,7 +158,8 @@ module ModuleLoaders
                   Issues::LOADER_FAILURE.format(:type => type),
                   'PUPPET_LOADER_FAILURE',
                   { 'original_error' => e.message },
-                  Issues::LOADER_FAILURE.issue_code)
+                  Issues::LOADER_FAILURE.issue_code
+                )
                 error_collector << err unless error_collector.include?(err)
               end
             end
@@ -243,7 +239,7 @@ module ModuleLoaders
 
             # TRANSLATORS 'TypeSet' should not be translated
             raise ArgumentError, _("The code loaded from %{origin} does not define the TypeSet '%{module_name}'") %
-                { origin: origin, module_name: name_parts[0].capitalize }
+                                 { origin: origin, module_name: name_parts[0].capitalize }
           end
         else
           # anything else cannot possibly be in this module
@@ -413,12 +409,11 @@ module ModuleLoaders
             # whichever ones exist. Otherwise, find all paths that *might* be
             # related to origin
             if origin.is_a?(Array)
-              origins = origin.map { |ori| existing_path(ori) }.compact
-              return [origins, sp] unless origins.empty?
+              origins = origin.filter_map { |ori| existing_path(ori) }
             else
               origins = candidate_paths(origin)
-              return [origins, sp] unless origins.empty?
             end
+            return [origins, sp] unless origins.empty?
           else
             existing = existing_path(origin)
             return [origin, sp] unless existing.nil?
@@ -469,10 +464,10 @@ module ModuleLoaders
     end
 
     def meaningful_to_search?(smart_path)
-      ! add_to_index(smart_path).empty?
+      !add_to_index(smart_path).empty?
     end
 
-    def to_s()
+    def to_s
       "(ModuleLoader::FileBased '#{loader_name}' '#{module_name}')"
     end
 
@@ -548,7 +543,7 @@ module ModuleLoaders
       super parent_loader, loaders, module_name, gem_dir(gem_ref), loader_name, loadables
     end
 
-    def to_s()
+    def to_s
       "(ModuleLoader::GemBased '#{loader_name}' '#{@gem_ref}' [#{module_name}])"
     end
   end

data/lib/puppet/pops/loader/predefined_loader.rb

@@ -9,7 +9,7 @@ class PredefinedLoader < BaseLoader
     nil
   end
 
-  def to_s()
+  def to_s
     "(PredefinedLoader '#{loader_name}')"
   end
 

data/lib/puppet/pops/loader/puppet_function_instantiator.rb

@@ -79,7 +79,8 @@ class PuppetFunctionInstantiator
       # TODO: should not create a new evaluator per function
       init_dispatch(Evaluator::Closure::Named.new(
                       function_definition.name,
-                      Evaluator::EvaluatorImpl.new(), function_definition))
+                      Evaluator::EvaluatorImpl.new(), function_definition
+                    ))
     end
   end
 end

data/lib/puppet/pops/loader/puppet_plan_instantiator.rb

@@ -88,7 +88,8 @@ class PuppetPlanInstantiator
       # TODO: should not create a new evaluator per function
       init_dispatch(Evaluator::Closure::Named.new(
                       plan_definition.name,
-                      Evaluator::EvaluatorImpl.new(), plan_definition))
+                      Evaluator::EvaluatorImpl.new(), plan_definition
+                    ))
     end
   end
 end

data/lib/puppet/pops/loader/puppet_resource_type_impl_instantiator.rb

@@ -40,10 +40,10 @@ class PuppetResourceTypeImplInstantiator
       if s.is_a?(Model::CallMethodExpression)
         functor_expr = s.functor_expr
         functor_expr.is_a?(Model::NamedAccessExpression) &&
-          functor_expr.left_expr.is_a?(Model::QualifiedReference) &&
-          functor_expr.left_expr.cased_value == rname &&
-          functor_expr.right_expr.is_a?(Model::QualifiedName) &&
-          functor_expr.right_expr.value == 'new'
+        functor_expr.left_expr.is_a?(Model::QualifiedReference) &&
+        functor_expr.left_expr.cased_value == rname &&
+        functor_expr.right_expr.is_a?(Model::QualifiedName) &&
+        functor_expr.right_expr.value == 'new'
       else
         false
       end