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

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/empty.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/empty.rb
index 4f77ad300..e0b9838e2 100644
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/empty.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/empty.rb
@@ -1,28 +1,25 @@
 #
 # empty.rb
 #
-
 module Puppet::Parser::Functions
-  newfunction(:empty, :type => :rvalue, :doc => <<-EOS
-Returns true if the variable is empty.
-    EOS
-  ) do |arguments|
+  newfunction(:empty, :type => :rvalue, :doc => <<-DOC
+    Returns true if the variable is empty.
 
-    raise(Puppet::ParseError, "empty(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size < 1
+    Note: from Puppet 5.5.0, the compatible function with the same name in Puppet core
+    will be used instead of this function.
+  DOC
+             ) do |arguments|
 
+    raise(Puppet::ParseError, "empty(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.empty?
     value = arguments[0]
 
     unless value.is_a?(Array) || value.is_a?(Hash) || value.is_a?(String) || value.is_a?(Numeric)
       raise(Puppet::ParseError, 'empty(): Requires either array, hash, string or integer to work with')
     end
 
-    if value.is_a?(Numeric)
-      return false
-    else
-      result = value.empty?
-
-      return result
-    end
+    return false if value.is_a?(Numeric)
+    result = value.empty?
+    return result
   end
 end