diff --git a/basis/alien/parser/parser-tests.factor b/basis/alien/parser/parser-tests.factor index 83d71e80fb..cb1d44be87 100644 --- a/basis/alien/parser/parser-tests.factor +++ b/basis/alien/parser/parser-tests.factor @@ -36,7 +36,7 @@ CONSTANT: eleven 11 [ "not-word" parse-c-type ] [ error>> no-word-error? ] must-fail-with ] with-file-vocabs -FUNCTION: void* alien-parser-function-effect-test ( int *arg1, float arg2 ) ; +FUNCTION: void* alien-parser-function-effect-test ( int *arg1, float arg2 ) { ( arg1 arg2 -- void* ) } [ \ alien-parser-function-effect-test "declared-effect" word-prop @@ -44,7 +44,7 @@ FUNCTION: void* alien-parser-function-effect-test ( int *arg1, float arg2 ) ; { 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 ) ; +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 @@ -52,7 +52,7 @@ FUNCTION-ALIAS: (alien-parser-function-effect-test) void* alien-parser-function- { t } [ \ (alien-parser-function-effect-test) inline? ] unit-test -CALLBACK: void* alien-parser-callback-effect-test ( int *arg1 float arg2 ) ; +CALLBACK: void* alien-parser-callback-effect-test ( int *arg1 float arg2 ) { ( arg1 arg2 -- void* ) } [ \ alien-parser-callback-effect-test "callback-effect" word-prop diff --git a/basis/alien/parser/parser.factor b/basis/alien/parser/parser.factor index 73c9c0a911..843f0410aa 100755 --- a/basis/alien/parser/parser.factor +++ b/basis/alien/parser/parser.factor @@ -120,7 +120,7 @@ PRIVATE> scan-token "," ?tail drop parse-pointers [ types push ] [ names push ] bi* scan-token - ] until drop ";" expect types names [ >array ] bi@ ; + ] until drop types names [ >array ] bi@ ; : function-quot ( return library function types -- quot ) '[ _ _ _ _ alien-invoke ] ; diff --git a/basis/windows/com/syntax/syntax.factor b/basis/windows/com/syntax/syntax.factor index 79d5c5db8a..f6cf51d3d4 100755 --- a/basis/windows/com/syntax/syntax.factor +++ b/basis/windows/com/syntax/syntax.factor @@ -38,7 +38,7 @@ ERROR: no-com-interface interface ; dup word>> +com-interface-definitions+ get-global set-at ; : (parse-com-function) ( return name -- definition ) - ")" scan-c-args + scan-c-args [ pointer: void prefix ] [ "this" prefix ] bi* ; diff --git a/extra/cuda/syntax/syntax.factor b/extra/cuda/syntax/syntax.factor index 0be2df2f14..001eb7d560 100644 --- a/extra/cuda/syntax/syntax.factor +++ b/extra/cuda/syntax/syntax.factor @@ -11,7 +11,7 @@ SYNTAX: CUDA-LIBRARY: SYNTAX: CUDA-FUNCTION: scan-token [ create-word-in current-cuda-library get ] keep - ";" scan-c-args drop define-cuda-function ; + scan-c-args drop define-cuda-function ; SYNTAX: CUDA-GLOBAL: scan-token [ create-word-in current-cuda-library get ] keep