puppet 8.4.0-x64-mingw32 → 8.5.0-x64-mingw32

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

@@ -13,10 +13,10 @@ class Puppet::Pops::Model::AstTransformer
 
   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
@@ -31,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))
@@ -62,7 +62,7 @@ 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)
+      @@transform_visitor.visit_this_0(self, o)
     rescue StandardError => e
       loc_data = {}
       merge_location(loc_data, o)
@@ -89,7 +89,7 @@ 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)

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

@@ -116,7 +116,7 @@ class Factory
   end
 
   # Polymorphic interpolate
-  def interpolate()
+  def interpolate
     INTERPOLATION_VISITOR.visit_this_class(self, @model_class, EMPTY_ARRAY)
   end
 
@@ -335,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
 
@@ -374,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?
@@ -697,13 +697,13 @@ class Factory
 
   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
 
@@ -721,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
 
@@ -788,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
 
@@ -812,7 +812,7 @@ class Factory
       # 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
       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
 
@@ -1007,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)
@@ -1035,7 +1035,6 @@ class Factory
           expr['rval_required'] = false
         end
       end
-      memo
     end
   end
 

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

@@ -10,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.
@@ -20,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
@@ -105,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

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

@@ -6,7 +6,7 @@
 #
 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
@@ -61,7 +61,7 @@ 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
 
@@ -122,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
@@ -143,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)
@@ -200,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)
@@ -217,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
@@ -228,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
@@ -239,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)
@@ -252,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
@@ -263,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)
@@ -281,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
@@ -290,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)
@@ -343,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
@@ -356,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
@@ -371,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
 
@@ -399,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
@@ -409,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
@@ -418,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/tree_dumper.rb

@@ -6,7 +6,7 @@ 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
 
@@ -28,7 +28,7 @@ class Puppet::Pops::Model::TreeDumper
     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
@@ -46,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

@@ -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

@@ -29,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

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

@@ -15,7 +15,7 @@ module EppSupport
   #
   def fullscan_epp
     result = []
-    scan_epp {|token, value| result.push([token, value]) }
+    scan_epp { |token, value| result.push([token, value]) }
     result
   end
 
@@ -47,7 +47,7 @@ module EppSupport
     until queue.empty? && scn.eos? do
       token = queue.shift || lex_token
       if token
-        yield [ ctx[:after] = token[0], token[1] ]
+        yield [ctx[:after] = token[0], token[1]]
       end
     end
     if ctx[:epp_open_position]
@@ -58,7 +58,7 @@ module EppSupport
     yield [false, false]
   end
 
-  def interpolate_epp(skip_leading=false)
+  def interpolate_epp(skip_leading = false)
     scn = @scanner
     ctx = @lexing_context
     eppscanner = EppScanner.new(scn)
@@ -178,7 +178,7 @@ module EppSupport
     #
     # @return [String, nil] the scanned and processed text, or nil if at the end of the input.
     #
-    def scan(skip_leading=false)
+    def scan(skip_leading = false)
       @mode = :text
       @skip_leading = skip_leading
 
@@ -188,7 +188,7 @@ module EppSupport
       until scanner.eos?
         part = @scanner.scan_until(/(<%)|\z/)
         if @skip_leading
-          part.sub!(/^[ \t]*\r?(?:\n|\z)?/,'')
+          part.sub!(/^[ \t]*\r?(?:\n|\z)?/, '')
           @skip_leading = false
         end
         # The spec for %%> is to transform it into a literal %>. This is done here, as %%> otherwise would go

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

@@ -11,7 +11,7 @@ class EvaluatingParser
 
   attr_reader :parser
 
-  def initialize()
+  def initialize
     @parser = Parser.new()
   end
 
@@ -47,7 +47,7 @@ class EvaluatingParser
     evaluate(scope, parse_file(file))
   end
 
-  def clear()
+  def clear
     @acceptor = nil
   end
 
@@ -89,7 +89,7 @@ class EvaluatingParser
     resulting_acceptor
   end
 
-  def acceptor()
+  def acceptor
     Validation::Acceptor.new
   end
 
@@ -157,7 +157,7 @@ class EvaluatingParser
   end
 
   class EvaluatingEppParser < EvaluatingParser
-    def initialize()
+    def initialize
       @parser = EppParser.new()
     end
   end

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

@@ -72,7 +72,7 @@ module HeredocSupport
     end
     # offset 0 for the heredoc, and its line number
     heredoc_offset = scn.pos
-    heredoc_line = locator.line_for_offset(heredoc_offset)-1
+    heredoc_line = locator.line_for_offset(heredoc_offset) - 1
 
     # Compute message to emit if there is no end (to make it refer to the opening heredoc position).
     eof_error = create_lex_error(Issues::HEREDOC_WITHOUT_END_TAGGED_LINE)
@@ -107,7 +107,7 @@ module HeredocSupport
         # content is based.
         enqueue([:SUBLOCATE,
                  LexerSupport::TokenValue.new([:SUBLOCATE,
-                                               lines, lines.reduce(0) {|size, s| size + s.length} ],
+                                               lines, lines.reduce(0) { |size, s| size + s.length }],
                                               heredoc_offset,
                                               locator)])
 
@@ -137,8 +137,8 @@ module HeredocSupport
       # The specification says that leading space up to the margin marker should be removed, but this implementation
       # simply leaves lines that have text in the margin untouched.
       #
-      processed_lines = lines.collect {|s| s.gsub(leading_pattern, '') }
-      margin_per_line = Array.new(processed_lines.length) {|x| lines[x].length - processed_lines[x].length }
+      processed_lines = lines.collect { |s| s.gsub(leading_pattern, '') }
+      margin_per_line = Array.new(processed_lines.length) { |x| lines[x].length - processed_lines[x].length }
       lines = processed_lines
     else
       # Array with a 0 per line

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

@@ -21,19 +21,19 @@ module Puppet::Pops::Parser::InterpolationSupport
     before = scn.pos
     # skip the leading " by doing a scan since the slurp_dqstring uses last matched when there is an error
     scn.scan(/"/)
-    value,terminator = slurp_dqstring()
+    value, terminator = slurp_dqstring()
     text = value
     after = scn.pos
     loop do
       case terminator
       when '"'
         # simple case, there was no interpolation, return directly
-        return emit_completed([:STRING, text, scn.pos-before], before)
+        return emit_completed([:STRING, text, scn.pos - before], before)
       when '${'
         count = ctx[:brace_count]
         ctx[:brace_count] += 1
         # The ${ terminator is counted towards the string part
-        enqueue_completed([:DQPRE, text, scn.pos-before], before)
+        enqueue_completed([:DQPRE, text, scn.pos - before], before)
         # Lex expression tokens until a closing (balanced) brace count is reached
         enqueue_until count
         break
@@ -41,13 +41,13 @@ module Puppet::Pops::Parser::InterpolationSupport
         varname = scn.scan(PATTERN_VARIABLE)
         if varname
           # The $ is counted towards the variable
-          enqueue_completed([:DQPRE, text, after-before-1], before)
+          enqueue_completed([:DQPRE, text, after - before - 1], before)
           enqueue_completed([:VARIABLE, varname, scn.pos - after + 1], after - 1)
           break
         else
           # false $ variable start
           text += terminator
-          value,terminator = slurp_dqstring()
+          value, terminator = slurp_dqstring()
           text += value
           after = scn.pos
         end
@@ -62,20 +62,20 @@ module Puppet::Pops::Parser::InterpolationSupport
     scn = @scanner
     ctx = @lexing_context
     before = scn.pos
-    value,terminator = slurp_dqstring
+    value, terminator = slurp_dqstring
     text = value
     after = scn.pos
     loop do
       case terminator
       when '"'
         # simple case, there was no further interpolation, return directly
-        enqueue_completed([:DQPOST, text, scn.pos-before], before)
+        enqueue_completed([:DQPOST, text, scn.pos - before], before)
         return
       when '${'
         count = ctx[:brace_count]
         ctx[:brace_count] += 1
         # The ${ terminator is counted towards the string part
-        enqueue_completed([:DQMID, text, scn.pos-before], before)
+        enqueue_completed([:DQMID, text, scn.pos - before], before)
         # Lex expression tokens until a closing (balanced) brace count is reached
         enqueue_until count
         break
@@ -83,13 +83,13 @@ module Puppet::Pops::Parser::InterpolationSupport
         varname = scn.scan(PATTERN_VARIABLE)
         if varname
           # The $ is counted towards the variable
-          enqueue_completed([:DQMID, text, after-before-1], before)
+          enqueue_completed([:DQMID, text, after - before - 1], before)
           enqueue_completed([:VARIABLE, varname, scn.pos - after + 1], after - 1)
           break
         else
           # false $ variable start
           text += terminator
-          value,terminator = slurp_dqstring
+          value, terminator = slurp_dqstring
           text += value
           after = scn.pos
         end
@@ -107,20 +107,20 @@ module Puppet::Pops::Parser::InterpolationSupport
     scn = @scanner
     ctx = @lexing_context
     before = scn.pos
-    value,terminator = slurp_uqstring()
+    value, terminator = slurp_uqstring()
     text = value
     after = scn.pos
     loop do
       case terminator
       when ''
         # simple case, there was no interpolation, return directly
-        enqueue_completed([:STRING, text, scn.pos-before], before)
+        enqueue_completed([:STRING, text, scn.pos - before], before)
         return
       when '${'
         count = ctx[:brace_count]
         ctx[:brace_count] += 1
         # The ${ terminator is counted towards the string part
-        enqueue_completed([:DQPRE, text, scn.pos-before], before)
+        enqueue_completed([:DQPRE, text, scn.pos - before], before)
         # Lex expression tokens until a closing (balanced) brace count is reached
         enqueue_until count
         break
@@ -128,13 +128,13 @@ module Puppet::Pops::Parser::InterpolationSupport
         varname = scn.scan(PATTERN_VARIABLE)
         if varname
           # The $ is counted towards the variable
-          enqueue_completed([:DQPRE, text, after-before-1], before)
+          enqueue_completed([:DQPRE, text, after - before - 1], before)
           enqueue_completed([:VARIABLE, varname, scn.pos - after + 1], after - 1)
           break
         else
           # false $ variable start
           text += terminator
-          value,terminator = slurp_uqstring()
+          value, terminator = slurp_uqstring()
           text += value
           after = scn.pos
         end
@@ -148,20 +148,20 @@ module Puppet::Pops::Parser::InterpolationSupport
     scn = @scanner
     ctx = @lexing_context
     before = scn.pos
-    value,terminator = slurp_uqstring
+    value, terminator = slurp_uqstring
     text = value
     after = scn.pos
     loop do
       case terminator
       when ''
         # simple case, there was no further interpolation, return directly
-        enqueue_completed([:DQPOST, text, scn.pos-before], before)
+        enqueue_completed([:DQPOST, text, scn.pos - before], before)
         return
       when '${'
         count = ctx[:brace_count]
         ctx[:brace_count] += 1
         # The ${ terminator is counted towards the string part
-        enqueue_completed([:DQMID, text, scn.pos-before], before)
+        enqueue_completed([:DQMID, text, scn.pos - before], before)
         # Lex expression tokens until a closing (balanced) brace count is reached
         enqueue_until count
         break
@@ -169,13 +169,13 @@ module Puppet::Pops::Parser::InterpolationSupport
         varname = scn.scan(PATTERN_VARIABLE)
         if varname
           # The $ is counted towards the variable
-          enqueue_completed([:DQMID, text, after-before-1], before)
+          enqueue_completed([:DQMID, text, after - before - 1], before)
           enqueue_completed([:VARIABLE, varname, scn.pos - after + 1], after - 1)
           break
         else
           # false $ variable start
           text += terminator
-          value,terminator = slurp_uqstring
+          value, terminator = slurp_uqstring
           text += value
           after = scn.pos
         end