math.order[-docs]: rename parameters in between? to match those in clamp

diff --git a/core/math/order/order-docs.factor b/core/math/order/order-docs.factor
index 011dc0bf13c15fb29eab786649d4604ae0e5f7d0..7a3309119799e0fb6520095ce8928f918baa284d 100644 (file)
--- a/core/math/order/order-docs.factor
+++ b/core/math/order/order-docs.factor
@@ -56,8 +56,8 @@ HELP: clamp
 { $description "Outputs " { $snippet "x" } " if contained in the interval " { $snippet "[min,max]" } " or else outputs one of the endpoints." } ;
 
 HELP: between?
-{ $values { "x" object } { "y" object } { "z" object } { "?" boolean } }
-{ $description "Tests if " { $snippet "x" } " is in the interval " { $snippet "[y,z]" } "." }
+{ $values { "x" object } { "min" object } { "max" object } { "?" boolean } }
+{ $description "Tests if " { $snippet "x" } " is in the interval " { $snippet "[min,max]" } "." }
 { $notes "As per the closed interval notation, the end-points are included in the interval." } ;
 
 HELP: before?

diff --git a/core/math/order/order.factor b/core/math/order/order.factor
index e26260bc8d7ca51b725cdc08e76a0eac130617cb..5ebe77c45940939b1df0665262f42fef695350f1 100644 (file)
--- a/core/math/order/order.factor
+++ b/core/math/order/order.factor
@@ -55,7 +55,7 @@ M: object max [ after? ] most ; inline
 
 : clamp ( x min max -- y ) [ max ] dip min ; inline
 
-: between? ( x y z -- ? )
+: between? ( x min max -- ? )
     pick after=? [ after=? ] [ 2drop f ] if ; inline
 
 : [-] ( x y -- z ) - 0 max ; inline