[commit: base] type-nats: Merge branch 'master' into type-nats (328b392)
Iavor Diatchki
diatchki at galois.com
Wed Mar 14 06:15:53 CET 2012
Repository : ssh://darcs.haskell.org//srv/darcs/packages/base
On branch : type-nats
http://hackage.haskell.org/trac/ghc/changeset/328b3926626a7f492e76b9e0b1c1a9bea6e0bd07
>---------------------------------------------------------------
commit 328b3926626a7f492e76b9e0b1c1a9bea6e0bd07
Merge: a656b68... 48df85c...
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date: Tue Mar 13 22:00:16 2012 -0700
Merge branch 'master' into type-nats
Control/Category.hs | 3 -
Control/Concurrent/Chan.hs | 18 +-
Control/Monad/ST/Imp.hs | 4 +-
Control/OldException.hs | 806 --------------------
Data/Bits.hs | 7 +-
Data/Char.hs | 1 +
Data/Monoid.hs | 14 -
Foreign/C/String.hs | 1 +
Foreign/Storable.hs | 1 -
GHC/Base.lhs | 25 +-
GHC/Char.hs | 15 +
GHC/Desugar.hs | 2 -
GHC/Enum.lhs | 2 +-
GHC/Err.lhs | 2 -
GHC/IO/Encoding/Failure.hs | 1 +
GHC/Int.hs | 56 +-
GHC/MVar.hs | 1 -
GHC/Num.lhs | 8 -
GHC/Read.lhs | 27 +-
GHC/Show.lhs | 12 +-
GHC/Stable.lhs | 2 +-
GHC/Unicode.hs | 1 +
GHC/Word.hs | 34 +-
Numeric.hs | 5 +-
System/Environment.hs | 4 +-
System/Posix/Internals.hs | 38 +-
System/Posix/Types.hs | 2 +-
Text/ParserCombinators/ReadP.hs | 2 -
Text/Read/Lex.hs | 111 ++-
Unsafe/Coerce.hs | 5 +-
base.cabal | 3 +-
cbits/selectUtils.c | 3 -
include/CTypes.h | 6 +
include/HsBase.h | 89 ---
tests/4006.hs | 8 +
tests/4006.stdout | 2 +
tests/Concurrent/4876.hs | 19 +
tests/Concurrent/4876.stdout | 1 +
tests/Concurrent/Chan001.hs | 109 +++
tests/Concurrent/Chan001.stdout | 3 +
tests/Concurrent/MVar001.hs | 148 ++++
tests/Concurrent/MVar001.stdout | 6 +
tests/{Numeric => Concurrent}/Makefile | 0
tests/Concurrent/QSem001.hs | 93 +++
tests/Concurrent/QSem001.stdout | 2 +
tests/Concurrent/QSemN001.hs | 96 +++
tests/Concurrent/QSemN001.stdout | 2 +
tests/Concurrent/SampleVar001.hs | 132 ++++
tests/Concurrent/SampleVar001.stdout | 6 +
tests/Concurrent/ThreadDelay001.hs | 26 +
tests/Concurrent/all.T | 10 +
tests/IO/2122.hs | 76 ++
tests/IO/3307.hs | 52 ++
tests/IO/3307.stdout | 12 +
tests/IO/4808.hs | 13 +
tests/IO/4808.stderr | 1 +
tests/IO/4808.stdout | 1 +
tests/IO/4855.hs | 3 +
tests/IO/4855.stderr | 1 +
tests/IO/4895.hs | 9 +
tests/IO/4895.stdout | 1 +
tests/IO/IOError001.hs | 7 +
tests/IO/IOError001.stdout | 2 +
tests/IO/IOError001.stdout-hugs | 2 +
tests/IO/IOError002.hs | 5 +
tests/IO/IOError002.stdout | 1 +
tests/IO/Makefile | 52 ++
tests/IO/T4144.hs | 115 +++
tests/IO/T4144.stdout | 1 +
tests/IO/all.T | 161 ++++
tests/IO/concio001.hs | 6 +
tests/IO/concio001.stdout | 2 +
tests/IO/concio001.thr.stdout | 2 +
tests/IO/concio002.hs | 14 +
tests/IO/concio002.stdout | 4 +
tests/IO/countReaders001.hs | 17 +
tests/IO/countReaders001.stdout | 1 +
.../IO/countReaders001.stdout-i386-unknown-mingw32 | 1 +
tests/IO/decodingerror001.hs | 22 +
tests/IO/decodingerror001.in1 | 1 +
tests/IO/decodingerror001.in2 | 1 +
tests/IO/decodingerror001.stdout | 10 +
tests/IO/decodingerror002.hs | 23 +
tests/IO/decodingerror002.in | 1 +
tests/IO/decodingerror002.stdout | 4 +
tests/IO/encoding001.hs | 71 ++
tests/IO/encoding002.hs | 67 ++
tests/IO/encoding002.stdout | 61 ++
tests/IO/encodingerror001.hs | 27 +
tests/IO/encodingerror001.stdout | 36 +
tests/IO/environment001.hs | 16 +
tests/IO/environment001.stdout | 6 +
tests/IO/finalization001.hs | 26 +
tests/IO/finalization001.stdout | 200 +++++
tests/IO/hClose001.hs | 8 +
tests/IO/hClose001.stdout | 1 +
tests/IO/hClose002.hs | 32 +
tests/IO/hClose002.stdout | 4 +
tests/IO/hClose002.stdout-i386-unknown-solaris2 | 4 +
tests/IO/hClose003.hs | 42 +
tests/IO/hClose003.stdout | 4 +
tests/IO/hDuplicateTo001.hs | 24 +
tests/IO/hDuplicateTo001.stderr | 2 +
tests/IO/hFileSize001.hs | 8 +
tests/IO/hFileSize001.stdout | 1 +
tests/IO/hFileSize001.stdout-mingw | 1 +
tests/IO/hFileSize002.hs | 35 +
tests/IO/hFileSize002.stdout | 5 +
tests/IO/hFlush001.hs | 31 +
tests/IO/hFlush001.stdout | 2 +
tests/IO/hGetBuf001.hs | 218 ++++++
tests/IO/hGetBuf001.stdout | 117 +++
tests/IO/hGetBuffering001.hs | 21 +
tests/IO/hGetBuffering001.stdout | 7 +
tests/IO/hGetChar001.hs | 18 +
tests/IO/hGetChar001.stdin | 2 +
tests/IO/hGetChar001.stdout | 1 +
tests/IO/hGetLine001.hs | 25 +
tests/IO/hGetLine001.stdout | 100 +++
tests/IO/hGetLine002.hs | 16 +
tests/IO/hGetLine002.stdin | 1 +
tests/IO/hGetLine002.stdout | 2 +
tests/IO/hGetLine002.stdout-hugs | 2 +
tests/IO/hGetLine003.hs | 9 +
tests/IO/hGetLine003.stdin | 1 +
tests/IO/hGetLine003.stdout | 2 +
tests/IO/hGetPosn001.hs | 28 +
tests/IO/hGetPosn001.in | 2 +
tests/IO/hGetPosn001.stdout | 5 +
tests/IO/hGetPosn001.stdout-hugs | 5 +
tests/IO/hIsEOF001.hs | 7 +
tests/IO/hIsEOF001.stdout | 2 +
tests/IO/hIsEOF002.hs | 48 ++
tests/IO/hIsEOF002.stdout | 16 +
tests/IO/hReady001.hs | 11 +
tests/IO/hReady001.stdout | 2 +
tests/IO/hReady002.hs | 10 +
tests/IO/hReady002.stdout | 1 +
tests/IO/hSeek001.hs | 30 +
tests/IO/hSeek001.in | 1 +
tests/IO/hSeek001.stdout | 7 +
tests/IO/hSeek002.hs | 25 +
tests/IO/hSeek002.stdout | 5 +
tests/IO/hSeek003.hs | 51 ++
tests/IO/hSeek003.stdout | 24 +
tests/IO/hSeek004.hs | 8 +
tests/IO/hSeek004.stdout | 1 +
tests/IO/hSeek004.stdout-mingw | 5 +
tests/IO/hSetBuffering002.hs | 6 +
tests/IO/hSetBuffering002.stdout | 6 +
tests/IO/hSetBuffering003.hs | 79 ++
tests/IO/hSetBuffering003.stderr | 1 +
tests/IO/hSetBuffering003.stdout | 22 +
tests/IO/hSetBuffering004.hs | 9 +
tests/IO/hSetBuffering004.stdout | 1 +
tests/IO/hSetEncoding001.hs | 49 ++
tests/IO/hSetEncoding001.in | Bin 0 -> 2076 bytes
tests/IO/hSetEncoding001.stdout | 90 +++
tests/IO/hSetEncoding002.hs | 13 +
tests/IO/hSetEncoding002.stdout | 1 +
tests/IO/ioeGetErrorString001.hs | 13 +
tests/IO/ioeGetErrorString001.stdout | 1 +
tests/IO/ioeGetFileName001.hs | 12 +
tests/IO/ioeGetFileName001.stdout | 1 +
tests/IO/ioeGetHandle001.hs | 13 +
tests/IO/ioeGetHandle001.stdout | 1 +
tests/IO/isEOF001.hs | 3 +
tests/IO/isEOF001.stdout | 1 +
tests/IO/latin1 | 5 +
tests/IO/misc001.hs | 24 +
NHC/Makefile => tests/IO/misc001.stdout | 0
tests/IO/newline001.hs | 121 +++
tests/IO/openFile001.hs | 11 +
tests/IO/openFile001.stdout | 1 +
tests/IO/openFile002.hs | 6 +
tests/IO/openFile002.stderr | 1 +
tests/IO/openFile002.stderr-hugs | 1 +
tests/IO/openFile003.hs | 17 +
tests/IO/openFile003.stdout | 4 +
tests/IO/openFile003.stdout-i386-unknown-mingw32 | 4 +
tests/IO/openFile003.stdout-i386-unknown-solaris2 | 4 +
tests/IO/openFile003.stdout-mingw | 16 +
tests/IO/openFile003.stdout-mips-sgi-irix | 4 +
tests/IO/openFile003.stdout-sparc-sun-solaris2 | 4 +
tests/IO/openFile004.hs | 23 +
tests/IO/openFile004.stdout | 1 +
tests/IO/openFile005.hs | 45 ++
tests/IO/openFile005.stdout | 12 +
tests/IO/openFile005.stdout-i386-unknown-mingw32 | 12 +
tests/IO/openFile006.hs | 14 +
tests/IO/openFile006.stdout | 2 +
tests/IO/openFile007.hs | 18 +
tests/IO/openFile007.stdout | 2 +
tests/IO/openFile007.stdout-i386-unknown-mingw32 | 2 +
tests/IO/openFile008.hs | 22 +
tests/IO/openTempFile001.hs | 13 +
tests/IO/putStr001.hs | 6 +
tests/IO/putStr001.stdout | 1 +
tests/IO/readFile001.hs | 26 +
tests/IO/readFile001.stdout | 30 +
tests/IO/readFile001.stdout-i386-unknown-mingw32 | 30 +
tests/IO/readwrite001.hs | 23 +
tests/IO/readwrite001.stdout | 3 +
tests/IO/readwrite002.hs | 49 ++
tests/IO/readwrite002.stdout | 9 +
tests/IO/readwrite003.hs | 12 +
tests/IO/readwrite003.stdout | 4 +
tests/IO/utf8-test | 3 +
tests/Memo1.lhs | 142 ++++
tests/Memo2.lhs | 142 ++++
tests/addr001.hs | 10 +
tests/addr001.stdout | 2 +
tests/addr001.stdout-alpha-dec-osf3 | 2 +
tests/addr001.stdout-mips-sgi-irix | 2 +
tests/addr001.stdout-ws-64 | 2 +
tests/addr001.stdout-x86_64-unknown-openbsd | 2 +
tests/all.T | 88 +++-
tests/char001.hs | 43 +
tests/char001.stdout | 18 +
tests/char002.hs | 7 +
tests/char002.stdout | 4 +
tests/cstring001.hs | 18 +
tests/dynamic001.hs | 107 +++
tests/dynamic001.stdout | 42 +
tests/dynamic002.hs | 91 +++
tests/dynamic002.stdout | 64 ++
tests/dynamic003.hs | 12 +
tests/dynamic003.stdout | 1 +
tests/dynamic004.hs | 36 +
tests/dynamic004.stdout | 1 +
tests/dynamic005.hs | 14 +
tests/dynamic005.stdout | 1 +
tests/echo001.hs | 13 +
tests/echo001.stdout | 14 +
tests/enum01.hs | 526 +++++++++++++
tests/enum01.stdout | 246 ++++++
tests/enum01.stdout-alpha-dec-osf3 | 230 ++++++
tests/enum01.stdout-hugs | 246 ++++++
tests/enum01.stdout-ws-64 | 246 ++++++
tests/enum02.hs | 263 +++++++
tests/enum02.stdout | 141 ++++
tests/enum02.stdout-alpha-dec-osf3 | 141 ++++
tests/enum02.stdout-hugs | 141 ++++
tests/enum02.stdout-mips-sgi-irix | 141 ++++
tests/enum02.stdout-ws-64 | 141 ++++
tests/enum02.stdout-x86_64-unknown-openbsd | 141 ++++
tests/enum03.hs | 266 +++++++
tests/enum03.stdout | 142 ++++
tests/enum03.stdout-alpha-dec-osf3 | 142 ++++
tests/enum03.stdout-hugs | 142 ++++
tests/enum03.stdout-mips-sgi-irix | 142 ++++
tests/enum03.stdout-ws-64 | 142 ++++
tests/enum03.stdout-x86_64-unknown-openbsd | 142 ++++
tests/enum04.hs | 15 +
tests/enum04.stdout | 4 +
tests/exceptionsrun001.hs | 47 ++
tests/exceptionsrun001.stdout | 5 +
tests/exceptionsrun002.hs | 96 +++
tests/exceptionsrun002.stdout | 40 +
tests/hGetBuf002.hs | 22 +
tests/hGetBuf002.stdout | 44 ++
tests/hGetBuf003.hs | 26 +
tests/hGetBuf003.stdout | 52 ++
tests/hPutBuf001.hs | 7 +
tests/hPutBuf001.stdout | 1 +
tests/hPutBuf002.hs | 9 +
tests/hPutBuf002.stdout | 1 +
tests/hTell001.hs | 63 ++
tests/hTell001.stdout | 38 +
tests/hTell002.hs | 33 +
tests/hTell002.stdout | Bin 0 -> 51 bytes
tests/length001.hs | 8 +
tests/length001.stdout | 2 +
tests/lex001.hs | 39 +
tests/lex001.stdout | 84 ++
tests/lexNum.hs | 28 -
tests/lexNum.stdout | 17 -
tests/list001.hs | 152 ++++
tests/list001.stdout | 54 ++
tests/list001.stdout-ghc | 54 ++
tests/list002.hs | 6 +
tests/list002.stdout | 1 +
tests/list003.hs | 7 +
tests/list003.stdout | 1 +
tests/memo001.hs | 19 +
tests/memo001.stdout | 1 +
tests/memo002.hs | 30 +
tests/memo002.stdout | 44 ++
tests/packedstring001.hs | 11 +
tests/packedstring001.stdout | 1 +
tests/performGC001.hs | 5 +
NHC/Makefile => tests/performGC001.stdout | 0
tests/rand001.hs | 22 +
tests/rand001.stdout | 5 +
tests/ratio001.hs | 4 +
tests/ratio001.stdout | 1 +
tests/ratio001.stdout-ghc | 1 +
tests/readDouble001.hs | 11 +
tests/readDouble001.stdout | 6 +
tests/readInteger001.hs | 7 +
tests/readInteger001.stdout | 2 +
tests/reads001.hs | 10 +
tests/reads001.stdout | 4 +
tests/show001.hs | 24 +
tests/show001.stdout | 15 +
tests/stableptr001.hs | 19 +
tests/stableptr001.stdout | 1 +
tests/stableptr003.hs | 16 +
tests/stableptr004.hs | 12 +
tests/stableptr004.stdout | 2 +
tests/stableptr005.hs | 22 +
tests/stableptr005.stdout | 1 +
tests/text001.hs | 15 +
tests/text001.stdout | 1 +
tests/trace001.hs | 10 +
tests/trace001.stderr | 14 +
tests/trace001.stdout | 1 +
tests/tup001.hs | 33 +
tests/tup001.stdout | 7 +
tests/weak001.hs | 12 +
320 files changed, 9892 insertions(+), 1107 deletions(-)
More information about the Cvs-libraries
mailing list