X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fsqueeze.rb;fp=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fsqueeze.rb;h=eaa14041446fe0bbd7b0a2c8ee959991ba6d7c1c;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=f5757d1e8f994ffc998e180872e34c58eb465c1d;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;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 f5757d1e8..eaa140414 100644
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/squeeze.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/squeeze.rb
@@ -1,34 +1,30 @@
 #
 # 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
+    Returns 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
+    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