summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/ast/component.rb
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-08-28 04:50:59 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-08-28 04:50:59 +0000
commitad32b716d82576c98e708e6dbbcec60f0372e54c (patch)
tree1509e5afdd1e174816b8e0f2f14aba019c627b6c /lib/puppet/parser/ast/component.rb
parentdb0be8e38044b8aaaf9469c5c461c84295b55732 (diff)
downloadpuppet-ad32b716d82576c98e708e6dbbcec60f0372e54c.tar.gz
puppet-ad32b716d82576c98e708e6dbbcec60f0372e54c.tar.xz
puppet-ad32b716d82576c98e708e6dbbcec60f0372e54c.zip
Tracking down some weird bugs that managed to creep into the parser. I expect that the main ones were a result of the If support.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1494 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/parser/ast/component.rb')
-rw-r--r--lib/puppet/parser/ast/component.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/puppet/parser/ast/component.rb b/lib/puppet/parser/ast/component.rb
index 4d930f6a5..2621c76ad 100644
--- a/lib/puppet/parser/ast/component.rb
+++ b/lib/puppet/parser/ast/component.rb
@@ -16,7 +16,6 @@ class Puppet::Parser::AST
# These are retrieved when looking up the superclass
attr_accessor :name, :arguments
- #def evaluate(scope,hash,objtype,objname)
def evaluate(hash)
origscope = hash[:scope]
objtype = hash[:type]
@@ -108,9 +107,9 @@ class Puppet::Parser::AST
end
# Now just evaluate the code with our new bindings.
- scope.inside(self) do
+ #scope.inside(self) do # part of definition inheritance
self.code.safeevaluate(:scope => scope)
- end
+ #end
# If we're being evaluated as a parent class, we want to return the
# scope, so it can be overridden and such, but if not, we want to