Merge branch 'master' into new_ui

diff --git a/basis/alien/fortran/fortran.factor b/basis/alien/fortran/fortran.factor
index cdf64ecb10a26250e1e4b59a0ebf6b59366753af..a2ffc55c028abf0bd2c8aef8177c9284030054f2 100644 (file)
--- a/basis/alien/fortran/fortran.factor
+++ b/basis/alien/fortran/fortran.factor
@@ -418,8 +418,12 @@ PRIVATE>
 
 : 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 )
     {
+        [ 2drop nip set-fortran-abi ]
         [ 2nip [<fortran-result>] ]
         [ nip nip nip [fortran-args>c-args] ]
         [ [fortran-invoke] ]
@@ -445,5 +449,5 @@ MACRO: fortran-invoke ( return library function parameters -- )
 : LIBRARY:
     scan
     [ "c-library" set ]
-    [ library-fortran-abis get-global at fortran-abi set ] bi  ; parsing
+    [ set-fortran-abi ] bi  ; parsing
 

diff --git a/basis/cocoa/messages/messages.factor b/basis/cocoa/messages/messages.factor
index 5234fc6d667f5ecbb5cdbc44b7cab1c794fc11c7..71e574a2e5ada2b52d7e5c6d8e1a63bf2908a544 100644 (file)
--- a/basis/cocoa/messages/messages.factor
+++ b/basis/cocoa/messages/messages.factor
@@ -79,7 +79,7 @@ MACRO: (send) ( selector super? -- quot )
 ! Runtime introspection
 SYMBOL: class-init-hooks
 
-class-init-hooks [ H{ } clone or ] initialize
+class-init-hooks [ H{ } clone ] initialize
 
 : (objc-class) ( name word -- class )
     2dup execute dup [ 2nip ] [