Merge branch 'master' of git://factorcode.org/git/factor

diff --cc basis/alien/parser/parser-tests.factor
index 84eefe9df60126c4ed0d443be1c74833904fd9f8,d2aec71f52db0f6ce1de5af42edead1e07a629fa..37f10722d1845e02e2d8592ad91a4075926ddbcc
--- 1/basis/alien/parser/parser-tests.factor
--- 2/basis/alien/parser/parser-tests.factor
+++ b/basis/alien/parser/parser-tests.factor
@@@ -18,30 -18,21 +18,26 @@@ 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 ) ;
 +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