June 2007 - Cvs-nhc98

merging nhc98 and yhc
by Malcolm Wallace 29 Jun '07

29 Jun '07

To Yhc/nhc98 people, I have just re-merged the sources for the compiler98 directory across our two projects, so that we can share development in the future. Sadly, it does involve a loss of some VC history (from the yhc side), but since yhc already lost VC history a couple of times in the past, I judged that wasn't too critical. So the plan is this: both nhc98 and yhc projects should delete their current src/compiler98 and pickup a new one from darcs get [--partial] --repo-name=src/compiler98 \ http://darcs.haskell.org/york-compiler98 adjusting their darcs-all/scons scripts accordingly. The only major difference you should notice is that yhc's former Main.hs is now called MainYhc.hs (and likewise, nhc98's MainNew.hs becomes MainNhc98.hs). Any other regressions are a bug. I'm expecting _something_ to break, since there were 2693 diffs to merge, but the result looks a whole lot more like yhc than like nhc98, and hopefully we can find and fix mistakes quite easily. Oh, and someone from yhc might want to keep a version of their repo with the existing unshared compiler98, just to diff against. You might want to check what I've done anyway, or it might help debug some regressions. Note that the _only_ sources now shared between nhc98 and yhc are for the compiler itself - the runtime, libraries, tools, etc. are all entirely different and unshareable. A subsequent stage of the plan will be for other projects that partially use nhc98 as a front-end to share this merged compiler too: namely, Hat, and HPC. Regards, Malcolm

2 2

patch applied (yhc): Make the Yhi builder do linking as well
by Neil Mitchell 28 Jun '07

28 Jun '07

Thu Jun 28 15:27:24 PDT 2007 Neil Mitchell * Make the Yhi builder do linking as well M ./Make/CMake.hs -3 +8 M ./Make/src/config.h +7

1 0

patch applied (yhc): Fix up the Haskell build system to grab the Yhc compiler
by Neil Mitchell 28 Jun '07

28 Jun '07

Thu Jun 28 14:47:33 PDT 2007 Neil Mitchell * Fix up the Haskell build system to grab the Yhc compiler M ./Make/Compile.hs -2 +13

1 0

patch applied (yhc): Update the Haskell build system in light of new changes
by Neil Mitchell 28 Jun '07

28 Jun '07

Thu Jun 28 14:32:30 PDT 2007 Neil Mitchell * Update the Haskell build system in light of new changes M ./Make/Compile.hs -1 +1 M ./Make/Configure.hs -2 +3 M ./Make/Depends.hs -3 +3

1 0

patch applied (york-compiler98): Fix up haddock annotations in Flags.hs (was breaking haddock)
by Neil Mitchell 28 Jun '07

28 Jun '07

Thu Jun 28 06:33:18 PDT 2007 Neil Mitchell * Fix up haddock annotations in Flags.hs (was breaking haddock) M ./Flags.hs -2 +2

1 0

patch applied (york-compiler98): wibble to printing 'Id's
by Malcolm Wallace 27 Jun '07

27 Jun '07

Wed Jun 27 09:52:51 PDT 2007 Malcolm.Wallace(a)cs.york.ac.uk * wibble to printing 'Id's M ./Id.hs -1 +4

1 0

patch applied (york-compiler98): where do err functions like _patternMatchFail come from?
by Malcolm Wallace 27 Jun '07

27 Jun '07

Wed Jun 27 09:31:15 PDT 2007 Malcolm.Wallace(a)cs.york.ac.uk * where do err functions like _patternMatchFail come from? M ./TokenId.hs -5 +10

1 0

patch applied (york-compiler98): nhc98/yhc difference: fiddle with Rational constructor
by Malcolm Wallace 27 Jun '07

27 Jun '07

Wed Jun 27 08:42:32 PDT 2007 Malcolm.Wallace(a)cs.york.ac.uk * nhc98/yhc difference: fiddle with Rational constructor M ./CaseLib.hs -7 +9 M ./TokenInt.hs -1 +3

1 0

patch applied (york-compiler98): nhc98/yhc difference: code generation (STG stage)
by Malcolm Wallace 27 Jun '07

27 Jun '07

Wed Jun 27 08:26:32 PDT 2007 Malcolm.Wallace(a)cs.york.ac.uk * nhc98/yhc difference: code generation (STG stage) M ./STGArity.hs +4

1 0

patch applied (york-compiler98): Require tokenDynamic only for yhc.
by Malcolm Wallace 27 Jun '07

27 Jun '07

Wed Jun 27 07:55:28 PDT 2007 Malcolm.Wallace(a)cs.york.ac.uk * Require tokenDynamic only for yhc. M ./TokenInt.hs -1 +3

1 0