From: Joe Groff <arcata@gmail.com>
Date: Mon, 22 Feb 2010 07:14:08 +0000 (-0800)
Subject: Merge branch 'master' of git://factorcode.org/git/factor into new-alien-pointers
X-Git-Tag: 0.97~4841^2~12
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=338edac16cadad36a08d1b14d150f7883edcb67f

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

338edac16cadad36a08d1b14d150f7883edcb67f
diff --cc basis/alien/parser/parser-tests.factor
index b7f7b10628,2fec2d9a4c..d2aec71f52
--- a/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...