Update stdlib and concat to 6.1.0 both

[mirror/dsa-puppet.git] / 3rdparty / modules / stdlib / lib / puppet / parser / functions / zip.rb

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/zip.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/zip.rb
index 13e24b6..120d097 100644 (file)
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/zip.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/zip.rb
@@ -1,20 +1,19 @@
 #
 # zip.rb
 #
-
 module Puppet::Parser::Functions
-  newfunction(:zip, :type => :rvalue, :doc => <<-EOS
-Takes one element from first array and merges corresponding elements from second array. This generates a sequence of n-element arrays, where n is one more than the count of arguments.
-
-*Example:*
-
-    zip(['1','2','3'],['4','5','6'])
+  newfunction(:zip, :type => :rvalue, :doc => <<-DOC
+    @summary
+      Takes one element from first array and merges corresponding elements from second array.
 
-Would result in:
+    @return
+      This generates a sequence of n-element arrays, where n is one more than the count of arguments.
 
-    ["1", "4"], ["2", "5"], ["3", "6"]
-    EOS
-  ) do |arguments|
+    @example
+      zip(['1','2','3'],['4','5','6'])
+      Would result in: ["1", "4"], ["2", "5"], ["3", "6"]
+    DOC
+             ) do |arguments|
 
     # Technically we support three arguments but only first is mandatory ...
     raise(Puppet::ParseError, "zip(): Wrong number of arguments given (#{arguments.size} for 2)") if arguments.size < 2
@@ -22,7 +21,7 @@ Would result in:
     a = arguments[0]
     b = arguments[1]
 
-    unless a.is_a?(Array) and b.is_a?(Array)
+    unless a.is_a?(Array) && b.is_a?(Array)
       raise(Puppet::ParseError, 'zip(): Requires array to work with')
     end