Merge branch 'master' of git://factorcode.org/git/factor

diff --git a/basis/alien/fortran/fortran.factor b/basis/alien/fortran/fortran.factor
index a2ffc55c028abf0bd2c8aef8177c9284030054f2..915b7d3d4f784ed8989cb8ba845076e294f67b62 100644 (file)
--- a/basis/alien/fortran/fortran.factor
+++ b/basis/alien/fortran/fortran.factor
@@ -423,7 +423,6 @@ PRIVATE>
 
 : (fortran-invoke) ( return library function parameters -- quot )
     {
-        [ 2drop nip set-fortran-abi ]
         [ 2nip [<fortran-result>] ]
         [ nip nip nip [fortran-args>c-args] ]
         [ [fortran-invoke] ]
@@ -431,7 +430,7 @@ PRIVATE>
     } 4 ncleave 4 nappend ;
 
 MACRO: fortran-invoke ( return library function parameters -- )
-    (fortran-invoke) ;
+    { [ 2drop nip set-fortran-abi ] [ (fortran-invoke) ] } 4 ncleave ;
 
 :: define-fortran-function ( return library function parameters -- )
     function create-in dup reset-generic 

diff --git a/basis/math/blas/vectors/vectors-tests.factor b/basis/math/blas/vectors/vectors-tests.factor
index da271a4fc7d4b1f4fa015ce93f9c8d1a8bb1efe6..ef2f7ad6f98515be38672a8b6a2770ca01710382 100644 (file)
--- a/basis/math/blas/vectors/vectors-tests.factor
+++ b/basis/math/blas/vectors/vectors-tests.factor
@@ -1,4 +1,4 @@
-USING: kernel math.blas.vectors sequences tools.test ;
+USING: kernel math.blas.vectors math.functions sequences tools.test ;
 IN: math.blas.vectors.tests
 
 ! clone
@@ -126,11 +126,11 @@ unit-test
 
 ! Vnorm
 
-[ 5.0 ] [ svector{ 3.0 4.0 } Vnorm ] unit-test
-[ 5.0 ] [ dvector{ 3.0 4.0 } Vnorm ] unit-test
+[ t ] [ svector{ 3.0 4.0 } Vnorm 5.0 0.000001 ~ ] unit-test
+[ t ] [ dvector{ 3.0 4.0 } Vnorm 5.0 0.000001 ~ ] unit-test
 
-[ 13.0 ] [ cvector{ C{ 3.0 4.0 } 12.0 } Vnorm ] unit-test
-[ 13.0 ] [ zvector{ C{ 3.0 4.0 } 12.0 } Vnorm ] unit-test
+[ t ] [ cvector{ C{ 3.0 4.0 } 12.0 } Vnorm 13.0 0.000001 ~ ] unit-test
+[ t ] [ zvector{ C{ 3.0 4.0 } 12.0 } Vnorm 13.0 0.000001 ~ ] unit-test
 
 ! Vasum