From: Erik Charlebois Date: Mon, 22 Feb 2010 18:53:19 +0000 (-0800) Subject: Merge alien/parser/parser.factor X-Git-Tag: 0.97~4850 X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=833372cd0802184757240b3948e816de45241e8e Merge alien/parser/parser.factor --- 833372cd0802184757240b3948e816de45241e8e diff --cc basis/alien/parser/parser.factor index d073a4caac,8385bfb97f..8d850c47ee --- a/basis/alien/parser/parser.factor +++ b/basis/alien/parser/parser.factor @@@ -88,13 -88,10 +88,10 @@@ IN: alien.parse make-function define-declared ; : callback-quot ( return types abi -- quot ) - [ [ ] 3curry dip alien-callback ] 3curry ; - - : library-abi ( lib -- abi ) - library [ abi>> ] [ "cdecl" ] if* ; + '[ [ _ _ _ ] dip alien-callback ] ; :: make-callback-type ( lib return type-name parameters -- word quot effect ) - return type-name normalize-c-arg :> ( return type-name ) + return type-name normalize-c-arg :> ( return-c-type type-name ) type-name current-vocab create :> type-word type-word [ reset-generic ] [ reset-c-type ] bi void* type-word typedef