summaryrefslogtreecommitdiff
path: root/compiler/iface
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' of http://darcs.haskell.org/ghcSimon Peyton Jones2012-12-236-72/+130
|\ \ | | | | | | | | | | | | | | | Conflicts: compiler/basicTypes/MkId.lhs compiler/iface/IfaceSyn.lhs
| * | Implement overlapping type family instances.Richard Eisenberg2012-12-216-72/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An ordered, overlapping type family instance is introduced by 'type instance where', followed by equations. See the new section in the user manual (7.7.2.2) for details. The canonical example is Boolean equality at the type level: type family Equals (a :: k) (b :: k) :: Bool type instance where Equals a a = True Equals a b = False A branched family instance, such as this one, checks its equations in order and applies only the first the matches. As explained in the note [Instance checking within groups] in FamInstEnv.lhs, we must be careful not to simplify, say, (Equals Int b) to False, because b might later unify with Int. This commit includes all of the commits on the overlapping-tyfams branch. SPJ requested that I combine all my commits over the past several months into one monolithic commit. The following GHC repos are affected: ghc, testsuite, utils/haddock, libraries/template-haskell, and libraries/dph. Here are some details for the interested: - The definition of CoAxiom has been moved from TyCon.lhs to a new file CoAxiom.lhs. I made this decision because of the number of definitions necessary to support BranchList. - BranchList is a GADT whose type tracks whether it is a singleton list or not-necessarily-a-singleton-list. The reason I introduced this type is to increase static checking of places where GHC code assumes that a FamInst or CoAxiom is indeed a singleton. This assumption takes place roughly 10 times throughout the code. I was worried that a future change to GHC would invalidate the assumption, and GHC might subtly fail to do the right thing. By explicitly labeling CoAxioms and FamInsts as being Unbranched (singleton) or Branched (not-necessarily-singleton), we make this assumption explicit and checkable. Furthermore, to enforce the accuracy of this label, the list of branches of a CoAxiom or FamInst is stored using a BranchList, whose constructors constrain its type index appropriately. I think that the decision to use BranchList is probably the most controversial decision I made from a code design point of view. Although I provide conversions to/from ordinary lists, it is more efficient to use the brList... functions provided in CoAxiom than always to convert. The use of these functions does not wander far from the core CoAxiom/FamInst logic. BranchLists are motivated and explained in the note [Branched axioms] in CoAxiom.lhs. - The CoAxiom type has changed significantly. You can see the new type in CoAxiom.lhs. It uses a CoAxBranch type to track branches of the CoAxiom. Correspondingly various functions producing and consuming CoAxioms had to change, including the binary layout of interface files. - To get branched axioms to work correctly, it is important to have a notion of type "apartness": two types are apart if they cannot unify, and no substitution of variables can ever get them to unify, even after type family simplification. (This is different than the normal failure to unify because of the type family bit.) This notion in encoded in tcApartTys, in Unify.lhs. Because apartness is finer-grained than unification, the tcUnifyTys now calls tcApartTys. - CoreLinting axioms has been updated, both to reflect the new form of CoAxiom and to enforce the apartness rules of branch application. The formalization of the new rules is in docs/core-spec/core-spec.pdf. - The FamInst type (in types/FamInstEnv.lhs) has changed significantly, paralleling the changes to CoAxiom. Of course, this forced minor changes in many files. - There are several new Notes in FamInstEnv.lhs, including one discussing confluent overlap and why we're not doing it. - lookupFamInstEnv, lookupFamInstEnvConflicts, and lookup_fam_inst_env' (the function that actually does the work) have all been more-or-less completely rewritten. There is a Note [lookup_fam_inst_env' implementation] describing the implementation. One of the changes that affects other files is to change the type of matches from a pair of (FamInst, [Type]) to a new datatype (which now includes the index of the matching branch). This seemed a better design. - The TySynInstD constructor in Template Haskell was updated to use the new datatype TySynEqn. I also bumped the TH version number, requiring changes to DPH cabal files. (That's why the DPH repo has an overlapping-tyfams branch.) - As SPJ requested, I refactored some of the code in HsDecls: * splitting up TyDecl into SynDecl and DataDecl, correspondingly changing HsTyDefn to HsDataDefn (with only one constructor) * splitting FamInstD into TyFamInstD and DataFamInstD and splitting FamInstDecl into DataFamInstDecl and TyFamInstDecl * making the ClsInstD take a ClsInstDecl, for parallelism with InstDecl's other constructors * changing constructor TyFamily into FamDecl * creating a FamilyDecl type that stores the details for a family declaration; this is useful because FamilyDecls can appear in classes but other decls cannot * restricting the associated types and associated type defaults for a * class to be the new, more restrictive types * splitting cid_fam_insts into cid_tyfam_insts and cid_datafam_insts, according to the new types * perhaps one or two more that I'm overlooking None of these changes has far-reaching implications. - The user manual, section 7.7.2.2, is updated to describe the new type family instances.
* | | Make {-# UNPACK #-} work for type/data family invocationsSimon Peyton Jones2012-12-235-23/+43
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes most of Trac #3990. Consider data family D a data instance D Double = CD Int Int data T = T {-# UNPACK #-} !(D Double) Then we want the (D Double unpacked). To do this we need to construct a suitable coercion, and it's much safer to record that coercion in the interface file, lest the in-scope instances differ somehow. That in turn means elaborating the HsBang type to include a coercion. To do that I moved HsBang from BasicTypes to DataCon, which caused quite a few minor knock-on changes. Interface-file format has changed! Still to do: need to do knot-tying to allow instances to take effect within the same module.
* | Merge branch 'master' of darcs.haskell.org:/home/darcs/ghcSimon Peyton Jones2012-12-142-14/+15
|\ \ | | | | | | | | | | | | Conflicts: compiler/typecheck/TcTyClsDecls.lhs
| * | Implement the -dynamic-too optimised path for the NCGIan Lynagh2012-12-112-18/+15
| | | | | | | | | | | | | | | | | | | | | | | | We don't yet have the slow path, for when we have to fall back to separate compilation. We also only currently handle the case qhere we're compiling Haskell code with the NCG.
| * | Fix loading dynamic interfaces when using -dynamic-tooIan Lynagh2012-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We need to have WayDyn in the ways in the DynFlags, or the interface loader will fail. -dynamic-too now correctly evaluates whether or not it is possible to build for the dynamic way too, but doesn't actually do so yet.
| * | Tweaks to dynamic-too codeIan Lynagh2012-12-071-2/+6
| | |
* | | Major refactoring of the way that UNPACK pragmas are handledSimon Peyton Jones2012-12-143-12/+17
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The situation was pretty dire. The way in which data constructors were handled, notably the mapping between their *source* argument types and their *representation* argument types (after seq'ing and unpacking) was scattered in three different places, and hard to keep in sync. Now it is all in one place: * The dcRep field of a DataCon gives its representation, specified by a DataConRep * As well as having the wrapper, the DataConRep has a "boxer" of type DataConBoxer (defined in MkId for loopy reasons). The boxer used at a pattern match to reconstruct the source-level arguments from the rep-level bindings in the pattern match. * The unboxing in the wrapper and the boxing in the boxer are dual, and are now constructed together, by MkId.mkDataConRep. This is the key function of this change. * All the computeBoxingStrategy code in TcTyClsDcls disappears. Much nicer. There is a little bit of refactoring left to do; the strange deepSplitProductType functions are now called only in WwLib, so I moved them there, and I think they could be tidied up further.
* | Merge branch 'master' of mac:ghc/git/val64/.Ian Lynagh2012-12-062-51/+67
|\ \
| * | Add the beginnings of support for building vanilla and dynamic at the same timeIan Lynagh2012-12-051-1/+20
| | |
| * | Refactor findAndReadIface; no functional changesIan Lynagh2012-12-051-50/+47
| | |
| * | TypoIan Lynagh2012-12-051-1/+1
| | |
* | | Whitespace only in iface/IfaceType.lhsIan Lynagh2012-12-051-55/+48
| | |
* | | When using a GHC plugin, load its interface file very partially: just enough ↵Daniel Vainsencher2012-12-051-36/+56
|/ / | | | | | | that it can be used, without its rules and instances affecting (and being linked from!) the module being compiled.
* | typoGabor Greif2012-11-301-1/+1
| |
* | Replace all uses of ghcError with throwGhcException and purge ghcError.Erik de Castro Lopo2012-11-303-3/+3
| |
* | Merge branch 'master' of http://darcs.haskell.org/ghcSimon Peyton Jones2012-11-262-7/+12
|\ \
| * | Revert "Move seq's fixity declaration info primops.txt.pp"Ian Lynagh2012-11-231-1/+3
| | | | | | | | | | | | | | | | | | | | | This reverts commit eb5196c48480c7dbec25aa175e43b9c20277f29c. For some reason it didn't work, and I don't have time to look into it right now.
| * | Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghcIan Lynagh2012-11-231-5/+8
| |\ \
| | * | Use the right environment for tidying the types of a data constructorSimon Peyton Jones2012-11-231-5/+8
| | | | | | | | | | | | | | | | Fixes Trac #7438
| * | | Move seq's fixity declaration info primops.txt.ppIan Lynagh2012-11-231-3/+1
| | | |
| * | | Add fixity information to primops (ticket #6026)Michal Terepeta2012-11-231-2/+4
| |/ /
* | | Make Constraint and * look identical in Core (System FC)Simon Peyton Jones2012-11-261-1/+1
|/ / | | | | | | Fixes Trac #7451. See Note [Kind Constraint and kind *] in Kind.lhs.
* | Merge branch 'master' of http://darcs.haskell.org/ghcSimon Peyton Jones2012-10-194-5/+5
|\ \
| * | Some alpha renamingIan Lynagh2012-10-164-5/+5
| | | | | | | | | | | | | | | Mostly d -> g (matching DynFlag -> GeneralFlag). Also renamed if* to when*, matching the Haskell if/when names
* | | Only promote *non-existential* data constructorsSimon Peyton Jones2012-10-191-2/+2
|/ / | | | | | | | | | | | | | | I don't konw how this was left out before; Trac #7347. In fixing this I did the usual round of refactoring. In particular, I cached the fact that a DataCon can be promoted in the DataCon itself (the dcPromoted field).
* | Fix error in tidying the type variables of a TyCon when building an ↵Simon Peyton Jones2012-10-121-1/+1
| | | | | | | | interface file
* | Be lazier when typechecking data type contexts (Trac #7321)Simon Peyton Jones2012-10-121-14/+11
| | | | | | | | | | | | | | | | | | | | We should be lazy when type-checking the equality-contraint part of a data constructor's type, to make the knot-tying work out right. The fact that it's always worked before is a fluke: no one else wrote a GADT whose type index mentions itself data T a wher MkT :: T (T Int)
* | Make the opt_UF_* static flags dynamicIan Lynagh2012-10-092-5/+10
| | | | | | | | | | | | | | | | I also removed the default values from the "Discounts and thresholds" note: most of them were no longer up-to-date. Along the way I added FloatSuffix to the argument parser, analogous to IntSuffix.
* | Make a start towards eta-rules and injective familiesSimon Peyton Jones2012-09-185-24/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Make Any into a type family (which it should always have been) This is to support the future introduction of eta rules for product types (see email on ghc-users title "PolyKind issue" early Sept 2012) * Add the *internal* data type support for (a) closed type families [so that you can't give type instance for 'Any'] (b) injective type families [because Any is really injective] This amounts to two boolean flags on the SynFamilyTyCon constructor of TyCon.SynTyConRhs. There is some knock-on effect, but all of a routine nature. It remains to offer source syntax for either closed or injective families.
* | Implement 'left' and 'right' coercionsSimon Peyton Jones2012-09-173-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch finally adds 'left' and 'right' coercions back into GHC. Trac #7205 gives the details. The main change is to add a new constructor to Coercion: data Coercion = ... | NthCo Int Coercion -- OLD, still there | LRCo LeftOrRight Coercion -- NEW data LeftOrRight = CLeft | CRight Plus: * Similar change to TcCoercion * Use LRCo when decomposing AppTys * Coercion optimisation needs to handle left/right The rest is just knock-on effects.
* | Move wORD_SIZE into platformConstantsIan Lynagh2012-09-161-2/+2
| |
* | Fix #7215: we weren't calculating the hashes correctly for sub-bindersSimon Marlow2012-09-052-15/+24
| |
* | Fix to-iface conversion of RULES involving coercions in argument pattternsSimon Peyton Jones2012-08-231-4/+3
| | | | | | | | This is part of the fix to Trac #7165
* | Add "Unregisterised" as a field in the settings fileIan Lynagh2012-08-071-3/+2
| | | | | | | | | | | | To explicitly choose whether you want an unregisterised build you now need to use the "--enable-unregisterised"/"--disable-unregisterised" configure flags.
* | applying simonpj's fix from #7022 (with 80-col reformatting)Simon Marlow2012-08-021-2/+6
|/
* Make -fscc-profiling a dynamic flagIan Lynagh2012-07-241-2/+1
| | | | All the flags that 'ways' imply are now dynamic
* Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghcIan Lynagh2012-07-191-1/+6
|\
| * Convert (co1 -> co2) to an IfaceFunTy, rather than IfaceTcAppSimon Peyton Jones2012-07-161-1/+6
| | | | | | | | This is more compact, and pretty-prints more nicely too.
* | Make -fPIC a dynamic flagIan Lynagh2012-07-161-1/+1
| | | | | | | | | | | | Hopefully I've kept the logic the same, and we now generate warnings if the user does -fno-PIC but we ignore them (e.g. because they're on OS X amd64).
* | Make a picPOpts functionIan Lynagh2012-07-161-2/+2
| | | | | | | | | | We now handle the preprocessor options the same way as the gcc options (picCCOpts).
* | Move -fno-warn-orphan flag into individual modulesIan Lynagh2012-07-152-0/+2
|/
* Merge branch 'master' of http://darcs.haskell.org/ghcSimon Peyton Jones2012-07-104-22/+34
|\ | | | | | | | | Conflicts: compiler/typecheck/TcRnDriver.lhs
| * Add silent superclass parameters (again)Simon Peyton Jones2012-06-274-11/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Remove a few more sortLe'sIan Lynagh2012-06-221-11/+9
| |
| * Remove 'on' from UtilIan Lynagh2012-06-221-0/+1
| | | | | | | | We can now rely on it being available from Data.Function
* | More changes to kind inference for type and class declarationsSimon Peyton Jones2012-07-101-44/+85
|/ | | | | | | | | | | | These should fix #7024 and #7022, among others. The main difficulty was that we were getting occ-name clashes between kind and type variables in TyCons, when spat into an interface file. The new scheme is to tidy TyCons during the conversoin into IfaceSyn, rather than trying to generate them pre-tidied, which was the already-unsatisfactory previous plan. There is the usual wave of refactorig as well.
* Move and rename opt_HiVersionIan Lynagh2012-06-182-4/+4
| | | | It isn't really an option at all
* Make -firrefutable-tuples a dynamic flagIan Lynagh2012-06-181-1/+0
|
* small tidyupSimon Marlow2012-06-151-2/+0
|
View Lorry Controller Status