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

Merge branch 'master' into new_ui

db4
Slava Pestov 2009-02-10 16:53:09 -06:00
parent 43e6a6987a 561a3b74b1
commit fb84b8dd6a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -418,8 +418,12 @@ PRIVATE>
: RECORD: scan in get parse-definition define-fortran-record ; parsing : RECORD: scan in get parse-definition define-fortran-record ; parsing
: set-fortran-abi ( library -- )
library-fortran-abis get-global at fortran-abi set ;
: (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] ]
@ -445,5 +449,5 @@ MACRO: fortran-invoke ( return library function parameters -- )
: LIBRARY: : LIBRARY:
scan scan
[ "c-library" set ] [ "c-library" set ]
[ library-fortran-abis get-global at fortran-abi set ] bi ; parsing [ set-fortran-abi ] bi ; parsing

2
basis/cocoa/messages/messages.factor
View File

@ -79,7 +79,7 @@ MACRO: (send) ( selector super? -- quot )
! Runtime introspection ! Runtime introspection
SYMBOL: class-init-hooks SYMBOL: class-init-hooks
class-init-hooks [ H{ } clone or ] initialize class-init-hooks [ H{ } clone ] initialize
: (objc-class) ( name word -- class ) : (objc-class) ( name word -- class )
2dup execute dup [ 2nip ] [ 2dup execute dup [ 2nip ] [