core: trim using lists with lint.vocabs tool

[factor.git] / core / alien / alien.factor

diff --git a/core/alien/alien.factor b/core/alien/alien.factor
old mode 100755 (executable)
new mode 100644 (file)
index 7d2c242..689053e
--- a/core/alien/alien.factor
+++ b/core/alien/alien.factor
@@ -1,13 +1,23 @@
 ! Copyright (C) 2004, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs byte-arrays byte-vectors continuations
-continuations.private init kernel kernel.private math namespaces
+continuations.private kernel kernel.private math namespaces
 sequences ;
+USE: init ! required but does not reference words
 IN: alien
 
 BUILTIN: alien { underlying c-ptr read-only initial: f } expired ;
 BUILTIN: dll { path byte-array read-only initial: B{ } } ;
 
+PRIMITIVE: <callback> ( word return-rewind -- alien )
+PRIMITIVE: <displaced-alien> ( displacement c-ptr -- alien )
+PRIMITIVE: alien-address ( c-ptr -- addr )
+PRIMITIVE: free-callback ( alien -- )
+
+<PRIVATE
+PRIMITIVE: current-callback ( -- n )
+PRIVATE>
+
 PREDICATE: pinned-alien < alien underlying>> not ;
 
 UNION: pinned-c-ptr pinned-alien POSTPONE: f ;
@@ -74,25 +84,19 @@ UNION: abi stdcall thiscall fastcall cdecl mingw ;
 : callee-cleanup? ( abi -- ? )
     { stdcall fastcall thiscall } member? ;
 
-ERROR: alien-callback-error ;
+ERROR: callsite-not-compiled word ;
 
-: alien-callback ( return parameters abi quot -- alien )
-    alien-callback-error ;
+: alien-assembly ( args... return parameters abi quot -- return... )
+    \ alien-assembly callsite-not-compiled ;
 
-ERROR: alien-indirect-error ;
+: alien-callback ( return parameters abi quot -- alien )
+    \ alien-callback callsite-not-compiled ;
 
 : alien-indirect ( args... funcptr return parameters abi -- return... )
-    alien-indirect-error ;
-
-ERROR: alien-invoke-error library symbol ;
-
-: alien-invoke ( args... return library function parameters -- return... )
-    2over alien-invoke-error ;
+    \ alien-indirect callsite-not-compiled ;
 
-ERROR: alien-assembly-error code ;
-
-: alien-assembly ( args... return parameters abi quot -- return... )
-    dup alien-assembly-error ;
+: alien-invoke ( args... return library function parameters varargs? -- return... )
+    \ alien-invoke callsite-not-compiled ;
 
 <PRIVATE
 
@@ -102,12 +106,12 @@ ERROR: alien-assembly-error code ;
 ! cleared on startup.
 SYMBOL: callbacks
 
-[ H{ } clone callbacks set-global ] "alien" add-startup-hook
+STARTUP-HOOK: [ H{ } clone callbacks set-global ]
 
 ! Used by compiler.codegen to wrap callback bodies
 : do-callback ( callback-quot wait-quot: ( callback -- ) -- )
     t CONTEXT-OBJ-IN-CALLBACK-P set-context-object
-    init-namespaces
+    init-namestack
     init-catchstack
     current-callback
     [ 2drop call ] [ swap call( callback -- ) drop ] 3bi ; inline
@@ -117,10 +121,10 @@ SYMBOL: callbacks
 TUPLE: expiry-check object alien ;
 
 : recompute-value? ( check -- ? )
-    dup [ alien>> expired? ] [ drop t ] if ;
+    [ alien>> expired? ] [ t ] if* ;
 
 : delete-values ( value assoc -- )
-    [ rot drop = not ] with assoc-filter! drop ;
+    [ rot drop = ] with assoc-reject! drop ;
 
 PRIVATE>
 
@@ -128,7 +132,7 @@ PRIVATE>
     [ callbacks get delete-values ] [ free-callback ] bi ;
 
 : with-callback ( alien quot -- )
-    over [ unregister-and-free-callback ] curry [ ] cleanup ; inline
+    over [ unregister-and-free-callback ] curry finally ; inline
 
 : initialize-alien ( symbol quot -- )
     swap dup get-global dup recompute-value?