puppet 6.26.0-x86-mingw32 → 7.0.0-x86-mingw32

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

@@ -31,7 +31,7 @@ class Puppet::Pops::Model::AstTransformer
   def ast(o, klass, hash={})
     # create and pass hash with file and line information
     # PUP-3274 - still needed since hostname transformation requires AST::HostName, and AST::Regexp
-    klass.new(**merge_location(hash, o))
+    klass.new(merge_location(hash, o))
   end
 
   # THIS IS AN EXPENSIVE OPERATION

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

@@ -1,4 +1,3 @@
-# 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.
@@ -121,13 +120,6 @@ class Factory
 
   # Building of Model classes
 
-  def build_Application(o, n, ps, body)
-    @init_hash[KEY_NAME] = n
-    @init_hash[KEY_PARAMETERS] = ps
-    b = f_build_body(body)
-    @init_hash[KEY_BODY] = b unless b.nil?
-  end
-
   def build_ArithmeticExpression(o, op, a, b)
     @init_hash[KEY_OPERATOR] = op
     build_BinaryExpression(o, a, b)
@@ -388,13 +380,6 @@ class Factory
     @init_hash['return_type'] = return_type unless return_type.nil?
   end
 
-  def build_CapabilityMapping(o, kind, component, capability, mappings)
-    @init_hash['kind'] = kind
-    @init_hash['component'] = component
-    @init_hash['capability'] = capability
-    @init_hash['mappings'] = mappings
-  end
-
   def build_NodeDefinition(o, hosts, parent, body)
     @init_hash['host_matches'] = hosts
     @init_hash['parent'] = parent unless parent.nil? # no nop here
@@ -402,11 +387,6 @@ class Factory
     @init_hash[KEY_BODY] = b unless b.nil?
   end
 
-  def build_SiteDefinition(o, body)
-    b = f_build_body(body)
-    @init_hash[KEY_BODY] = b unless b.nil?
-  end
-
   def build_Parameter(o, name, expr)
     @init_hash[KEY_NAME] = name
     @init_hash[KEY_VALUE] = expr
@@ -445,22 +425,6 @@ class Factory
     @init_hash['selectors'] = selectors
   end
 
-  # Builds a SubLocatedExpression - this wraps the expression in a sublocation configured
-  # from the given token
-  # A SubLocated holds its own locator that is used for subexpressions holding positions relative
-  # to what it describes.
-  #
-  def build_SubLocatedExpression(o, token, expression)
-    @init_hash[KEY_EXPR] = expression
-    @init_hash[KEY_OFFSET] = token.offset
-    @init_hash[KEY_LENGTH] =  token.length
-    locator = token.locator
-    @init_hash[KEY_LOCATOR] = locator
-    @init_hash['leading_line_count'] = locator.leading_line_count
-    @init_hash['leading_line_offset'] = locator.leading_line_offset
-    @init_hash['line_offsets'] = locator.line_index # index of lines in sublocated
-  end
-
   def build_SelectorEntry(o, matching, value)
     @init_hash['matching_expr'] = matching
     @init_hash['value_expr'] = value
@@ -759,8 +723,6 @@ class Factory
 
   def self.NODE(hosts, parent, body);    new(NodeDefinition, hosts, parent, body);       end
 
-  def self.SITE(body);                   new(SiteDefinition, body);                      end
-
   # Parameters
 
   # Mark parameter as capturing the rest of arguments
@@ -967,14 +929,6 @@ class Factory
     new(ResourceTypeDefinition, name, parameters, body)
   end
 
-  def self.CAPABILITY_MAPPING(kind, component, cap_name, mappings)
-    new(CapabilityMapping, kind, component, cap_name, mappings)
-  end
-
-  def self.APPLICATION(name, parameters, body)
-    new(Application, name, parameters, body)
-  end
-
   def self.PLAN(name, parameters, body)
     new(PlanDefinition, name, parameters, body, nil)
   end
@@ -1157,7 +1111,7 @@ class Factory
   end
 
   def self.concat(*args)
-    result = ''.dup
+    result = ''
     args.each do |e|
       if e.instance_of?(Factory) && e.model_class <= LiteralString
         result << e[KEY_VALUE]

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

@@ -63,7 +63,6 @@ class ModelLabelProvider
   def label_FunctionDefinition o          ; "Function Definition"               end
   def label_PlanDefinition o              ; "Plan Definition"                   end
   def label_NodeDefinition o              ; "Node Definition"                   end
-  def label_SiteDefinition o              ; "Site Definition"                   end
   def label_ResourceTypeDefinition o      ; "'define' expression"               end
   def label_ResourceOverrideExpression o  ; "Resource Override"                 end
   def label_Parameter o                   ; "Parameter Definition"              end
@@ -73,7 +72,6 @@ class ModelLabelProvider
   def label_CallNamedFunctionExpression o ; "Function Call"                     end
   def label_CallMethodExpression o        ; "Method call"                       end
   def label_ApplyExpression o             ; "'apply' expression"                end
-  def label_CapabilityMapping o           ; "Capability Mapping"                end
   def label_CaseExpression o              ; "'case' statement"                  end
   def label_CaseOption o                  ; "Case Option"                       end
   def label_RenderStringExpression o      ; "Epp Text"                          end
@@ -85,8 +83,6 @@ class ModelLabelProvider
   def label_SelectorExpression o          ; "Selector Expression"               end
   def label_SelectorEntry o               ; "Selector Option"                   end
   def label_Integer o                     ; "Integer"                           end
-  def label_Fixnum o                      ; "Integer"                           end
-  def label_Bignum o                      ; "Integer"                           end
   def label_Float o                       ; "Float"                             end
   def label_String o                      ; "String"                            end
   def label_Regexp o                      ; "Regexp"                            end
@@ -102,7 +98,6 @@ class ModelLabelProvider
   def label_TypeMapping o                 ; "Type Mapping"                      end
   def label_TypeDefinition o              ; "Type Definition"                   end
   def label_Binary o                      ; "Binary"                            end
-  def label_Application o                 ; "Application"                       end
   def label_Sensitive o                   ; "Sensitive"                         end
   def label_Timestamp o                   ; "Timestamp"                         end
   def label_Timespan o                    ; "Timespan"                          end

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

@@ -37,10 +37,6 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
     do_dump(o.model)
   end
 
-  def dump_Application o
-    ["application", o.name, do_dump(o.parameters), do_dump(o.body)]
-  end
-
   def dump_ArithmeticExpression o
     [o.operator.to_s, do_dump(o.left_expr), do_dump(o.right_expr)]
   end
@@ -251,16 +247,6 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
     result
   end
 
-  def dump_SiteDefinition o
-    result = ["site"]
-    if o.body
-      result << do_dump(o.body)
-    else
-      result << []
-    end
-    result
-  end
-
   def dump_NamedDefinition o
     # the nil must be replaced with a string
     result = [nil, o.name]
@@ -291,10 +277,6 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
     result
   end
 
-  def dump_CapabilityMapping o
-    [o.kind, do_dump(o.component), o.capability, do_dump(o.mappings)]
-  end
-
   def dump_ResourceOverrideExpression o
     form = o.form == 'regular' ? '' : o.form + '-'
     result = [form+'override', do_dump(o.resources), :indent]
@@ -441,10 +423,6 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
     [do_dump(o.matching_expr), "=>", do_dump(o.value_expr)]
   end
 
-  def dump_SubLocatedExpression o
-    ["sublocated", do_dump(o.expr)]
-  end
-
   def dump_TypeAlias(o)
     ['type-alias', o.name, do_dump(o.type_expr)]
   end

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

@@ -27,10 +27,6 @@ class PNTransformer
     binary_op(e, 'and')
   end
 
-  def transform_Application(e)
-    definition_to_pn(e, 'application')
-  end
-
   def transform_ArithmeticExpression(e)
     binary_op(e, e.operator)
   end
@@ -67,10 +63,6 @@ class PNTransformer
     call_to_pn(e, 'call', 'invoke')
   end
 
-  def transform_CapabilityMapping(e)
-    PN::Call.new(e.kind, transform(e.component), PN::List.new([PN::Literal.new(e.capability)] + pn_array(e.mappings)))
-  end
-
   def transform_CaseExpression(e)
     PN::Call.new('case', transform(e.test), transform(e.options))
   end
@@ -293,14 +285,6 @@ class PNTransformer
     PN::Call.new('?', transform(e.left_expr), transform(e.selectors))
   end
 
-  def transform_SiteDefinition(e)
-    transform(e.body).as_call('site')
-  end
-
-  def transform_SubLocatedExpression(e)
-    transform(e.expr)
-  end
-
   def transform_TextExpression(e)
     PN::Call.new('str', transform(e.expr))
   end

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}.flat_map do |parsed_class|
+    children = parse_results.select {|x| !x.nil? && x.code}.reduce([]) do |memo, 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
-        parsed_class.code.children.map {|c| c.is_a?(Puppet::Pops::Model::Factory) ? c.model : c }
+        memo + 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
-        parsed_class.code.model
+        memo + parsed_class.code.model
       else
         # It is the instruction directly
-        parsed_class.code
+        memo << parsed_class.code
       end
     end
     Puppet::Parser::AST::BlockExpression.new(:children => children)

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

@@ -22,7 +22,6 @@ token RENDER_STRING RENDER_EXPR EPP_START EPP_END EPP_END_TRIM
 token FUNCTION
 token TYPE
 token PRIVATE ATTR
-token APPLICATION PRODUCES CONSUMES SITE
 token PLAN APPLY
 token LOW
 
@@ -200,7 +199,6 @@ resource
 #
 expression
   : primary_expression
-  | capability_mapping
   | call_function_expression
   | bracketed_expression
   | expression IN           expression                 { result = val[0].in val[2]        ; loc result, val[1] }
@@ -257,12 +255,10 @@ primary_expression
   | if_expression
   | unless_expression
   | definition_expression
-  | application_expression
   | hostclass_expression
   | plan_expression
   | apply_expression
   | node_definition_expression
-  | site_definition_expression
   | epp_render_expression
   | function_definition
   | type_alias
@@ -520,34 +516,6 @@ definition_expression
       end
     }
 
-#---APPLICATION
-application_expression
-  : APPLICATION classname parameter_list LBRACE opt_statements RBRACE {
-    definition = Factory.APPLICATION(classname(val[1][:value]), val[2], val[4])
-    loc(definition, val[0], val[5])
-    result = add_definition(definition)
-  }
-
-capability_mapping
-  : classname capability_kw classname LBRACE  attribute_operations endcomma RBRACE {
-    result = Factory.CAPABILITY_MAPPING(val[1][:value],
-                                        Factory.QREF(classname(val[0][:value])),
-                                        classname(val[2][:value]), val[4])
-    loc result, val[0], val[6]
-    add_mapping(result)
-  }
-  | bracketed_expression capability_kw classname LBRACE  attribute_operations endcomma RBRACE {
-    result = Factory.CAPABILITY_MAPPING(val[1][:value],
-                                        val[0],
-                                        classname(val[2][:value]), val[4])
-    loc result, val[0], val[6]
-    add_mapping(result)
-  }
-
-capability_kw
-  : PRODUCES
-  | CONSUMES
-
 #--PLAN
 plan_expression
   : PLAN stacked_classname parameter_list LBRACE opt_statements RBRACE {
@@ -605,22 +573,6 @@ hostclass_expression
     : classname
     | DEFAULT
 
-#---SITE
-#
-# Produces Model::SiteDefinition
-#
-site_definition_expression
-  : SITE LBRACE statements RBRACE {
-    definition = Factory.SITE(val[2])
-    loc(definition, val[0], val[3])
-    result = add_definition(definition)
-    }
-  | SITE LBRACE RBRACE {
-    definition = Factory.SITE(nil)
-    loc(definition, val[0], val[2])
-    result = add_definition(definition)
-    }
-
 #---NODE
 #
 # Produces Model::NodeDefinition
@@ -828,10 +780,6 @@ collection_entries
 collection_entry_keyword
   : TYPE
   | FUNCTION
-  | APPLICATION
-  | CONSUMES
-  | PRODUCES
-  | SITE
 
 quotedtext
   : string
@@ -915,12 +863,6 @@ keyword
   | ATTR
   | FUNCTION
   | PRIVATE
-  | APPLICATION
-  | CONSUMES
-  | PRODUCES
-  | SITE
-  | PLAN
-  | APPLY
 
 nil
   : { result = nil}