Merge branch 'master' of git://factorcode.org/git/factor into new-alien-pointers

diff --cc basis/alien/parser/parser-tests.factor
index b7f7b106282e6ce2300d0e02d1a7f2def911767b,2fec2d9a4ce750346a763d0ae1e6cad858949a62..d2aec71f52db0f6ce1de5af42edead1e07a629fa
--- 1/basis/alien/parser/parser-tests.factor
--- 2/basis/alien/parser/parser-tests.factor
+++ b/basis/alien/parser/parser-tests.factor
@@@ -18,18 -18,27 +18,23 @@@ CONSTANT: eleven 1
      [ { int 5 } ] [ "int[5]" parse-c-type ] unit-test
      [ { int 5 10 11 } ] [ "int[5][10][11]" parse-c-type ] unit-test
      [ { int 5 10 eleven } ] [ "int[5][10][eleven]" parse-c-type ] unit-test
 -    [ void* ] [ "int*" parse-c-type ] unit-test
 -    [ void* ] [ "int**" parse-c-type ] unit-test
 -    [ void* ] [ "int***" parse-c-type ] unit-test
 -    [ void* ] [ "int****" parse-c-type ] unit-test
 -    [ char* ] [ "char*" parse-c-type ] unit-test
 -    [ void* ] [ "char**" parse-c-type ] unit-test
 -    [ void* ] [ "char***" parse-c-type ] unit-test
 -    [ void* ] [ "char****" parse-c-type ] unit-test
 +    [ pointer: void ] [ "void*" parse-c-type ] unit-test
 +    [ pointer: int ] [ "int*" parse-c-type ] unit-test
 +    [ pointer: int* ] [ "int**" parse-c-type ] unit-test
 +    [ pointer: int** ] [ "int***" parse-c-type ] unit-test
 +    [ pointer: int*** ] [ "int****" parse-c-type ] unit-test
 +    [ pointer: char ] [ "char*" parse-c-type ] unit-test
      [ char2 ] [ "char2" parse-c-type ] unit-test
 -    [ char* ] [ "char2*" parse-c-type ] unit-test
 +    [ pointer: char2 ] [ "char2*" parse-c-type ] unit-test
  
 -    [ "not-c-type" parse-c-type ] [ no-c-type? ] must-fail-with
      [ "not-word" parse-c-type ] [ error>> no-word-error? ] must-fail-with
 -
  ] with-file-vocabs
  
+ FUNCTION: void* alien-parser-effect-test ( int *arg1 float arg2 ) ;
+ [ (( arg1 arg2 -- void* )) ] [
+     \ alien-parser-effect-test "declared-effect" word-prop
+ ] unit-test
+ 
  ! Reported by mnestic
  TYPEDEF: int alien-parser-test-int ! reasonably unique name...
  

diff --cc basis/alien/parser/parser.factor
Simple merge