Repository : ssh://darcs.haskell.org//srv/darcs/packages/base On branch : type-nats
http://hackage.haskell.org/trac/ghc/changeset/2d05797b4b5192e3abe5c5ec570b0bd06713d669 >--------------------------------------------------------------- commit 2d05797b4b5192e3abe5c5ec570b0bd06713d669 Merge: f23644b... 0e1a02b... Author: Iavor S. Diatchki <[email protected]> Date: Thu Dec 29 14:36:08 2011 -0800 Merge branch 'master' into type-nats .darcs-boring | 12 - Control/Arrow.hs | 109 +- Control/Concurrent.hs | 5 +- Control/Exception/Base.hs | 4 +- Control/Monad/Group.hs | 2 + Control/Monad/Instances.hs | 2 + Control/Monad/ST.hs | 28 +- Control/Monad/ST/Imp.hs | 1 + Control/Monad/ST/Lazy.hs | 28 +- Control/Monad/ST/Lazy/Imp.hs | 2 +- Control/Monad/ST/Lazy/Unsafe.hs | 2 + Control/Monad/ST/Strict.hs | 8 - Control/Monad/ST/Unsafe.hs | 2 + Control/Monad/Zip.hs | 14 +- Data/Bits.hs | 51 +- Data/Bool.hs | 1 + Data/Char.hs | 3 +- Data/Complex.hs | 3 +- Data/Data.hs | 96 +- Data/Dynamic.hs | 2 + Data/Eq.hs | 1 + Data/Fixed.hs | 3 +- Data/Foldable.hs | 3 + Data/Function.hs | 4 + Data/Functor.hs | 1 + Data/HashTable.hs | 1 + Data/IORef.hs | 1 + Data/Int.hs | 1 + Data/Ix.hs | 3 +- Data/List.hs | 12 + Data/Maybe.hs | 1 + Data/Monoid.hs | 2 + Data/Ord.hs | 1 + Data/Ratio.hs | 1 + Data/STRef.hs | 1 + Data/STRef/Lazy.hs | 9 +- Data/STRef/Strict.hs | 2 + Data/String.hs | 1 + Data/Traversable.hs | 3 + Data/Tuple.hs | 7 +- Data/Typeable.hs | 628 +-- Data/Typeable.hs-boot | 14 +- Data/{Typeable.hs => Typeable/Internal.hs} | 520 +-- Data/Typeable/Internal.hs-boot | 28 + Data/Word.hs | 1 + Debug/Trace.hs | 145 +- Foreign.hs | 12 +- Foreign/C.hs | 1 + Foreign/C/Error.hs | 19 +- Foreign/C/String.hs | 22 +- Foreign/C/Types.hs | 37 +- Foreign/ForeignPtr.hs | 42 +- Foreign/ForeignPtr/Imp.hs | 2 + Foreign/ForeignPtr/Unsafe.hs | 2 +- Foreign/Marshal.hs | 15 +- Foreign/Marshal/Alloc.hs | 3 +- Foreign/Marshal/Array.hs | 1 + Foreign/Marshal/Error.hs | 1 + Foreign/Marshal/Pool.hs | 1 + Foreign/Marshal/Unsafe.hs | 4 +- Foreign/Marshal/Utils.hs | 5 +- Foreign/Ptr.hs | 1 + Foreign/StablePtr.hs | 1 + Foreign/Storable.hs | 41 + GHC/Arr.lhs | 1 + GHC/Base.lhs | 18 +- GHC/Classes.hs | 297 - GHC/Conc.lhs | 3 + GHC/Conc/IO.hs | 1 + GHC/Conc/Sync.lhs | 48 +- GHC/Conc/Windows.hs | 4 +- GHC/ConsoleHandler.hs | 12 +- GHC/Constants.hs | 1 + GHC/Desugar.hs | 1 + GHC/Enum.lhs | 112 + GHC/Environment.hs | 3 +- GHC/Event.hs | 6 + GHC/Event/Array.hs | 4 +- GHC/Event/Clock.hsc | 8 +- GHC/Event/Control.hs | 4 +- GHC/Event/EPoll.hsc | 11 +- GHC/Event/IntMap.hs | 3 + GHC/Event/Internal.hs | 3 +- GHC/Event/KQueue.hsc | 7 +- GHC/Event/Manager.hs | 1 + GHC/Event/PSQ.hs | 2 + GHC/Event/Poll.hsc | 3 +- GHC/Event/Thread.hs | 1 + GHC/Event/Unique.hs | 2 + GHC/Exception.lhs | 4 +- GHC/Exts.hs | 17 +- GHC/Fingerprint.hs | 78 + GHC/Fingerprint.hs-boot | 13 + GHC/Fingerprint/Type.hs | 21 + GHC/Float.lhs | 109 +- GHC/Float/ConversionUtils.hs | 4 +- GHC/Float/RealFracMethods.hs | 4 +- GHC/Foreign.hs | 12 +- GHC/ForeignPtr.hs | 1 + GHC/Handle.hs | 2 +- GHC/IO.hs | 11 +- GHC/IO.hs-boot | 2 + GHC/IO/Buffer.hs | 1 + GHC/IO/BufferedIO.hs | 1 + GHC/IO/Device.hs | 1 + GHC/IO/Encoding.hs | 91 +- GHC/IO/Encoding.hs-boot | 5 +- GHC/IO/Encoding/CodePage.hs | 2 + GHC/IO/Encoding/Failure.hs | 150 +- GHC/IO/Encoding/Iconv.hs | 9 +- GHC/IO/Encoding/Latin1.hs | 1 + GHC/IO/Encoding/Types.hs | 6 +- GHC/IO/Encoding/UTF16.hs | 1 + GHC/IO/Encoding/UTF32.hs | 1 + GHC/IO/Encoding/UTF8.hs | 1 + GHC/IO/Exception.hs | 7 +- GHC/IO/Exception.hs-boot | 2 + GHC/IO/FD.hs | 2 + GHC/IO/Handle.hs | 7 +- GHC/IO/Handle.hs-boot | 1 + GHC/IO/Handle/FD.hs | 17 +- GHC/IO/Handle/FD.hs-boot | 2 + GHC/IO/Handle/Internals.hs | 69 +- GHC/IO/Handle/Text.hs | 32 +- GHC/IO/Handle/Types.hs | 1 + GHC/IO/IOMode.hs | 2 + GHC/IOArray.hs | 2 + GHC/IOBase.hs | 4 +- GHC/IORef.hs | 2 + GHC/Int.hs | 259 +- GHC/List.lhs | 3 +- GHC/MVar.hs | 1 + GHC/Num.lhs | 197 +- GHC/PArr.hs | 8 + GHC/Pack.lhs | 1 + GHC/Ptr.lhs | 1 + GHC/Real.lhs | 74 +- GHC/ST.lhs | 1 + GHC/STRef.lhs | 1 + GHC/Show.lhs | 122 +- GHC/Stable.lhs | 1 + GHC/Stack.hsc | 108 + GHC/Stats.hsc | 130 + GHC/TopHandler.lhs | 13 +- GHC/Unicode.hs | 2 +- GHC/Unicode.hs-boot | 1 + GHC/Weak.lhs | 1 + GHC/Windows.hs | 2 +- GHC/Word.hs | 180 +- Numeric.hs | 12 +- System/CPUTime.hsc | 16 +- System/Console/GetOpt.hs | 2 + System/Environment.hs | 17 +- System/Exit.hs | 1 + System/IO.hs | 31 +- System/IO/Error.hs | 1 + System/IO/Unsafe.hs | 29 +- System/Info.hs | 1 + System/Mem.hs | 2 +- System/Mem/StableName.hs | 1 + System/Mem/Weak.hs | 1 + System/Posix/Internals.hs | 19 +- System/Posix/Internals.hs-boot | 1 + System/Posix/Types.hs | 26 +- System/Timeout.hs | 1 + Text/ParserCombinators/ReadP.hs | 1 + Text/ParserCombinators/ReadPrec.hs | 1 + Text/Printf.hs | 5 +- Text/Read.hs | 13 + Text/Read/Lex.hs | 51 +- Text/Show.hs | 1 + Text/Show/Functions.hs | 1 + Unsafe/Coerce.hs | 4 + base.cabal | 11 +- cbits/md5.c | 238 + cbits/primFloat.c | 38 +- configure.ac | 17 +- include/CTypes.h | 5 +- include/HsBase.h | 58 +- include/md5.h | 24 + tests/CPUTime001.hs | 26 + tests/CPUTime001.stdout | 4 + tests/{ => Numeric}/Makefile | 2 +- tests/Numeric/all.T | 10 + tests/Numeric/num001.hs | 6 + tests/Numeric/num001.stdout | 1 + tests/Numeric/num002.hs | 20 + tests/Numeric/num002.stdout | 6 + tests/Numeric/num002.stdout-alpha-dec-osf3 | 6 + tests/Numeric/num002.stdout-mips-sgi-irix | 6 + tests/Numeric/num002.stdout-ws-64 | 6 + tests/Numeric/num002.stdout-x86_64-unknown-openbsd | 6 + tests/Numeric/num003.hs | 20 + tests/Numeric/num003.stdout | 6 + tests/Numeric/num003.stdout-alpha-dec-osf3 | 6 + tests/Numeric/num003.stdout-mips-sgi-irix | 6 + tests/Numeric/num003.stdout-ws-64 | 6 + tests/Numeric/num003.stdout-x86_64-unknown-openbsd | 6 + tests/Numeric/num004.hs | 20 + tests/Numeric/num004.stdout | 6 + tests/Numeric/num004.stdout-alpha-dec-osf3 | 6 + tests/Numeric/num004.stdout-mips-sgi-irix | 6 + tests/Numeric/num004.stdout-ws-64 | 6 + tests/Numeric/num004.stdout-x86_64-unknown-openbsd | 6 + tests/Numeric/num005.hs | 23 + tests/Numeric/num005.stdout | 55 + tests/Numeric/num005.stdout-alpha-dec-osf3 | 55 + tests/Numeric/num005.stdout-mips-sgi-irix | 55 + tests/Numeric/num005.stdout-ws-64 | 55 + tests/Numeric/num005.stdout-x86_64-unknown-openbsd | 55 + tests/Numeric/num006.hs | 28 + tests/Numeric/num006.stdout | 6 + tests/Numeric/num007.hs | 17 + tests/Numeric/num007.stdout | 9 + tests/Numeric/num008.hs | 57 + tests/Numeric/num008.stdout | 148 + tests/Numeric/num009.hs | 39 + tests/Numeric/num009.stdout | 1 + tests/Numeric/num010.hs | 29 + tests/Numeric/num010.stdout | 189 + tests/{ => System}/Makefile | 2 +- tests/System/all.T | 8 + tests/System/exitWith001.hs | 3 + NHC/Makefile => tests/System/exitWith001.stdout | 0 tests/System/getArgs001.hs | 8 + tests/System/getArgs001.stdout | 1 + tests/System/getEnv001.hs | 15 + tests/System/getEnv001.stdout | 2 + tests/System/system001.hs | 18 + tests/System/system001.stdout | 18 + tests/all.T | 26 + tests/assert.hs | 9 + tests/assert.stderr | 2 + tests/data-fixed-show-read.hs | 22 + tests/data-fixed-show-read.stdout | 18 + tests/genericNegative001.hs | 8 + tests/genericNegative001.stdout | 3 + tests/hash001.hs | 16 + tests/ioref001.hs | 9 + tests/ioref001.stdout | 1 + tests/ix001.hs | 4 + tests/ix001.stdout | 1 + tests/lexNum.hs | 28 + tests/lexNum.stdout | 17 + tests/quotOverflow.hs | 33 + tests/quotOverflow.stdout | 45 + tests/readLitChar.hs | 12 + tests/readLitChar.stdout | 4 + tests/showDouble.hs | 41 + tests/showDouble.stdout | 22 + tests/take001.hs | 5 + tests/take001.stdout | 1 + tests/unicode001.hs | 46 + tests/unicode001.stdout | 14 + tests/unicode001.stdout-hugs | 14 + tests/unicode002.hs | 44 + tests/unicode002.stdout | 6555 ++++++++++++++++++++ 257 files changed, 10626 insertions(+), 2437 deletions(-) _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
