summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add documentation for -interactive-print (#5461)Paolo Capriotti2012-07-052-0/+62
| | | | Based on a patch by Vitaly Bragilevsky <bravit111@gmail.com>
* Delete some unused codeSimon Marlow2012-07-052-594/+0
|
* Merge remote-tracking branch 'origin/master' into newcgnewcgSimon Marlow2012-07-051-8/+6
|\ | | | | | | | | * origin/master: prefer later defined commands (fixes #3858)
| * prefer later defined commands (fixes #3858)Peter Hercek2012-07-041-8/+6
| |
* | Remove "fuel", adapt to Hoopl changes, fix warningsSimon Marlow2012-07-0527-394/+210
| |
* | Fix merge-related problemsSimon Marlow2012-07-0412-54/+34
| |
* | Merge remote-tracking branch 'origin/master' into newcgSimon Marlow2012-07-04480-25650/+33759
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (756 commits) don't crash if argv[0] == NULL (#7037) -package P was loading all versions of P in GHCi (#7030) Add a Note, copying text from #2437 improve the --help docs a bit (#7008) Copy Data.HashTable's hashString into our Util module Build fix Build fixes Parse error: suggest brackets and indentation. Don't build the ghc DLL on Windows; works around trac #5987 On Windows, detect if DLLs have too many symbols; trac #5987 Add some more Integer rules; fixes #6111 Fix PA dfun construction with silent superclass args Add silent superclass parameters to the vectoriser Add silent superclass parameters (again) Mention Generic1 in the user's guide Make the GHC API a little more powerful. tweak llvm version warning message New version of the patch for #5461. Fix Word64ToInteger conversion rule. Implemented feature request on reconfigurable pretty-printing in GHCi (#5461) ... Conflicts: compiler/basicTypes/UniqSupply.lhs compiler/cmm/CmmBuildInfoTables.hs compiler/cmm/CmmLint.hs compiler/cmm/CmmOpt.hs compiler/cmm/CmmPipeline.hs compiler/cmm/CmmStackLayout.hs compiler/cmm/MkGraph.hs compiler/cmm/OldPprCmm.hs compiler/codeGen/CodeGen.lhs compiler/codeGen/StgCmm.hs compiler/codeGen/StgCmmBind.hs compiler/codeGen/StgCmmLayout.hs compiler/codeGen/StgCmmUtils.hs compiler/main/CodeOutput.lhs compiler/main/HscMain.hs compiler/nativeGen/AsmCodeGen.lhs compiler/simplStg/SimplStg.lhs
| * don't crash if argv[0] == NULL (#7037)Simon Marlow2012-07-021-3/+9
| |
| * -package P was loading all versions of P in GHCi (#7030)Simon Marlow2012-07-021-1/+3
| | | | | | | | | | | | | | | | -package P means "the latest version of P" if multiple versions are installed. It was working as advertised, but we were eagerly *linking* all versions of P, which might cause an error if the package has some C code, because we can't link multiple instances of the same symbol.
| * Add a Note, copying text from #2437Simon Marlow2012-07-021-1/+27
| |
| * improve the --help docs a bit (#7008)Simon Marlow2012-07-021-4/+6
| |
| * Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghcIan Lynagh2012-06-301-1/+1
| |\
| | * Parse error: suggest brackets and indentation.Eric Kow2012-06-291-1/+1
| | | | | | | | | | | | | | | | | | I have observed that whenever GHC tells me that I have possibly incorrect indentation, the real problem is often that I forgot to close some sort of bracket.
| * | Copy Data.HashTable's hashString into our Util moduleIan Lynagh2012-06-302-2/+72
| | | | | | | | | | | | | | | Data.HashTable is now deprecated and will soon be removed, but deSugar/Coverage.lhs uses hashString.
| * | Build fixIan Lynagh2012-06-291-1/+1
| | |
| * | Build fixesIan Lynagh2012-06-292-2/+6
| | |
| * | Don't build the ghc DLL on Windows; works around trac #5987Ian Lynagh2012-06-293-1/+21
| | | | | | | | | | | | | | | We also don't build DLLs for the dph-lifted-* packages as they depend on ghc.
| * | On Windows, detect if DLLs have too many symbols; trac #5987Ian Lynagh2012-06-293-0/+11
| |/ | | | | | | | | The test isn't very pretty; it involves trawling through the objdump -p output. I couldn't find an easier way, unfortuantely.
| * Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghcIan Lynagh2012-06-2725-130/+282
| |\
| | * Fix PA dfun construction with silent superclass argsManuel M T Chakravarty2012-06-272-11/+2
| | |
| | * Add silent superclass parameters to the vectoriserManuel M T Chakravarty2012-06-274-35/+85
| | |
| | * Add silent superclass parameters (again)Simon Peyton Jones2012-06-2721-85/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Silent superclass parameters solve the problem that the superclasses of a dicionary construction can easily turn out to be (wrongly) bottom. The problem and solution are described in Note [Silent superclass arguments] in TcInstDcls I first implemented this fix (with Dimitrios) in Dec 2010, but removed it again in Jun 2011 becuase we thought it wasn't necessary any more. (The reason we thought it wasn't necessary is that we'd stopped generating derived superclass constraints for *wanteds*. But we were wrong; that didn't solve the superclass-loop problem.) So we have to re-implement it. It's not hard. Main features: * The IdDetails for a DFunId says how many silent arguments it has * A DFunUnfolding describes which dictionary args are just parameters (DFunLamArg) and which are a function to apply to the parameters (DFunPolyArg). This adds the DFunArg type to CoreSyn * Consequential changes to IfaceSyn. (Binary hi file format changes slightly.) * TcInstDcls changes to generate the right dfuns * CoreSubst.exprIsConApp_maybe handles the new DFunUnfolding The thing taht is *not* done yet is to alter the vectoriser to pass the relevant extra argument when building a PA dictionary.
| * | Add some more Integer rules; fixes #6111Ian Lynagh2012-06-275-3/+48
| |/
| * Mention Generic1 in the user's guideJose Pedro Magalhaes2012-06-261-16/+23
| |
| * Make the GHC API a little more powerful.David Terei2012-06-252-27/+73
| |
| * tweak llvm version warning messageDavid Terei2012-06-251-2/+2
| |
| * New version of the patch for #5461.Paolo Capriotti2012-06-255-18/+24
| |
| * Fix Word64ToInteger conversion rule.Paolo Capriotti2012-06-251-1/+1
| |
| * Implemented feature request on reconfigurable pretty-printing in GHCi (#5461)Vitaly Bragilesky2012-06-253-5/+36
| |
| * Use errorMsg over putMsg when appropriate.David Terei2012-06-251-3/+3
| |
| * Warn if using unsupported version of LLVM.David Terei2012-06-252-5/+27
| |
| * Fix #6158. LLVM 3.1 doesn't like certain constructions that 3.0 andDavid Terei2012-06-251-3/+15
| | | | | | | | earlier did, so we avoid them.
| * Remove the ID MonadIan Lynagh2012-06-231-18/+0
| | | | | | | | | | We don't use it, and if we want an identity Monad then there's one in transformers:Data.Functor.Identity that we could use.
| * Remove sortLe usesIan Lynagh2012-06-221-7/+6
| |
| * Remove sortLeIan Lynagh2012-06-221-93/+2
| | | | | | | | We now use Data.List's sort(By)
| * Remove another use of sortLeIan Lynagh2012-06-221-12/+9
| |
| * Correct a commentIan Lynagh2012-06-221-1/+1
| |
| * Remove a few more sortLe'sIan Lynagh2012-06-221-11/+9
| |
| * Remove another sortLe useIan Lynagh2012-06-221-5/+5
| |
| * Use a derived Ord instance for DiscrIan Lynagh2012-06-221-12/+3
| | | | | | | | | | | | Our hand-written leAlt behaved differently when given a micture of constructors, but I think that either it won't make a difference or that this will be an improvement.
| * Derive Eq DiscrIan Lynagh2012-06-221-9/+2
| | | | | | | | We had effectively hand-written the instance instead
| * Change more uses of sortLe to sortByIan Lynagh2012-06-2210-30/+25
| |
| * Remove some uses of sortLeIan Lynagh2012-06-226-20/+13
| | | | | | | | | | | | Technically the behaviour of sortWith has changed, as it used x `le` y = get_key x < get_key y (note "<" rather than "<="), but I assume that that was just a mistake.
| * Remove some more unused functionsIan Lynagh2012-06-221-28/+0
| |
| * Remove a GHC 6.4 workaroundIan Lynagh2012-06-221-6/+1
| |
| * Remove 'on' from UtilIan Lynagh2012-06-226-13/+14
| | | | | | | | We can now rely on it being available from Data.Function
| * Remove some more unused function from ListSetOpsIan Lynagh2012-06-221-22/+0
| |
| * Remove an unused functionIan Lynagh2012-06-221-20/+0
| |
| * Remove duplicated commentJose Pedro Magalhaes2012-06-211-2/+0
| |
| * Allow deriving Generic1Jose Pedro Magalhaes2012-06-214-169/+521
| | | | | | | | | | | | | | | | | | | | | | | | This completes the support for generic programming introduced in GHC 7.2. Generic1 allows defining generic functions that operate on type containers, such as `fmap`, for instance. Along the way we have fixed #5936 and #5939, allowing deriving Generic/Generic1 for data families, and disallowing deriving Generic/Generic1 for instantiated types. Most of this patch is Nicolas Frisby's work.