From 94a5582edc79d19b18b552e628e4e91304b85c27 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 11 Feb 2009 14:05:57 -0600 Subject: [PATCH 1/2] tweak fortran-invoke so that unit tests can set fortran-abi without being shouted over --- basis/alien/fortran/fortran.factor | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/basis/alien/fortran/fortran.factor b/basis/alien/fortran/fortran.factor index a2ffc55c02..915b7d3d4f 100644 --- 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 [] ] [ 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 From 633ffaa9ddde3c00f3e52044199493903630458c Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 11 Feb 2009 14:06:46 -0600 Subject: [PATCH 2/2] play horseshoes in math.blas.vectors tests to deal with excessively accurate x87 math --- basis/math/blas/vectors/vectors-tests.factor | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/basis/math/blas/vectors/vectors-tests.factor b/basis/math/blas/vectors/vectors-tests.factor index da271a4fc7..ef2f7ad6f9 100644 --- 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