openvox 7.37.1 → 8.19.0

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/parser/ast'
 
 # The receiver of `import(file)` calls; once per imported file, or nil if imports are ignored
@@ -10,10 +12,11 @@ class Puppet::Pops::Model::AstTransformer
   Model = Puppet::Pops::Model
 
   attr_reader :importer
-  def initialize(source_file = "unknown-file", importer=nil)
-    @@transform_visitor ||= Puppet::Pops::Visitor.new(nil,"transform",0,0)
-    @@query_transform_visitor ||= Puppet::Pops::Visitor.new(nil,"query",0,0)
-    @@hostname_transform_visitor ||= Puppet::Pops::Visitor.new(nil,"hostname",0,0)
+
+  def initialize(source_file = "unknown-file", importer = nil)
+    @@transform_visitor ||= Puppet::Pops::Visitor.new(nil, "transform", 0, 0)
+    @@query_transform_visitor ||= Puppet::Pops::Visitor.new(nil, "query", 0, 0)
+    @@hostname_transform_visitor ||= Puppet::Pops::Visitor.new(nil, "hostname", 0, 0)
     @importer = importer
     @source_file = source_file
   end
@@ -28,7 +31,7 @@ class Puppet::Pops::Model::AstTransformer
   # @param klass [Class<Puppet::Parser::AST>] the ast class to create an instance of
   # @param hash [Hash] hash with options for the class to create
   #
-  def ast(o, klass, hash={})
+  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))
@@ -58,14 +61,12 @@ class Puppet::Pops::Model::AstTransformer
 
   # Transforms pops expressions into AST 3.1 statements/expressions
   def transform(o)
-    begin
-    @@transform_visitor.visit_this_0(self,o)
-    rescue StandardError => e
-      loc_data = {}
-      merge_location(loc_data, o)
-      raise Puppet::ParseError.new(_("Error while transforming to Puppet 3 AST: %{message}") % { message: e.message },
-        loc_data[:file], loc_data[:line], loc_data[:pos], e)
-    end
+    @@transform_visitor.visit_this_0(self, o)
+  rescue StandardError => e
+    loc_data = {}
+    merge_location(loc_data, o)
+    raise Puppet::ParseError.new(_("Error while transforming to Puppet 3 AST: %{message}") % { message: e.message },
+                                 loc_data[:file], loc_data[:line], loc_data[:pos], e)
   end
 
   # Transforms pops expressions into AST 3.1 query expressions
@@ -78,7 +79,6 @@ class Puppet::Pops::Model::AstTransformer
     @@hostname_transform_visitor.visit_this_0(self, o)
   end
 
-
   # Ensures transformation fails if a 3.1 non supported object is encountered in a query expression
   #
   def query_Object(o)
@@ -87,15 +87,15 @@ class Puppet::Pops::Model::AstTransformer
 
   # Transforms Array of host matching expressions into a (Ruby) array of AST::HostName
   def hostname_Array(o)
-    o.collect {|x| ast x, AST::HostName, :value => hostname(x) }
+    o.collect { |x| ast x, AST::HostName, :value => hostname(x) }
   end
 
   def hostname_LiteralValue(o)
-    return o.value
+    o.value
   end
 
   def hostname_QualifiedName(o)
-    return o.value
+    o.value
   end
 
   def hostname_LiteralNumber(o)
@@ -103,7 +103,7 @@ class Puppet::Pops::Model::AstTransformer
   end
 
   def hostname_LiteralDefault(o)
-    return 'default'
+    'default'
   end
 
   def hostname_LiteralRegularExpression(o)

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

@@ -1,4 +1,5 @@
 # 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.
@@ -115,7 +116,7 @@ class Factory
   end
 
   # Polymorphic interpolate
-  def interpolate()
+  def interpolate
     INTERPOLATION_VISITOR.visit_this_class(self, @model_class, EMPTY_ARRAY)
   end
 
@@ -334,7 +335,7 @@ class Factory
   #
   def infer_Hash(o)
     @model_class = LiteralHash
-    @init_hash['entries'] = o.sort_by { |k,_| k.to_s }.map { |k, v| Factory.new(KeyedEntry, Factory.infer(k), Factory.infer(v)) }
+    @init_hash['entries'] = o.sort_by { |k, _| k.to_s }.map { |k, v| Factory.new(KeyedEntry, Factory.infer(k), Factory.infer(v)) }
     @unfolded = false
   end
 
@@ -373,7 +374,7 @@ class Factory
     @init_hash['return_type'] = return_type unless return_type.nil?
   end
 
-  def build_PlanDefinition(o, name, parameters, body, return_type=nil)
+  def build_PlanDefinition(o, name, parameters, body, return_type = nil)
     @init_hash[KEY_PARAMETERS] = parameters
     b = f_build_body(body)
     @init_hash[KEY_BODY] = b unless b.nil?
@@ -598,7 +599,6 @@ class Factory
 
   def lambda=(lambda)
     @init_hash['lambda'] = lambda
-    self
   end
 
   # Assignment =
@@ -646,8 +646,9 @@ class Factory
   def self.set_resource_form(expr, form)
     # Note: Validation handles illegal combinations
     return false unless expr.instance_of?(self) && expr.model_class <= AbstractResource
+
     expr['form'] = form
-    return true
+    true
   end
 
   # Returns symbolic information about an expected shape of a resource expression given the LHS of a resource expr.
@@ -694,15 +695,15 @@ class Factory
 
   def self.block(*args);                 new(BlockExpression, args.map { |arg| infer(arg) }); end
 
-  def self.string(*args);                new(ConcatenatedString, args.map { |arg| infer(arg) });           end
+  def self.string(*args);                new(ConcatenatedString, args.map { |arg| infer(arg) }); end
 
-  def self.text(o);                      infer(o).text;                                  end
+  def self.text(o);                      infer(o).text; end
 
-  def self.IF(test_e,then_e,else_e);     new(IfExpression, test_e, then_e, else_e);      end
+  def self.IF(test_e, then_e, else_e);     new(IfExpression, test_e, then_e, else_e);      end
 
-  def self.UNLESS(test_e,then_e,else_e); new(UnlessExpression, test_e, then_e, else_e);  end
+  def self.UNLESS(test_e, then_e, else_e); new(UnlessExpression, test_e, then_e, else_e);  end
 
-  def self.CASE(test_e,*options);        new(CaseExpression, test_e, options);           end
+  def self.CASE(test_e, *options); new(CaseExpression, test_e, options); end
 
   def self.WHEN(values_list, block);     new(CaseOption, values_list, block);            end
 
@@ -720,9 +721,9 @@ class Factory
 
   def self.LIST(entries);                new(LiteralList, entries);                      end
 
-  def self.PARAM(name, expr=nil);        new(Parameter, name, expr);                     end
+  def self.PARAM(name, expr = nil); new(Parameter, name, expr); end
 
-  def self.NODE(hosts, parent, body);    new(NodeDefinition, hosts, parent, body);       end
+  def self.NODE(hosts, parent, body); new(NodeDefinition, hosts, parent, body); end
 
   # Parameters
 
@@ -787,7 +788,7 @@ class Factory
     LAMBDA(params, new(EppExpression, parameters_specified, body), nil)
   end
 
-  def self.RESERVED(name, future=false)
+  def self.RESERVED(name, future = false)
     new(ReservedWord, name, future)
   end
 
@@ -809,9 +810,9 @@ class Factory
       end
     else
       # Bad number should already have been caught by lexer - this should never happen
-      #TRANSLATORS 'NUMBER' refers to a method name and the 'name_or_numeric' was the passed in value and should not be translated
+      # TRANSLATORS 'NUMBER' refers to a method name and the 'name_or_numeric' was the passed in value and should not be translated
       raise ArgumentError, _("Internal Error, NUMBER token does not contain a valid number, %{name_or_numeric}") %
-          { name_or_numeric: name_or_numeric }
+                           { name_or_numeric: name_or_numeric }
     end
   end
 
@@ -971,19 +972,19 @@ class Factory
     'realize' => true,
     'include' => true,
     'contain' => true,
-    'tag'     => true,
+    'tag' => true,
 
-    'debug'   => true,
-    'info'    => true,
-    'notice'  => true,
+    'debug' => true,
+    'info' => true,
+    'notice' => true,
     'warning' => true,
-    'err'     => true,
+    'err' => true,
 
-    'fail'    => true,
-    'import'  => true,  # discontinued, but transform it to make it call error reporting function
-    'break'   => true,
-    'next'    => true,
-    'return'  => true
+    'fail' => true,
+    'import' => true, # discontinued, but transform it to make it call error reporting function
+    'break' => true,
+    'next' => true,
+    'return' => true
   }.freeze
 
   # Returns true if the given name is a "statement keyword" (require, include, contain,
@@ -995,6 +996,7 @@ class Factory
 
   class ArgsToNonCallError < RuntimeError
     attr_reader :args, :name_expr
+
     def initialize(args, name_expr)
       @args = args
       @name_expr = name_expr
@@ -1005,7 +1007,7 @@ class Factory
   # expression, or expression list.
   #
   def self.transform_calls(expressions)
-    expressions.reduce([]) do |memo, expr|
+    expressions.each_with_object([]) do |expr, memo|
       name = memo[-1]
       if name.instance_of?(Factory) && name.model_class <= QualifiedName && name_is_statement?(name[KEY_VALUE])
         if expr.is_a?(Array)
@@ -1033,7 +1035,6 @@ class Factory
           expr['rval_required'] = false
         end
       end
-      memo
     end
   end
 
@@ -1043,14 +1044,15 @@ class Factory
     # Returning nil means accepting the given as a potential resource expression
     return nil unless attribute_ops.is_a? Array
     return nil unless left.model_class <= QualifiedName
+
     keyed_entries = attribute_ops.map do |ao|
       return nil if ao[KEY_OPERATOR] == '+>'
+
       KEY_ENTRY(infer(ao['attribute_name']), ao['value_expr'])
     end
     a_hash = HASH(keyed_entries)
     a_hash.record_position(left[KEY_LOCATOR], lbrace_token, rbrace_token)
-    result = block_or_expression(transform_calls([left, a_hash]))
-    result
+    block_or_expression(transform_calls([left, a_hash]))
   end
 
   def interpolate_Factory(c)
@@ -1059,7 +1061,7 @@ class Factory
 
   def interpolate_LiteralInteger(c)
     # convert number to a variable
-    self.var
+    var
   end
 
   def interpolate_Object(c)
@@ -1067,7 +1069,7 @@ class Factory
   end
 
   def interpolate_QualifiedName(c)
-    self.var
+    var
   end
 
   # rewrite left expression to variable if it is name, number, and recurse if it is an access expression

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Puppet::Pops
 module Model
 # A provider of labels for model object, producing a human name for the model object.
@@ -8,7 +10,7 @@ class ModelLabelProvider
   include LabelProvider
 
   def initialize
-    @@label_visitor ||= Visitor.new(self,"label",0,0)
+    @@label_visitor ||= Visitor.new(self, "label", 0, 0)
   end
 
   # Produces a label for the given objects type/operator without article.
@@ -18,6 +20,7 @@ class ModelLabelProvider
     @@label_visitor.visit_this_0(self, o)
   end
 
+  # rubocop:disable Layout/SpaceBeforeSemicolon
   def label_Factory o                     ; label(o.model)                      end
   def label_Array o                       ; "Array"                             end
   def label_LiteralInteger o              ; "Literal Integer"                   end
@@ -103,6 +106,7 @@ class ModelLabelProvider
   def label_Timespan o                    ; "Timespan"                          end
   def label_Version o                     ; "Semver"                            end
   def label_VersionRange o                ; "SemverRange"                       end
+  # rubocop:enable Layout/SpaceBeforeSemicolon
 
   def label_PResourceType o
     if o.title
@@ -116,7 +120,6 @@ class ModelLabelProvider
     'Resource Statement'
   end
 
-
   def label_Class o
     if o <= Types::PAnyType
       simple_name = o.name.split('::').last

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

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # Dumps a Pops::Model in reverse polish notation; i.e. LISP style
 # The intention is to use this for debugging output
 # TODO: BAD NAME - A DUMP is a Ruby Serialization
 #
 class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
   def dump_Array o
-    o.collect {|e| do_dump(e) }
+    o.collect { |e| do_dump(e) }
   end
 
   def dump_LiteralFloat o
@@ -59,13 +61,13 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
     o.operations do |ao|
       result << :break << do_dump(ao)
     end
-    result += [:dedent, :dedent ]
+    result += [:dedent, :dedent]
     result
   end
 
   def dump_EppExpression o
     result = ["epp"]
-#    result << ["parameters"] + o.parameters.collect {|p| do_dump(p) } if o.parameters.size() > 0
+    #    result << ["parameters"] + o.parameters.collect {|p| do_dump(p) } if o.parameters.size() > 0
     if o.body
       result << do_dump(o.body)
     else
@@ -120,11 +122,11 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
   end
 
   def dump_LiteralList o
-    ["[]"] + o.values.collect {|x| do_dump(x)}
+    ["[]"] + o.values.collect { |x| do_dump(x) }
   end
 
   def dump_LiteralHash o
-    ["{}"] + o.entries.collect {|x| do_dump(x)}
+    ["{}"] + o.entries.collect { |x| do_dump(x) }
   end
 
   def dump_KeyedEntry o
@@ -141,7 +143,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
 
   def dump_LambdaExpression o
     result = ["lambda"]
-    result << ["parameters"] + o.parameters.collect {|p| do_dump(p) } if o.parameters.size() > 0
+    result << ["parameters"] + o.parameters.collect { |p| do_dump(p) } if o.parameters.size() > 0
     result << ['return_type', do_dump(o.return_type)] unless o.return_type.nil?
     if o.body
       result << do_dump(o.body)
@@ -198,14 +200,14 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
 
   def dump_BlockExpression o
     result = ["block", :indent]
-    o.statements.each {|x| result << :break; result << do_dump(x) }
+    o.statements.each { |x| result << :break; result << do_dump(x) }
     result << :dedent << :break
     result
   end
 
   # Interpolated strings are shown as (cat seg0 seg1 ... segN)
   def dump_ConcatenatedString o
-    ["cat"] + o.segments.collect {|x| do_dump(x)}
+    ["cat"] + o.segments.collect { |x| do_dump(x) }
   end
 
   def dump_HeredocExpression(o)
@@ -215,7 +217,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
   def dump_HostClassDefinition o
     result = ["class", o.name]
     result << ["inherits", o.parent_class] if o.parent_class
-    result << ["parameters"] + o.parameters.collect {|p| do_dump(p) } if o.parameters.size() > 0
+    result << ["parameters"] + o.parameters.collect { |p| do_dump(p) } if o.parameters.size() > 0
     if o.body
       result << do_dump(o.body)
     else
@@ -226,7 +228,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
 
   def dump_PlanDefinition o
     result = ["plan", o.name]
-    result << ["parameters"] + o.parameters.collect {|p| do_dump(p) } if o.parameters.size() > 0
+    result << ["parameters"] + o.parameters.collect { |p| do_dump(p) } if o.parameters.size() > 0
     if o.body
       result << do_dump(o.body)
     else
@@ -237,7 +239,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
 
   def dump_NodeDefinition o
     result = ["node"]
-    result << ["matches"] + o.host_matches.collect {|m| do_dump(m) }
+    result << ["matches"] + o.host_matches.collect { |m| do_dump(m) }
     result << ["parent", do_dump(o.parent)] if o.parent
     if o.body
       result << do_dump(o.body)
@@ -250,7 +252,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
   def dump_NamedDefinition o
     # the nil must be replaced with a string
     result = [nil, o.name]
-    result << ["parameters"] + o.parameters.collect {|p| do_dump(p) } if o.parameters.size() > 0
+    result << ["parameters"] + o.parameters.collect { |p| do_dump(p) } if o.parameters.size() > 0
     if o.body
       result << do_dump(o.body)
     else
@@ -261,7 +263,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
 
   def dump_FunctionDefinition o
     result = ['function', o.name]
-    result << ['parameters'] + o.parameters.collect {|p| do_dump(p) } if o.parameters.size() > 0
+    result << ['parameters'] + o.parameters.collect { |p| do_dump(p) } if o.parameters.size() > 0
     result << ['return_type', do_dump(o.return_type)] unless o.return_type.nil?
     if o.body
       result << do_dump(o.body)
@@ -279,7 +281,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
 
   def dump_ResourceOverrideExpression o
     form = o.form == 'regular' ? '' : o.form + '-'
-    result = [form+'override', do_dump(o.resources), :indent]
+    result = [form + 'override', do_dump(o.resources), :indent]
     o.operations.each do |p|
       result << :break << do_dump(p)
     end
@@ -288,7 +290,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
   end
 
   def dump_ReservedWord o
-    [ 'reserved', o.word ]
+    ['reserved', o.word]
   end
 
   # Produces parameters as name, or (= name value)
@@ -318,21 +320,21 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
 
   def dump_IfExpression o
     result = ["if", do_dump(o.test), :indent, :break,
-      ["then", :indent, do_dump(o.then_expr), :dedent]]
+              ["then", :indent, do_dump(o.then_expr), :dedent]]
     result +=
-    [:break,
-      ["else", :indent, do_dump(o.else_expr), :dedent],
-      :dedent] unless is_nop? o.else_expr
+      [:break,
+       ["else", :indent, do_dump(o.else_expr), :dedent],
+       :dedent] unless is_nop? o.else_expr
     result
   end
 
   def dump_UnlessExpression o
     result = ["unless", do_dump(o.test), :indent, :break,
-      ["then", :indent, do_dump(o.then_expr), :dedent]]
+              ["then", :indent, do_dump(o.then_expr), :dedent]]
     result +=
-    [:break,
-      ["else", :indent, do_dump(o.else_expr), :dedent],
-      :dedent] unless is_nop? o.else_expr
+      [:break,
+       ["else", :indent, do_dump(o.else_expr), :dedent],
+       :dedent] unless is_nop? o.else_expr
     result
   end
 
@@ -341,7 +343,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
   #
   def dump_CallNamedFunctionExpression o
     result = [o.rval_required ? "call" : "invoke", do_dump(o.functor_expr)]
-    o.arguments.collect {|a| result << do_dump(a) }
+    o.arguments.collect { |a| result << do_dump(a) }
     result << do_dump(o.lambda) if o.lambda
     result
   end
@@ -354,7 +356,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
 
   def dump_CallMethodExpression o
     result = [o.rval_required ? "call-method" : "invoke-method", do_dump(o.functor_expr)]
-    o.arguments.collect {|a| result << do_dump(a) }
+    o.arguments.collect { |a| result << do_dump(a) }
     result << do_dump(o.lambda) if o.lambda
     result
   end
@@ -369,8 +371,8 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
 
   def dump_CaseOption o
     result = ["when"]
-    result << o.values.collect {|x| do_dump(x) }
-    result << ["then", do_dump(o.then_expr) ]
+    result << o.values.collect { |x| do_dump(x) }
+    result << ["then", do_dump(o.then_expr)]
     result
   end
 
@@ -397,7 +399,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
 
   def dump_ResourceDefaultsExpression o
     form = o.form == 'regular' ? '' : o.form + '-'
-    result = [form+'resource-defaults', do_dump(o.type_ref), :indent]
+    result = [form + 'resource-defaults', do_dump(o.type_ref), :indent]
     o.operations.each do |p|
       result << :break << do_dump(p)
     end
@@ -407,7 +409,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
 
   def dump_ResourceExpression o
     form = o.form == 'regular' ? '' : o.form + '-'
-    result = [form+'resource', do_dump(o.type_name), :indent]
+    result = [form + 'resource', do_dump(o.type_name), :indent]
     o.bodies.each do |b|
       result << :break << do_dump(b)
     end
@@ -416,7 +418,7 @@ class Puppet::Pops::Model::ModelTreeDumper < Puppet::Pops::Model::TreeDumper
   end
 
   def dump_SelectorExpression o
-    ["?", do_dump(o.left_expr)] + o.selectors.collect {|x| do_dump(x) }
+    ["?", do_dump(o.left_expr)] + o.selectors.collect { |x| do_dump(x) }
   end
 
   def dump_SelectorEntry o

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

@@ -1,9 +1,9 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/concurrent/thread_local_singleton'
 
 module Puppet::Pops
 module Model
-
-
 class PNTransformer
   extend Puppet::Concurrent::ThreadLocalSingleton
 
@@ -247,9 +247,9 @@ class PNTransformer
 
   def transform_ResourceBody(e)
     PN::Map.new([
-      transform(e.title).with_name('title'),
-      transform(e.operations).with_name('ops')
-    ]).as_call('resource_body')
+                  transform(e.title).with_name('title'),
+                  transform(e.operations).with_name('ops')
+                ]).as_call('resource_body')
   end
 
   def transform_ResourceDefaultsExpression(e)
@@ -380,6 +380,5 @@ class PNTransformer
     PN::Map.new(entries).as_call(name)
   end
 end
-
 end
 end

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

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 # Base class for formatted textual dump of a "model"
 #
 class Puppet::Pops::Model::TreeDumper
   attr_accessor :indent_count
+
   def initialize initial_indentation = 0
-    @@dump_visitor ||= Puppet::Pops::Visitor.new(nil,"dump",0,0)
+    @@dump_visitor ||= Puppet::Pops::Visitor.new(nil, "dump", 0, 0)
     @indent_count = initial_indentation
   end
 
@@ -20,12 +23,12 @@ class Puppet::Pops::Model::TreeDumper
   end
 
   def format(x)
-    result = ""
+    result = ''.dup
     parts = format_r(x)
     parts.each_index do |i|
       if i > 0
         # separate with space unless previous ends with whitespace or (
-        result << ' ' if parts[i] != ")" && parts[i-1] !~ /.*(?:\s+|\()$/ && parts[i] !~ /^\s+/
+        result << ' ' if parts[i] != ")" && parts[i - 1] !~ /.*(?:\s+|\()$/ && parts[i] !~ /^\s+/
       end
       result << parts[i].to_s
     end
@@ -43,7 +46,7 @@ class Puppet::Pops::Model::TreeDumper
       @indent_count -= 1
     when Array
       result << '('
-      result += x.collect {|a| format_r(a) }.flatten
+      result += x.collect { |a| format_r(a) }.flatten
       result << ')'
     when Symbol
       result << x.to_s # Allows Symbols in arrays e.g. ["text", =>, "text"]

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

@@ -1,6 +1,6 @@
+# frozen_string_literal: true
 
 class Puppet::Pops::Parser::CodeMerger
-
   # Concatenates the logic in the array of parse results into one parse result.
   # @return Puppet::Parser::AST::BlockExpression
   #
@@ -11,11 +11,11 @@ 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 }.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
-        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
         parsed_class.code.model

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

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 # The EppParser is a specialized Puppet Parser that starts parsing in Epp Text mode
 class Puppet::Pops::Parser::EppParser < Puppet::Pops::Parser::Parser
-
   # Initializes the epp parser support by creating a new instance of {Puppet::Pops::Parser::Lexer}
   # configured to start in Epp Lexing mode.
   # @return [void]
@@ -13,7 +14,7 @@ class Puppet::Pops::Parser::EppParser < Puppet::Pops::Parser::Parser
   def parse_file(file)
     unless FileTest.exist?(file)
       unless file =~ /\.epp$/
-        file = file + ".epp"
+        file += ".epp"
       end
     end
     @lexer.file = file
@@ -28,10 +29,10 @@ class Puppet::Pops::Parser::EppParser < Puppet::Pops::Parser::Parser
   #
   # @api private
   #
-  def _parse()
+  def _parse
     begin
       @yydebug = false
-      main = yyparse(@lexer,:scan_epp)
+      main = yyparse(@lexer, :scan_epp)
       # #Commented out now because this hides problems in the racc grammar while developing
       # # TODO include this when test coverage is good enough.
       #      rescue Puppet::ParseError => except
@@ -42,7 +43,7 @@ class Puppet::Pops::Parser::EppParser < Puppet::Pops::Parser::Parser
       #      rescue => except
       #        raise Puppet::ParseError.new(except.message, @lexer.file, @lexer.line, @lexer.pos, except)
     end
-    return main
+    main
   ensure
     @lexer.clear
     @namestack = []