Fix CALLBACK: effect return type also not a string. Added accompanying unit test.

diff --git a/basis/alien/parser/parser-tests.factor b/basis/alien/parser/parser-tests.factor
index 2fec2d9a4ce750346a763d0ae1e6cad858949a62..84eefe9df60126c4ed0d443be1c74833904fd9f8 100644 (file)
--- 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 dc0a1701f22ea70b45f79aaad16856d8da0a9b72..d073a4caac2b9f863f394c7f6db4e777e206b098 100644 (file)
--- 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