summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/functions.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/parser/functions.rb')
-rw-r--r--lib/puppet/parser/functions.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/puppet/parser/functions.rb b/lib/puppet/parser/functions.rb
index 63201924b..b60d94b0a 100644
--- a/lib/puppet/parser/functions.rb
+++ b/lib/puppet/parser/functions.rb
@@ -27,7 +27,6 @@ module Functions
fname = "function_" + name.to_s
Puppet::Parser::Scope.send(:define_method, fname, &block)
- #FCollection.send(:module_function,name)
# Someday we'll support specifying an arity, but for now, nope
#@functions[name] = {:arity => arity, :type => ftype}
@@ -63,10 +62,11 @@ module Functions
newfunction(:include) do |vals|
vals.each do |val|
if objecttype = lookuptype(val)
- # It's a defined type
- objecttype.safeevaluate(
+ # It's a defined type, so set it into the scope so it can
+ # be evaluated.
+ setobject(
:type => val,
- :scope => self
+ :arguments => {}
)
else
raise Puppet::ParseError, "Unknown class %s" % val