diff options
Diffstat (limited to 'lib/puppet/parser/functions/merge.rb')
-rw-r--r-- | lib/puppet/parser/functions/merge.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/puppet/parser/functions/merge.rb b/lib/puppet/parser/functions/merge.rb index 6693884..d2dc0f9 100644 --- a/lib/puppet/parser/functions/merge.rb +++ b/lib/puppet/parser/functions/merge.rb @@ -1,5 +1,4 @@ module Puppet::Parser::Functions - newfunction(:merge, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args| Merges two or more hashes together and returns the resulting hash. @@ -15,14 +14,17 @@ module Puppet::Parser::Functions if args.length < 2 raise Puppet::ParseError, ("merge(): wrong number of arguments (#{args.length}; must be at least 2)") end + + # The hash we accumulate into + accumulator = Hash.new + # Merge into the accumulator hash args.each do |arg| unless arg.is_a?(Hash) raise Puppet::ParseError, "merge: unexpected argument type #{arg.class}, only expects hash arguments" end + accumulator.merge!(arg) end - - args.inject({}, :merge) - + # Return the fully merged hash + accumulator end - end |