steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

db4
Doug Coleman 2009-02-11 14:07:22 -06:00
parent ed1ace93e7 a2e261e2a8
commit 3577bf660b
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
basis/alien/fortran/fortran.factor
View File

@ -423,7 +423,6 @@ PRIVATE>
: (fortran-invoke) ( return library function parameters -- quot ) : (fortran-invoke) ( return library function parameters -- quot )
{ {
[ 2drop nip set-fortran-abi ]
[ 2nip [<fortran-result>] ] [ 2nip [<fortran-result>] ]
[ nip nip nip [fortran-args>c-args] ] [ nip nip nip [fortran-args>c-args] ]
[ [fortran-invoke] ] [ [fortran-invoke] ]
@ -431,7 +430,7 @@ PRIVATE>
} 4 ncleave 4 nappend ; } 4 ncleave 4 nappend ;
MACRO: fortran-invoke ( return library function parameters -- ) 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 -- ) :: define-fortran-function ( return library function parameters -- )
function create-in dup reset-generic function create-in dup reset-generic

10
basis/math/blas/vectors/vectors-tests.factor
View File

@ -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 IN: math.blas.vectors.tests
! clone ! clone
@ -126,11 +126,11 @@ unit-test
! Vnorm ! Vnorm
[ 5.0 ] [ svector{ 3.0 4.0 } Vnorm ] unit-test [ t ] [ svector{ 3.0 4.0 } Vnorm 5.0 0.000001 ~ ] unit-test
[ 5.0 ] [ dvector{ 3.0 4.0 } Vnorm ] 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 [ t ] [ cvector{ C{ 3.0 4.0 } 12.0 } Vnorm 13.0 0.000001 ~ ] unit-test
[ 13.0 ] [ zvector{ C{ 3.0 4.0 } 12.0 } Vnorm ] unit-test [ t ] [ zvector{ C{ 3.0 4.0 } 12.0 } Vnorm 13.0 0.000001 ~ ] unit-test
! Vasum ! Vasum