puppet 7.10.0-x86-mingw32 → 7.13.1-x86-mingw32

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

@@ -40,6 +40,7 @@ module Runtime3ResourceSupport
           :parameters => evaluated_parameters,
           :file => file,
           :line => line,
+          :kind => Puppet::Resource.to_kind(resolved_type),
           :exported => exported,
           :virtual => virtual,
           # WTF is this? Which source is this? The file? The name of the context ?

data/lib/puppet/pops/lookup/lookup_adapter.rb

@@ -292,7 +292,8 @@ class LookupAdapter < DataAdapter
   PROVIDER_STACK = [:lookup_global, :lookup_in_environment, :lookup_in_module].freeze
 
   def validate_lookup_options(options, module_name)
-    raise Puppet::DataBinding::LookupError.new(_("value of %{opts} must be a hash") % { opts: LOOKUP_OPTIONS }) unless options.is_a?(Hash) unless options.nil?
+    return nil if options.nil?
+    raise Puppet::DataBinding::LookupError.new(_("value of %{opts} must be a hash") % { opts: LOOKUP_OPTIONS }) unless options.is_a?(Hash)
     return options if module_name.nil?
 
     pfx = "#{module_name}::"
@@ -352,7 +353,7 @@ class LookupAdapter < DataAdapter
               module_opts = validate_lookup_options(lookup_in_module(LookupKey::LOOKUP_OPTIONS, meta_invocation, merge_strategy), module_name)
               opts = if opts.nil?
                 module_opts
-              else
+              elsif module_opts
                 merge_strategy.lookup([GLOBAL_ENV_MERGE, "Module #{lookup_invocation.module_name}"], meta_invocation) do |n|
                   meta_invocation.with(:scope, n) { meta_invocation.report_found(LOOKUP_OPTIONS,  n == GLOBAL_ENV_MERGE ? opts : module_opts) }
                 end

data/lib/puppet/pops/model/ast.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # # Generated by Puppet::Pops::Types::RubyGenerator from TypeSet Puppet::AST on -4712-01-01
 
 module Puppet

data/lib/puppet/pops/model/factory.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Factory is a helper class that makes construction of a Pops Model
 # much more convenient. It can be viewed as a small internal DSL for model
 # constructions.
@@ -11,19 +12,19 @@ module Model
 class Factory
   # Shared build_visitor, since there are many instances of Factory being used
 
-  KEY_LENGTH = 'length'.freeze
-  KEY_OFFSET = 'offset'.freeze
-  KEY_LOCATOR = 'locator'.freeze
-  KEY_OPERATOR = 'operator'.freeze
+  KEY_LENGTH = 'length'
+  KEY_OFFSET = 'offset'
+  KEY_LOCATOR = 'locator'
+  KEY_OPERATOR = 'operator'
 
-  KEY_VALUE = 'value'.freeze
-  KEY_KEYS = 'keys'.freeze
-  KEY_NAME = 'name'.freeze
-  KEY_BODY = 'body'.freeze
-  KEY_EXPR = 'expr'.freeze
-  KEY_LEFT_EXPR = 'left_expr'.freeze
-  KEY_RIGHT_EXPR = 'right_expr'.freeze
-  KEY_PARAMETERS = 'parameters'.freeze
+  KEY_VALUE = 'value'
+  KEY_KEYS = 'keys'
+  KEY_NAME = 'name'
+  KEY_BODY = 'body'
+  KEY_EXPR = 'expr'
+  KEY_LEFT_EXPR = 'left_expr'
+  KEY_RIGHT_EXPR = 'right_expr'
+  KEY_PARAMETERS = 'parameters'
 
   BUILD_VISITOR = Visitor.new(self, 'build')
   INFER_VISITOR = Visitor.new(self, 'infer')
@@ -1111,7 +1112,7 @@ class Factory
   end
 
   def self.concat(*args)
-    result = ''
+    result = ''.dup
     args.each do |e|
       if e.instance_of?(Factory) && e.model_class <= LiteralString
         result << e[KEY_VALUE]

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

@@ -11,17 +11,17 @@ class Puppet::Pops::Parser::CodeMerger
     # PUP-5299, some sites have thousands of entries, and run out of stack when evaluating - the logic
     # below maps the logic as flatly as possible.
     #
-    children = parse_results.select {|x| !x.nil? && x.code}.reduce([]) do |memo, parsed_class|
+    children = parse_results.select {|x| !x.nil? && x.code}.flat_map do |parsed_class|
       case parsed_class.code
       when Puppet::Parser::AST::BlockExpression
         # the BlockExpression wraps a single 4x instruction that is most likely wrapped in a Factory
-        memo + parsed_class.code.children.map {|c| c.is_a?(Puppet::Pops::Model::Factory) ? c.model : c }
+        parsed_class.code.children.map {|c| c.is_a?(Puppet::Pops::Model::Factory) ? c.model : c }
       when Puppet::Pops::Model::Factory
         # If it is a 4x instruction wrapped in a Factory
-        memo + parsed_class.code.model
+        parsed_class.code.model
       else
         # It is the instruction directly
-        memo << parsed_class.code
+        parsed_class.code
       end
     end
     Puppet::Parser::AST::BlockExpression.new(:children => children)

data/lib/puppet/pops/parser/egrammar.ra

@@ -863,6 +863,8 @@ keyword
   | ATTR
   | FUNCTION
   | PRIVATE
+  | PLAN
+  | APPLY
 
 nil
   : { result = nil}
@@ -870,8 +872,8 @@ nil
 end
 
 ---- header ----
-require 'puppet'
-require 'puppet/pops'
+require_relative '../../../puppet'
+require_relative '../../../puppet/pops'
 
 module Puppet
   class ParseError < Puppet::Error; end