X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fsqueeze.rb;h=548c93313b79a110f84222af85f295fe4cd0e242;hb=30caaa85aed7015ca0d77216bff175eebd917eb7;hp=81fadfdb2f06f9f32d144cc64f319c68368fdd57;hpb=ad88f67c13ae0f1a08936dad643f1e3509ab5f40;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/squeeze.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/squeeze.rb
index 81fadfdb2..548c93313 100644
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/squeeze.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/squeeze.rb
@@ -1,35 +1,34 @@
 #
 # squeeze.rb
 #
-
 module Puppet::Parser::Functions
-  newfunction(:squeeze, :type => :rvalue, :doc => <<-EOS
-Returns a new string where runs of the same character that occur in this set are replaced by a single character.
-    EOS
-  ) do |arguments|
+  newfunction(:squeeze, :type => :rvalue, :doc => <<-DOC
+    @summary
+      Returns a new string where runs of the same character that occur in this set are replaced by a single character.
+
+    @return
+      a new string where runs of the same character that occur in this set are replaced by a single character.
+  DOC
+             ) do |arguments|
 
-    if ((arguments.size != 2) and (arguments.size != 1)) then
-      raise(Puppet::ParseError, "squeeze(): Wrong number of arguments "+
-        "given #{arguments.size} for 2 or 1")
+    if (arguments.size != 2) && (arguments.size != 1)
+      raise(Puppet::ParseError, "squeeze(): Wrong number of arguments given #{arguments.size} for 2 or 1")
     end
 
     item = arguments[0]
     squeezeval = arguments[1]
 
-    if item.is_a?(Array) then
-      if squeezeval then
-        item.collect { |i| i.squeeze(squeezeval) }
+    if item.is_a?(Array)
+      if squeezeval
+        item.map { |i| i.squeeze(squeezeval) }
       else
-        item.collect { |i| i.squeeze }
+        item.map { |i| i.squeeze }
       end
+    elsif squeezeval
+      item.squeeze(squeezeval)
     else
-      if squeezeval then
-        item.squeeze(squeezeval)
-      else
-        item.squeeze
-      end
+      item.squeeze
     end
-
   end
 end