Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch : master

http://hackage.haskell.org/trac/ghc/changeset/64da5fe8e0c218379ba394251384613b25876e6c

>---------------------------------------------------------------

commit 64da5fe8e0c218379ba394251384613b25876e6c
Author: Ian Lynagh <igloo@xxxxxxxx>
Date: Wed Feb 22 01:45:12 2012 +0000

Remove type synonym part of Capi_Ctype_001

We no longer support CTYPE pragmas on type synonyms

>---------------------------------------------------------------

tests/ffi/should_run/Capi_Ctype_001.hsc | 9 ---------
tests/ffi/should_run/Capi_Ctype_001.stdout | 1 -
tests/ffi/should_run/Capi_Ctype_A_001.hsc | 2 --
3 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/tests/ffi/should_run/Capi_Ctype_001.hsc
b/tests/ffi/should_run/Capi_Ctype_001.hsc
index 71e48f1..5dd24c3 100644
--- a/tests/ffi/should_run/Capi_Ctype_001.hsc
+++ b/tests/ffi/should_run/Capi_Ctype_001.hsc
@@ -19,10 +19,6 @@ main = do alloca $ \p ->
do poke p (Foo 15 16 17)
r2 <- g p
print r2
- alloca $ \p ->
- do poke p (FooA 25 26 27)
- r3 <- h p
- print r3

data {-# CTYPE "Foo" #-}
Foo = Foo {
@@ -31,17 +27,12 @@ data {-# CTYPE "Foo" #-}
k :: CInt
}

-type FooASynSyn = FooASyn
-
foreign import capi unsafe "capi_ctype_001.h f"
f :: Ptr Foo -> IO CInt

foreign import capi unsafe "capi_ctype_001.h g"
g :: Ptr Foo -> IO CInt

-foreign import capi unsafe "capi_ctype_001.h g"
- h :: Ptr FooASynSyn -> IO CInt
-
instance Storable Foo where
sizeOf _ = #size Foo
alignment = sizeOf
diff --git a/tests/ffi/should_run/Capi_Ctype_001.stdout
b/tests/ffi/should_run/Capi_Ctype_001.stdout
index 87c8729..dc3ed24 100644
--- a/tests/ffi/should_run/Capi_Ctype_001.stdout
+++ b/tests/ffi/should_run/Capi_Ctype_001.stdout
@@ -1,3 +1,2 @@
6
16
-26
diff --git a/tests/ffi/should_run/Capi_Ctype_A_001.hsc
b/tests/ffi/should_run/Capi_Ctype_A_001.hsc
index 103b264..8b68942 100644
--- a/tests/ffi/should_run/Capi_Ctype_A_001.hsc
+++ b/tests/ffi/should_run/Capi_Ctype_A_001.hsc
@@ -14,8 +14,6 @@ data FooA = FooA {
ka :: CInt
}

-type {-# CTYPE "Foo" #-} FooASyn = FooA
-
instance Storable FooA where
sizeOf _ = #size Foo
alignment = sizeOf



_______________________________________________
Cvs-ghc mailing list
Cvs-ghc@xxxxxxxxxxx
http://www.haskell.org/mailman/listinfo/cvs-ghc