summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/parser/ast/collection.rb2
-rw-r--r--lib/puppet/parser/ast/resource.rb10
-rw-r--r--lib/puppet/parser/ast/resource_defaults.rb4
-rw-r--r--lib/puppet/parser/ast/resource_override.rb8
-rw-r--r--lib/puppet/parser/collector.rb4
-rw-r--r--lib/puppet/parser/grammar.ra6
-rw-r--r--lib/puppet/parser/parser.rb10
-rw-r--r--lib/puppet/type/component.rb2
8 files changed, 23 insertions, 23 deletions
diff --git a/lib/puppet/parser/ast/collection.rb b/lib/puppet/parser/ast/collection.rb
index 55e99fc08..f3690c146 100644
--- a/lib/puppet/parser/ast/collection.rb
+++ b/lib/puppet/parser/ast/collection.rb
@@ -31,7 +31,7 @@ class Collection < AST::Branch
end
newcoll.add_override(
- :params => params,
+ :parameters => params,
:file => @file,
:line => @line,
:source => scope.source,
diff --git a/lib/puppet/parser/ast/resource.rb b/lib/puppet/parser/ast/resource.rb
index 095e097ca..5488724c8 100644
--- a/lib/puppet/parser/ast/resource.rb
+++ b/lib/puppet/parser/ast/resource.rb
@@ -8,13 +8,13 @@ class Resource < AST::ResourceReference
associates_doc
attr_accessor :title, :type, :exported, :virtual
- attr_reader :params
+ attr_reader :parameters
# Does not actually return an object; instead sets an object
# in the current scope.
def evaluate(scope)
# Evaluate all of the specified params.
- paramobjects = params.collect { |param|
+ paramobjects = parameters.collect { |param|
param.safeevaluate(scope)
}
@@ -58,11 +58,11 @@ class Resource < AST::ResourceReference
end
# Set the parameters for our object.
- def params=(params)
+ def parameters=(params)
if params.is_a?(AST::ASTArray)
- @params = params
+ @parameters = params
else
- @params = AST::ASTArray.new(
+ @parameters = AST::ASTArray.new(
:line => params.line,
:file => params.file,
:children => [params]
diff --git a/lib/puppet/parser/ast/resource_defaults.rb b/lib/puppet/parser/ast/resource_defaults.rb
index f0746ecf1..aec86d02d 100644
--- a/lib/puppet/parser/ast/resource_defaults.rb
+++ b/lib/puppet/parser/ast/resource_defaults.rb
@@ -4,7 +4,7 @@ class Puppet::Parser::AST
# A statement syntactically similar to an ResourceDef, but uses a
# capitalized object type and cannot have a name.
class ResourceDefaults < AST::Branch
- attr_accessor :type, :params
+ attr_accessor :type, :parameters
associates_doc
@@ -14,7 +14,7 @@ class Puppet::Parser::AST
# Use a resource reference to canonize the type
ref = Puppet::Resource.new(@type, "whatever")
type = ref.type
- params = @params.safeevaluate(scope)
+ params = @parameters.safeevaluate(scope)
parsewrap do
scope.setdefaults(type, params)
diff --git a/lib/puppet/parser/ast/resource_override.rb b/lib/puppet/parser/ast/resource_override.rb
index 2d4f7a871..93ddf4dbe 100644
--- a/lib/puppet/parser/ast/resource_override.rb
+++ b/lib/puppet/parser/ast/resource_override.rb
@@ -8,11 +8,11 @@ class Puppet::Parser::AST
associates_doc
attr_accessor :object
- attr_reader :params
+ attr_reader :parameters
# Iterate across all of our children.
def each
- [@object,@params].flatten.each { |param|
+ [@object,@parameters].flatten.each { |param|
#Puppet.debug("yielding param %s" % param)
yield param
}
@@ -27,7 +27,7 @@ class Puppet::Parser::AST
hash = {}
# Evaluate all of the specified params.
- params = @params.collect { |param|
+ params = @parameters.collect { |param|
param.safeevaluate(scope)
}
@@ -37,7 +37,7 @@ class Puppet::Parser::AST
resource = resource.collect do |r|
res = Puppet::Parser::Resource.new(r.type, r.title,
- :params => params,
+ :parameters => params,
:file => file,
:line => line,
:source => scope.source,
diff --git a/lib/puppet/parser/collector.rb b/lib/puppet/parser/collector.rb
index 67bd336bb..9126cb2f8 100644
--- a/lib/puppet/parser/collector.rb
+++ b/lib/puppet/parser/collector.rb
@@ -42,7 +42,7 @@ class Puppet::Parser::Collector
objects.each do |res|
unless @collected.include?(res.ref)
newres = Puppet::Parser::Resource.new(res.type, res.title,
- :params => overrides[:params],
+ :parameters => overrides[:parameters],
:file => overrides[:file],
:line => overrides[:line],
:source => overrides[:source],
@@ -83,7 +83,7 @@ class Puppet::Parser::Collector
# add a resource override to the soon to be exported/realized resources
def add_override(hash)
- unless hash[:params]
+ unless hash[:parameters]
raise ArgumentError, "Exported resource try to override without parameters"
end
diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra
index 91c77c7d6..3e11b252a 100644
--- a/lib/puppet/parser/grammar.ra
+++ b/lib/puppet/parser/grammar.ra
@@ -154,20 +154,20 @@ resource: classname LBRACE resourceinstances endsemi RBRACE {
result.push ast(AST::Resource,
:type => val[0],
:title => instance[0],
- :params => instance[1])
+ :parameters => instance[1])
}
} | classname LBRACE params endcomma RBRACE {
# This is a deprecated syntax.
error "All resource specifications require names"
} | classref LBRACE params endcomma RBRACE {
# a defaults setting for a type
- result = ast(AST::ResourceDefaults, :type => val[0], :params => val[2])
+ result = ast(AST::ResourceDefaults, :type => val[0], :parameters => val[2])
}
# Override a value set elsewhere in the configuration.
resourceoverride: resourceref LBRACE anyparams endcomma RBRACE {
@lexer.commentpop
- result = ast AST::ResourceOverride, :object => val[0], :params => val[2]
+ result = ast AST::ResourceOverride, :object => val[0], :parameters => val[2]
}
# Exported and virtual resources; these don't get sent to the client
diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb
index 3ecded798..5eb9e0a38 100644
--- a/lib/puppet/parser/parser.rb
+++ b/lib/puppet/parser/parser.rb
@@ -25,7 +25,7 @@ module Puppet
class Parser < Racc::Parser
-module_eval <<'..end grammar.ra modeval..idfda8a9bd6f', 'grammar.ra', 850
+module_eval <<'..end grammar.ra modeval..idfe2b94e6d1', 'grammar.ra', 850
# It got too annoying having code in a file that needs to be compiled.
require 'puppet/parser/parser_support'
@@ -37,7 +37,7 @@ require 'puppet/parser/parser_support'
# $Id$
-..end grammar.ra modeval..idfda8a9bd6f
+..end grammar.ra modeval..idfe2b94e6d1
##### racc 1.4.5 generates ###
@@ -1251,7 +1251,7 @@ module_eval <<'.,.,', 'grammar.ra', 159
result.push ast(AST::Resource,
:type => val[0],
:title => instance[0],
- :params => instance[1])
+ :parameters => instance[1])
}
result
end
@@ -1268,7 +1268,7 @@ module_eval <<'.,.,', 'grammar.ra', 162
module_eval <<'.,.,', 'grammar.ra', 165
def _reduce_37( val, _values, result )
# a defaults setting for a type
- result = ast(AST::ResourceDefaults, :type => val[0], :params => val[2])
+ result = ast(AST::ResourceDefaults, :type => val[0], :parameters => val[2])
result
end
.,.,
@@ -1276,7 +1276,7 @@ module_eval <<'.,.,', 'grammar.ra', 165
module_eval <<'.,.,', 'grammar.ra', 171
def _reduce_38( val, _values, result )
@lexer.commentpop
- result = ast AST::ResourceOverride, :object => val[0], :params => val[2]
+ result = ast AST::ResourceOverride, :object => val[0], :parameters => val[2]
result
end
.,.,
diff --git a/lib/puppet/type/component.rb b/lib/puppet/type/component.rb
index d16cdda06..b62954ba0 100644
--- a/lib/puppet/type/component.rb
+++ b/lib/puppet/type/component.rb
@@ -40,7 +40,7 @@ Puppet::Type.newtype(:component) do
if reference.type == "Class"
# 'main' is the top class, so we want to see '//' instead of
# its name.
- if reference.title == "main"
+ if reference.title.to_s.downcase == "main"
myname = ""
else
myname = reference.title
generated by cgit (git 2.34.1) at 2025-10-16 05:19:55 +0000