X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fdeep_merge.rb;fp=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fdeep_merge.rb;h=dd70c6178dcaca678c956618371bf5c5c32bb2d1;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=6df32e9c56729d981cd42e4322e40ba28bfd59b8;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/deep_merge.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/deep_merge.rb
index 6df32e9c5..dd70c6178 100644
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/deep_merge.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/deep_merge.rb
@@ -1,5 +1,8 @@
+#
+# deep_merge.rb
+#
 module Puppet::Parser::Functions
-  newfunction(:deep_merge, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
+  newfunction(:deep_merge, :type => :rvalue, :doc => <<-'DOC') do |args|
     Recursively merges two or more hashes together and returns the resulting hash.
 
     For example:
@@ -13,14 +16,14 @@ module Puppet::Parser::Functions
     When there is a duplicate key that is a hash, they are recursively merged.
     When there is a duplicate key that is not a hash, the key in the rightmost hash will "win."
 
-    ENDHEREDOC
+    DOC
 
     if args.length < 2
-      raise Puppet::ParseError, ("deep_merge(): wrong number of arguments (#{args.length}; must be at least 2)")
+      raise Puppet::ParseError, "deep_merge(): wrong number of arguments (#{args.length}; must be at least 2)"
     end
 
-    deep_merge = Proc.new do |hash1,hash2|
-      hash1.merge(hash2) do |key,old_value,new_value|
+    deep_merge = proc do |hash1, hash2|
+      hash1.merge(hash2) do |_key, old_value, new_value|
         if old_value.is_a?(Hash) && new_value.is_a?(Hash)
           deep_merge.call(old_value, new_value)
         else
@@ -29,9 +32,9 @@ module Puppet::Parser::Functions
       end
     end
 
-    result = Hash.new
+    result = {}
     args.each do |arg|
-      next if arg.is_a? String and arg.empty? # empty string is synonym for puppet's undef
+      next if arg.is_a?(String) && arg.empty? # empty string is synonym for puppet's undef
       # If the argument was not a hash, skip it.
       unless arg.is_a?(Hash)
         raise Puppet::ParseError, "deep_merge: unexpected argument type #{arg.class}, only expects hash arguments"
@@ -39,6 +42,6 @@ module Puppet::Parser::Functions
 
       result = deep_merge.call(result, arg)
     end
-    return( result )
+    return(result)
   end
 end