Merge branch '2.x' into 3.x

* 2.x:
  (#17797) min() and max() functions

2 files changed, 26 insertions, 0 deletions

diff --git a/lib/puppet/parser/functions/max.rb b/lib/puppet/parser/functions/max.rb
new file mode 100644
index 0000000..10b6f74
--- /dev/null
+++ b/lib/puppet/parser/functions/max.rb
@@ -0,0 +1,13 @@
+module Puppet::Parser::Functions
+  newfunction(:max, :type => :rvalue, :doc => <<-EOS
+    Returns the highest value of all arguments.
+    Requires at least one argument.
+    EOS
+  ) do |args|
+
+    raise(Puppet::ParseError, "max(): Wrong number of arguments " +
+          "need at least one") if args.size == 0
+
+    return args.max
+  end
+end
diff --git a/lib/puppet/parser/functions/min.rb b/lib/puppet/parser/functions/min.rb
new file mode 100644
index 0000000..abf1b62
--- /dev/null
+++ b/lib/puppet/parser/functions/min.rb
@@ -0,0 +1,13 @@
+module Puppet::Parser::Functions
+  newfunction(:min, :type => :rvalue, :doc => <<-EOS
+    Returns the lowest value of all arguments.
+    Requires at least one argument.
+    EOS
+  ) do |args|
+
+    raise(Puppet::ParseError, "min(): Wrong number of arguments " +
+          "need at least one") if args.size == 0
+
+    return args.min
+  end
+end