Fix conflict

[factor.git] / basis / math / functions / functions.factor

diff --git a/basis/math/functions/functions.factor b/basis/math/functions/functions.factor
index 20c31aa2bd300efd1be45b84ec6a782eaefca445..69c2c6e3598845d859aa25e077945bbab056df25 100644 (file)
--- a/basis/math/functions/functions.factor
+++ b/basis/math/functions/functions.factor
@@ -252,10 +252,14 @@ M: real tanh ftanh ;
 
 : -i* ( x -- y ) >rect swap neg rect> ;
 
-: asin ( x -- y )
+GENERIC: asin ( x -- y ) foldable
+
+M: number asin
     dup [-1,1]? [ fasin ] [ i* asinh -i* ] if ; inline
 
-: acos ( x -- y )
+GENERIC: acos ( x -- y ) foldable
+
+M: number acos
     dup [-1,1]? [ facos ] [ asin pi 2 / swap - ] if ;
     inline