From 6142bd7335adaa9637538eb7798e8aec4ede309f Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Wed, 28 Jul 2010 03:05:14 -0400 Subject: [PATCH] alien.syntax: FUNCTION: and FUNCTION-ALIAS: now define inline words --- basis/alien/parser/parser-tests.factor | 14 ++++++++++++++ basis/alien/syntax/syntax.factor | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/basis/alien/parser/parser-tests.factor b/basis/alien/parser/parser-tests.factor index 26a71e9623..9101acad50 100644 --- a/basis/alien/parser/parser-tests.factor +++ b/basis/alien/parser/parser-tests.factor @@ -31,15 +31,29 @@ CONSTANT: eleven 11 ] with-file-vocabs FUNCTION: void* alien-parser-function-effect-test ( int *arg1 float arg2 ) ; + [ (( arg1 arg2 -- void* )) ] [ \ alien-parser-function-effect-test "declared-effect" word-prop ] unit-test +[ t ] [ \ alien-parser-function-effect-test inline? ] unit-test + +FUNCTION-ALIAS: (alien-parser-function-effect-test) void* alien-parser-function-effect-test ( int *arg1 float arg2 ) ; + +[ (( arg1 arg2 -- void* )) ] [ + \ (alien-parser-function-effect-test) "declared-effect" word-prop +] unit-test + +[ t ] [ \ (alien-parser-function-effect-test) inline? ] 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 +[ t ] [ \ alien-parser-callback-effect-test inline? ] unit-test + ! Reported by mnestic TYPEDEF: int alien-parser-test-int ! reasonably unique name... diff --git a/basis/alien/syntax/syntax.factor b/basis/alien/syntax/syntax.factor index 6c2dc5ca85..259f99a833 100755 --- a/basis/alien/syntax/syntax.factor +++ b/basis/alien/syntax/syntax.factor @@ -16,11 +16,11 @@ SYNTAX: BAD-ALIEN suffix! ; SYNTAX: LIBRARY: scan current-library set ; SYNTAX: FUNCTION: - (FUNCTION:) make-function define-declared ; + (FUNCTION:) make-function define-inline ; SYNTAX: FUNCTION-ALIAS: scan-token create-function - (FUNCTION:) (make-function) define-declared ; + (FUNCTION:) (make-function) define-inline ; SYNTAX: CALLBACK: (CALLBACK:) define-inline ;