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

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/concat.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/concat.rb
index 0a49cfef7..136f402a4 100644
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/concat.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/concat.rb
@@ -1,20 +1,23 @@
 #
 # concat.rb
 #
-
 module Puppet::Parser::Functions
-  newfunction(:concat, :type => :rvalue, :doc => <<-EOS
-Appends the contents of multiple arrays into array 1.
+  newfunction(:concat, :type => :rvalue, :doc => <<-DOC
+    Appends the contents of multiple arrays into array 1.
+
+    *Example:*
+
+        concat(['1','2','3'],['4','5','6'],['7','8','9'])
 
-*Example:*
+    Would result in:
 
-    concat(['1','2','3'],['4','5','6'],['7','8','9'])
+      ['1','2','3','4','5','6','7','8','9']
 
-Would result in:
+    Note: Since Puppet 4.0 concatenation of arrays and hashes can be done with the + operator.
 
-  ['1','2','3','4','5','6','7','8','9']
-    EOS
-  ) do |arguments|
+      ['1','2','3'] + ['4','5','6'] + ['7','8','9']
+  DOC
+             ) do |arguments|
 
     # Check that more than 2 arguments have been given ...
     raise(Puppet::ParseError, "concat(): Wrong number of arguments given (#{arguments.size} for < 2)") if arguments.size < 2
@@ -30,7 +33,7 @@ Would result in:
     arguments.shift
 
     arguments.each do |x|
-      result = result + (x.is_a?(Array) ? x : [x])
+      result += (x.is_a?(Array) ? x : [x])
     end
 
     return result