summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/ast/resource.rb
diff options
context:
space:
mode:
authorLuke Kanies <luke@reductivelabs.com>2010-02-06 11:34:16 -0800
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commit0d704686b923c7827b9fe16f20d4f8722c125d88 (patch)
treebc410cb6b30e8f56b6a8abae93ee8e195febb485 /lib/puppet/parser/ast/resource.rb
parentad93d0e442d4e4eff69bb3f444b2eee70a95dfa8 (diff)
downloadpuppet-0d704686b923c7827b9fe16f20d4f8722c125d88.tar.gz
puppet-0d704686b923c7827b9fe16f20d4f8722c125d88.tar.xz
puppet-0d704686b923c7827b9fe16f20d4f8722c125d88.zip
Finishing renaming :params to :parameters internally
I had only done this partway, because it seemed easier, but not surprisingly, it ended up being more complex. In addition to those renames, this commit includes fixes to whatever tests I needed to fix to confirm that things were again working. I think most of these broken tests have been broken for a while. Signed-off-by: Luke Kanies <luke@reductivelabs.com>
Diffstat (limited to 'lib/puppet/parser/ast/resource.rb')
-rw-r--r--lib/puppet/parser/ast/resource.rb10
1 files changed, 5 insertions, 5 deletions
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]