From 58485af60b8aaa3bdb57791f18cc7975fda11e6a Mon Sep 17 00:00:00 2001 From: Erik Charlebois Date: Mon, 22 Feb 2010 00:45:54 -0800 Subject: [PATCH] Fix CALLBACK: effect return type also not a string. Added accompanying unit test. --- basis/alien/parser/parser-tests.factor | 9 +++++++-- basis/alien/parser/parser.factor | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/basis/alien/parser/parser-tests.factor b/basis/alien/parser/parser-tests.factor index 2fec2d9a4c..84eefe9df6 100644 --- a/basis/alien/parser/parser-tests.factor +++ b/basis/alien/parser/parser-tests.factor @@ -34,9 +34,14 @@ CONSTANT: eleven 11 ] with-file-vocabs -FUNCTION: void* alien-parser-effect-test ( int *arg1 float arg2 ) ; +FUNCTION: void* alien-parser-function-effect-test ( int *arg1 float arg2 ) ; [ (( arg1 arg2 -- void* )) ] [ - \ alien-parser-effect-test "declared-effect" word-prop + \ alien-parser-function-effect-test "declared-effect" word-prop +] unit-test + +CALLBACK: void* alien-parser-callback-effect-test ( int *arg1 float arg2 ) ; +[ (( arg1 arg2 -- void* )) ] [ + \ alien-parser-callback-effect-test "callback-effect" word-prop ] unit-test ! Reported by mnestic diff --git a/basis/alien/parser/parser.factor b/basis/alien/parser/parser.factor index dc0a1701f2..d073a4caac 100644 --- a/basis/alien/parser/parser.factor +++ b/basis/alien/parser/parser.factor @@ -93,15 +93,15 @@ IN: alien.parser : library-abi ( lib -- abi ) library [ abi>> ] [ "cdecl" ] if* ; -:: make-callback-type ( lib return! type-name! parameters -- word quot effect ) - return type-name normalize-c-arg type-name! return! +:: make-callback-type ( lib return type-name parameters -- word quot effect ) + 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 parameters return parse-arglist :> ( types callback-effect ) type-word callback-effect "callback-effect" set-word-prop type-word lib "callback-library" set-word-prop - type-word return types lib library-abi callback-quot (( quot -- alien )) ; + type-word return-c-type types lib library-abi callback-quot (( quot -- alien )) ; : (CALLBACK:) ( -- word quot effect ) "c-library" get