X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fdelete.rb;h=d3fddd85b9029b362830a2fc6e006a7a55faa2f6;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=f548b44445795f8cf46a105ad52b308d388d5909;hpb=ad88f67c13ae0f1a08936dad643f1e3509ab5f40;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/delete.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/delete.rb
index f548b4444..d3fddd85b 100644
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/delete.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/delete.rb
@@ -1,45 +1,54 @@
 #
 # delete.rb
 #
+module Puppet::Parser::Functions
+  newfunction(:delete, :type => :rvalue, :doc => <<-DOC
+    Deletes all instances of a given element from an array, substring from a
+    string, or key from a hash.
 
-# TODO(Krzysztof Wilczynski): We need to add support for regular expression ...
+    *Examples:*
 
-module Puppet::Parser::Functions
-  newfunction(:delete, :type => :rvalue, :doc => <<-EOS
-Deletes all instances of a given element from an array, substring from a
-string, or key from a hash.
+        delete(['a','b','c','b'], 'b')
+        Would return: ['a','c']
 
-*Examples:*
+        delete({'a'=>1,'b'=>2,'c'=>3}, 'b')
+        Would return: {'a'=>1,'c'=>3}
 
-    delete(['a','b','c','b'], 'b')
-    Would return: ['a','c']
+        delete({'a'=>1,'b'=>2,'c'=>3}, ['b','c'])
+        Would return: {'a'=>1}
 
-    delete({'a'=>1,'b'=>2,'c'=>3}, 'b')
-    Would return: {'a'=>1,'c'=>3}
+        delete('abracadabra', 'bra')
+        Would return: 'acada'
 
-    delete({'a'=>1,'b'=>2,'c'=>3}, ['b','c'])
-    Would return: {'a'=>1}
+    Note that from Puppet 4.0.0 the minus (-) operator deletes values from arrays and keys from a hash:
 
-    delete('abracadabra', 'bra')
-    Would return: 'acada'
-  EOS
-  ) do |arguments|
+        ['a', 'b', 'c', 'b'] - 'b'
+        # would return ['a', 'c']
 
-    if (arguments.size != 2) then
-      raise(Puppet::ParseError, "delete(): Wrong number of arguments "+
-                                  "given #{arguments.size} for 2.")
-    end
+        {'a'=>1,'b'=>2,'c'=>3} - ['b','c'])
+        # would return {'a' => '1'}
+
+    A global delete from a string can be performed with the regsubst() function:
+
+        'abracadabra'.regsubst(/bra/, '', 'G')
+        # would return 'acada'
+
+    In general, the filter() function can filter out entries from arrays and hashes based on keys and/or values.
+
+  DOC
+             ) do |arguments|
+
+    raise(Puppet::ParseError, "delete(): Wrong number of arguments given #{arguments.size} for 2") unless arguments.size == 2
 
     collection = arguments[0].dup
     Array(arguments[1]).each do |item|
       case collection
-        when Array, Hash
-          collection.delete item
-        when String
-          collection.gsub! item, ''
-        else
-          raise(TypeError, "delete(): First argument must be an Array, " +
-                             "String, or Hash. Given an argument of class #{collection.class}.")
+      when Array, Hash
+        collection.delete item
+      when String
+        collection.gsub! item, ''
+      else
+        raise(TypeError, "delete(): First argument must be an Array, String, or Hash. Given an argument of class #{collection.class}.")
       end
     end
     collection