simonpj     2002/07/30 06:44:37 PDT

  Modified files:        (Branch: meta-haskell-branch)
    ghc                  ANNOUNCE configure.in ghc.spec.in 
    ghc/compiler/absCSyn AbsCSyn.lhs AbsCUtils.lhs CLabel.lhs 
                         PprAbsC.lhs 
    ghc/compiler/basicTypes Id.lhs Name.lhs RdrName.lhs Var.lhs 
    ghc/compiler/codeGen CodeGen.lhs 
    ghc/compiler/coreSyn CoreTidy.lhs Subst.lhs 
    ghc/compiler/deSugar DsForeign.lhs 
    ghc/compiler/ghci    InteractiveUI.hs 
    ghc/compiler/hsSyn   HsBinds.lhs 
    ghc/compiler/main    DriverFlags.hs GetImports.hs HscMain.lhs 
                         SysTools.lhs TidyPgm.lhs 
    ghc/compiler/nativeGen AbsCStixGen.lhs MachCode.lhs 
    ghc/compiler/prelude PrelNames.lhs 
    ghc/compiler/rename  RnEnv.lhs RnExpr.lhs 
    ghc/compiler/simplCore SetLevels.lhs 
    ghc/compiler/stgSyn  CoreToStg.lhs 
    ghc/compiler/stranal WorkWrap.lhs 
    ghc/compiler/typecheck Inst.lhs TcExpr.lhs TcForeign.lhs 
                           TcGenDeriv.lhs TcMType.lhs 
                           TcMatches.lhs TcMonad.lhs 
                           TcMonoType.lhs TcPat.lhs TcType.lhs 
                           TcUnify.lhs 
    ghc/compiler/utils   Outputable.lhs 
    ghc/docs/users_guide flags.sgml glasgow_exts.sgml 
                         separate_compilation.sgml utils.sgml 
                         win32-dlls.sgml 
    ghc/driver/mangler   ghc-asm.lprl 
    ghc/includes         PrimOps.h Rts.h RtsAPI.h RtsFlags.h Stg.h 
                         StgMacros.h mkNativeHdr.c 
    ghc/rts              Adjustor.c Arena.c BlockAlloc.c 
                         Disassembler.c GC.c Hash.c Itimer.c 
                         Linker.c MBlock.c Main.c Makefile 
                         Prelude.h PrimOps.hc Printer.c ProfHeap.c 
                         Profiling.h Proftimer.c RetainerProfile.c 
                         RetainerSet.c RtsFlags.c RtsStartup.c 
                         RtsUtils.c Schedule.c Schedule.h Select.c 
                         Signals.c StgMiscClosures.hc 
                         StgPrimFloat.c StgStartup.hc Storage.c 
                         ThreadLabels.c rts.conf.in 
    ghc/rts/hooks        ErrorHdr.c MallocFail.c 
                         NoRunnableThreads.c OutOfHeap.c 
                         PatErrorHdr.c RtsOpts.c StackOverflow.c 
    ghc/utils/hsc2hs     template-hsc.h 
    libraries            Makefile 
    libraries/base       Makefile Numeric.hs base.conf.in 
    libraries/base/Control Concurrent.hs Exception.hs Monad.hs 
    libraries/base/Control/Concurrent MVar.hs 
    libraries/base/Control/Monad ST.hs 
    libraries/base/Control/Monad/ST Lazy.hs 
    libraries/base/Data  Array.hs Dynamic.hs Either.hs IORef.hs 
                         Int.hs List.hs Maybe.hs Ratio.hs STRef.hs 
                         Tuple.hs Unique.hs Word.hs 
    libraries/base/Data/Array IArray.hs IO.hs MArray.hs ST.hs 
    libraries/base/Data/STRef Lazy.hs 
    libraries/base/Debug Trace.hs 
    libraries/base/Foreign ForeignPtr.hs StablePtr.hs 
    libraries/base/Foreign/C TypesISO.hs 
    libraries/base/Foreign/Marshal Alloc.hs Array.hs Utils.hs 
    libraries/base/GHC   Arr.lhs Handle.hs IOBase.lhs Posix.hs 
                         Read.lhs Real.lhs Show.lhs 
    libraries/base/System Cmd.hs Directory.hs Environment.hs 
                          Exit.hs IO.hs Mem.hs Time.hsc 
    libraries/base/System/IO Error.hs Unsafe.hs 
    libraries/base/System/Mem StableName.hs Weak.hs 
    libraries/base/Text  Read.hs Show.hs 
    libraries/base/Text/PrettyPrint HughesPJ.hs 
    libraries/base/cbits Makefile inputReady.c 
    libraries/base/include HsBase.h 
    libraries/haskell-src/Language/Haskell Lexer.hs ParseMonad.hs 
                                           ParseUtils.hs Pretty.hs 
    libraries/haskell98  IO.hs 
    libraries/network/Network BSD.hsc Socket.hsc 
    libraries/network/cbits ancilData.c 
  Added files:           (Branch: meta-haskell-branch)
    ghc/docs             index.html.in 
    libraries/base/cbits consUtils.c 
    libraries/base/include consUtils.h 
  Removed files:         (Branch: meta-haskell-branch)
    ghc/docs             index.html 
  Log:
        [Meta-Haskell branch]
  
  This commit brings us up to date with meta-haskell-merge7, namely
  the HEAD today!  Warning: not fully tested, so don't update yet.
  
  Revision  Changes    Path
  1.38.2.2  +8 -9      fptools/ghc/ANNOUNCE
  1.1.22.1  +39 -1     fptools/ghc/configure.in
  1.12.6.1  +9 -6      fptools/ghc/ghc.spec.in
  1.46.2.2  +3 -2      fptools/ghc/compiler/absCSyn/AbsCSyn.lhs
  1.48.2.3  +1 -1      fptools/ghc/compiler/absCSyn/AbsCUtils.lhs
  1.51.2.2  +27 -7     fptools/ghc/compiler/absCSyn/CLabel.lhs
  1.89.2.2  +4 -3      fptools/ghc/compiler/absCSyn/PprAbsC.lhs
  1.106.2.2 +7 -3      fptools/ghc/compiler/basicTypes/Id.lhs
  1.97.2.5  +16 -3     fptools/ghc/compiler/basicTypes/Name.lhs
  1.19.2.5  +1 -0      fptools/ghc/compiler/basicTypes/RdrName.lhs
  1.28.2.1  +2 -2      fptools/ghc/compiler/basicTypes/Var.lhs
  1.46.2.3  +40 -30    fptools/ghc/compiler/codeGen/CodeGen.lhs
  1.70.2.1  +1 -0      fptools/ghc/compiler/coreSyn/CoreTidy.lhs
  1.32.4.1  +4 -1      fptools/ghc/compiler/coreSyn/Subst.lhs
  1.66.2.7  +1 -1      fptools/ghc/compiler/deSugar/DsForeign.lhs
  1.121.2.14 +8 -2      fptools/ghc/compiler/ghci/InteractiveUI.hs
  1.60.2.7  +2 -2      fptools/ghc/compiler/hsSyn/HsBinds.lhs
  1.92.2.7  +6 -2      fptools/ghc/compiler/main/DriverFlags.hs
  1.8.12.1  +5 -1      fptools/ghc/compiler/main/GetImports.hs
  1.156.2.19 +4 -2      fptools/ghc/compiler/main/HscMain.lhs
  1.73.2.1  +5 -1      fptools/ghc/compiler/main/SysTools.lhs
  1.2.2.2   +21 -12    fptools/ghc/compiler/main/TidyPgm.lhs
  1.50.2.1  +3 -1      fptools/ghc/compiler/nativeGen/AbsCStixGen.lhs
  1.97.2.3  +2 -2      fptools/ghc/compiler/nativeGen/MachCode.lhs
  1.53.2.17 +3 -0      fptools/ghc/compiler/prelude/PrelNames.lhs
  1.147.2.14 +11 -6     fptools/ghc/compiler/rename/RnEnv.lhs
  1.89.2.16 +20 -23    fptools/ghc/compiler/rename/RnExpr.lhs
  1.55.6.3  +4 -3      fptools/ghc/compiler/simplCore/SetLevels.lhs
  1.93.2.2  +143 -118  fptools/ghc/compiler/stgSyn/CoreToStg.lhs
  1.57.2.2  +1 -1      fptools/ghc/compiler/stranal/WorkWrap.lhs
  1.100.2.5 +137 -29   fptools/ghc/compiler/typecheck/Inst.lhs
  1.120.2.21 +12 -13    fptools/ghc/compiler/typecheck/TcExpr.lhs
  1.52.2.3  +2 -15     fptools/ghc/compiler/typecheck/TcForeign.lhs
  1.81.2.8  +35 -6     fptools/ghc/compiler/typecheck/TcGenDeriv.lhs
  1.31.2.5  +7 -6      fptools/ghc/compiler/typecheck/TcMType.lhs
  1.63.2.4  +33 -17    fptools/ghc/compiler/typecheck/TcMatches.lhs
  1.78.2.14 +3 -0      fptools/ghc/compiler/typecheck/TcMonad.lhs
  1.97.2.5  +60 -3     fptools/ghc/compiler/typecheck/TcMonoType.lhs
  1.76.2.7  +6 -6      fptools/ghc/compiler/typecheck/TcPat.lhs
  1.77.2.4  +2 -32     fptools/ghc/compiler/typecheck/TcType.lhs
  1.37.2.2  +1 -1      fptools/ghc/compiler/typecheck/TcUnify.lhs
  1.48.2.3  +18 -11    fptools/ghc/compiler/utils/Outputable.lhs
  1.17.2.3  +6 -0      fptools/ghc/docs/users_guide/flags.sgml
  1.58.2.5  +2 -0      fptools/ghc/docs/users_guide/glasgow_exts.sgml
  1.8.6.3   +1 -1      fptools/ghc/docs/users_guide/separate_compilation.sgml
  1.22.6.3  +34 -15    fptools/ghc/docs/users_guide/utils.sgml
  1.14.6.1  +1 -1      fptools/ghc/docs/users_guide/win32-dlls.sgml
  1.72.2.3  +3 -3      fptools/ghc/driver/mangler/ghc-asm.lprl
  1.93.2.2  +5 -6      fptools/ghc/includes/PrimOps.h
  1.18.2.1  +1 -9      fptools/ghc/includes/Rts.h
  1.26.2.2  +3 -3      fptools/ghc/includes/RtsAPI.h
  1.41.6.1  +3 -1      fptools/ghc/includes/RtsFlags.h
  1.45.2.2  +6 -17     fptools/ghc/includes/Stg.h
  1.46.2.1  +39 -3     fptools/ghc/includes/StgMacros.h
  1.8.6.1   +3 -1      fptools/ghc/includes/mkNativeHdr.c
  1.17.2.2  +63 -85    fptools/ghc/rts/Adjustor.c
  1.1.8.1   +8 -3      fptools/ghc/rts/Arena.c
  1.13.8.1  +3 -1      fptools/ghc/rts/BlockAlloc.c
  1.24.12.1 +4 -2      fptools/ghc/rts/Disassembler.c
  1.135.2.1 +4 -4      fptools/ghc/rts/GC.c
  1.8.2.1   +4 -1      fptools/ghc/rts/Hash.c
  1.29.6.1  +5 -1      fptools/ghc/rts/Itimer.c
  1.88.2.9  +5 -2      fptools/ghc/rts/Linker.c
  1.28.2.1  +3 -1      fptools/ghc/rts/MBlock.c
  1.34.2.1  +2 -1      fptools/ghc/rts/Main.c
  1.70.2.2  +8 -12     fptools/ghc/rts/Makefile
  1.19.2.2  +13 -13    fptools/ghc/rts/Prelude.h
  1.98.2.2  +7 -1      fptools/ghc/rts/PrimOps.hc
  1.51.4.1  +6 -3      fptools/ghc/rts/Printer.c
  1.35.6.2  +3 -1      fptools/ghc/rts/ProfHeap.c
  1.4.6.1   +1 -3      fptools/ghc/rts/Profiling.h
  1.9.6.1   +3 -1      fptools/ghc/rts/Proftimer.c
  1.4.6.1   +3 -1      fptools/ghc/rts/RetainerProfile.c
  1.2.6.1   +3 -1      fptools/ghc/rts/RetainerSet.c
  1.56.6.1  +4 -5      fptools/ghc/rts/RtsFlags.c
  1.61.4.3  +3 -1      fptools/ghc/rts/RtsStartup.c
  1.24.2.2  +3 -1      fptools/ghc/rts/RtsUtils.c
  1.140.2.4 +66 -17    fptools/ghc/rts/Schedule.c
  1.33.2.2  +7 -5      fptools/ghc/rts/Schedule.h
  1.19.8.1  +35 -10    fptools/ghc/rts/Select.c
  1.24.2.2  +15 -5     fptools/ghc/rts/Signals.c
  1.76.2.1  +3 -3      fptools/ghc/rts/StgMiscClosures.hc
  1.8.12.1  +3 -1      fptools/ghc/rts/StgPrimFloat.c
  1.18.2.1  +1 -6      fptools/ghc/rts/StgStartup.hc
  1.64.2.2  +4 -1      fptools/ghc/rts/Storage.c
  1.1.4.2   +2 -0      fptools/ghc/rts/ThreadLabels.c
  1.6.2.2   +1 -1      fptools/ghc/rts/rts.conf.in
  1.2.26.1  +5 -1      fptools/ghc/rts/hooks/ErrorHdr.c
  1.2.26.1  +3 -1      fptools/ghc/rts/hooks/MallocFail.c
  1.2.26.1  +4 -1      fptools/ghc/rts/hooks/NoRunnableThreads.c
  1.3.26.1  +2 -1      fptools/ghc/rts/hooks/OutOfHeap.c
  1.2.26.1  +5 -1      fptools/ghc/rts/hooks/PatErrorHdr.c
  1.1.8.1   +3 -1      fptools/ghc/rts/hooks/RtsOpts.c
  1.2.26.1  +3 -1      fptools/ghc/rts/hooks/StackOverflow.c
  1.7.14.1  +6 -0      fptools/ghc/utils/hsc2hs/template-hsc.h
  1.4.2.6   +2 -2      fptools/libraries/Makefile
  1.24.2.5  +1 -7      fptools/libraries/base/Makefile
  1.7.2.3   +3 -233    fptools/libraries/base/Numeric.hs
  1.5.2.3   +0 -3      fptools/libraries/base/base.conf.in
  1.6.2.3   +1 -1      fptools/libraries/base/Control/Concurrent.hs
  1.7.2.3   +2 -2      fptools/libraries/base/Control/Exception.hs
  1.2.2.2   +2 -0      fptools/libraries/base/Control/Monad.hs
  1.2.2.2   +3 -1      fptools/libraries/base/Control/Concurrent/MVar.hs
  1.6.2.2   +4 -0      fptools/libraries/base/Control/Monad/ST.hs
  1.5.2.2   +7 -4      fptools/libraries/base/Control/Monad/ST/Lazy.hs
  1.2.2.2   +4 -87     fptools/libraries/base/Data/Array.hs
  1.6.2.4   +6 -0      fptools/libraries/base/Data/Dynamic.hs
  1.4.2.3   +2 -0      fptools/libraries/base/Data/Either.hs
  1.5.2.2   +4 -12     fptools/libraries/base/Data/IORef.hs
  1.4.2.2   +4 -0      fptools/libraries/base/Data/Int.hs
  1.4.2.5   +5 -3      fptools/libraries/base/Data/List.hs
  1.4.2.3   +2 -0      fptools/libraries/base/Data/Maybe.hs
  1.2.2.2   +2 -1      fptools/libraries/base/Data/Ratio.hs
  1.4.2.3   +4 -0      fptools/libraries/base/Data/STRef.hs
  1.3.2.2   +9 -8      fptools/libraries/base/Data/Tuple.hs
  1.2.2.3   +2 -2      fptools/libraries/base/Data/Unique.hs
  1.4.2.2   +4 -0      fptools/libraries/base/Data/Word.hs
  1.2.2.3   +4 -0      fptools/libraries/base/Data/Array/IArray.hs
  1.7.2.3   +11 -3     fptools/libraries/base/Data/Array/IO.hs
  1.2.2.3   +4 -0      fptools/libraries/base/Data/Array/MArray.hs
  1.2.2.3   +6 -0      fptools/libraries/base/Data/Array/ST.hs
  1.1.2.2   +4 -1      fptools/libraries/base/Data/STRef/Lazy.hs
  1.3.2.2   +4 -0      fptools/libraries/base/Debug/Trace.hs
  1.4.2.2   +1 -1      fptools/libraries/base/Foreign/ForeignPtr.hs
  1.4.2.2   +4 -1      fptools/libraries/base/Foreign/StablePtr.hs
  1.4.2.2   +1 -1      fptools/libraries/base/Foreign/C/TypesISO.hs
  1.6.2.3   +5 -3      fptools/libraries/base/Foreign/Marshal/Alloc.hs
  1.5.2.2   +4 -4      fptools/libraries/base/Foreign/Marshal/Array.hs
  1.4.2.3   +5 -5      fptools/libraries/base/Foreign/Marshal/Utils.hs
  1.3.2.4   +4 -3      fptools/libraries/base/GHC/Arr.lhs
  1.6.2.3   +13 -6     fptools/libraries/base/GHC/Handle.hs
  1.8.2.4   +3 -3      fptools/libraries/base/GHC/IOBase.lhs
  1.6.2.4   +27 -3     fptools/libraries/base/GHC/Posix.hs
  1.6.2.4   +2 -4      fptools/libraries/base/GHC/Read.lhs
  1.3.2.4   +8 -5      fptools/libraries/base/GHC/Real.lhs
  1.5.2.2   +14 -8     fptools/libraries/base/GHC/Show.lhs
  1.3.2.3   +8 -0      fptools/libraries/base/System/Cmd.hs
  1.3.2.3   +1 -1      fptools/libraries/base/System/Directory.hs
  1.6.2.3   +9 -1      fptools/libraries/base/System/Environment.hs
  1.2.2.2   +6 -0      fptools/libraries/base/System/Exit.hs
  1.7.2.2   +13 -0     fptools/libraries/base/System/IO.hs
  1.4.2.3   +4 -0      fptools/libraries/base/System/Mem.hs
  1.12.2.2  +8 -3      fptools/libraries/base/System/Time.hsc
  1.4.2.2   +14 -0     fptools/libraries/base/System/IO/Error.hs
  1.2.2.2   +4 -0      fptools/libraries/base/System/IO/Unsafe.hs
  1.4.2.3   +4 -0      fptools/libraries/base/System/Mem/StableName.hs
  1.3.2.3   +6 -3      fptools/libraries/base/System/Mem/Weak.hs
  1.2.2.3   +2 -0      fptools/libraries/base/Text/Read.hs
  1.3.2.2   +2 -2      fptools/libraries/base/Text/Show.hs
  1.2.2.3   +6 -6      fptools/libraries/base/Text/PrettyPrint/HughesPJ.hs
  1.7.2.1   +5 -1      fptools/libraries/base/cbits/Makefile
  1.6.2.1   +4 -5      fptools/libraries/base/cbits/inputReady.c
  1.7.2.2   +2 -1      fptools/libraries/base/include/HsBase.h
  1.6.2.2   +13 -12    fptools/libraries/haskell-src/Language/Haskell/Lexer.hs
  1.5.2.2   +5 -3      fptools/libraries/haskell-src/Language/Haskell/ParseMonad.hs
  1.8.2.2   +14 -7     fptools/libraries/haskell-src/Language/Haskell/ParseUtils.hs
  1.7.2.2   +90 -63    fptools/libraries/haskell-src/Language/Haskell/Pretty.hs
  1.1.4.1   +5 -0      fptools/libraries/haskell98/IO.hs
  1.3.2.3   +7 -7      fptools/libraries/network/Network/BSD.hsc
  1.11.2.5  +26 -12    fptools/libraries/network/Network/Socket.hsc
  1.2.2.3   +6 -1      fptools/libraries/network/cbits/ancilData.c
_______________________________________________
Cvs-ghc mailing list
[EMAIL PROTECTED]
http://www.haskell.org/mailman/listinfo/cvs-ghc


Reply via email to