summaryrefslogtreecommitdiff
path: root/compiler/parser
Commit message (Collapse)AuthorAgeFilesLines
* Make -fhpc a dynamic flagIan Lynagh2012-09-032-5/+10
|
* Add -fcmm-sink to avoid the register allocator failing on x86Simon Marlow2012-08-311-0/+10
|
* Allow a vew pattern or bang pattern in a record pattern.Takano Akio2012-08-161-1/+5
| | | | | | | e.g. data T = MkT { x,y :: Int } f (MkT { x = !v, y = negate -> w }) = v + w
* Make -fscc-profiling a dynamic flagIan Lynagh2012-07-242-5/+11
| | | | All the flags that 'ways' imply are now dynamic
* Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghcIan Lynagh2012-07-192-23/+76
|\
| * remove tabsSimon Marlow2012-07-161-3/+3
| |
| * Implemented MultiWayIf extension.Mikhail Vorozhtsov2012-07-162-1/+15
| |
| * Implemented \case expressions.Mikhail Vorozhtsov2012-07-162-22/+61
| |
* | Small refactoring for FastZStringsIan Lynagh2012-07-151-2/+2
| |
* | HsStringPrim now contains FastBytes, not FastStringIan Lynagh2012-07-141-5/+3
| |
* | Implement FastBytes, and use it for MachStrIan Lynagh2012-07-141-1/+1
|/ | | | | | | | | | | | | This is a first step on the way to refactoring the FastString type. FastBytes currently has no unique, mainly because there isn't currently a nice way to produce them in Binary. Also, we don't currently do the "Dictionary" thing with FastBytes in Binary. I'm not sure whether this is important. We can change both decisions later, but in the meantime this gets the refactoring underway.
* 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.
* Simplify the implementation of Implicit ParametersSimon Peyton Jones2012-06-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch re-implements implicit parameters via a class with a functional dependency: class IP (n::Symbol) a | n -> a where ip :: a This definition is in the library module GHC.IP. Notice how it use a type-literal, so we can have constraints like IP "x" Int Now all the functional dependency machinery works right to make implicit parameters behave as they should. Much special-case processing for implicit parameters can be removed entirely. One particularly nice thing is not having a dedicated "original-name cache" for implicit parameters (the nsNames field of NameCache). But many other cases disappear: * BasicTypes.IPName * IPTyCon constructor in Tycon.TyCon * CIPCan constructor in TcRnTypes.Ct * IPPred constructor in Types.PredTree Implicit parameters remain special in a few ways: * Special syntax. Eg the constraint (IP "x" Int) is parsed and printed as (?x::Int). And we still have local bindings for implicit parameters, and occurrences thereof. * A implicit-parameter binding (let ?x = True in e) amounts to a local instance declaration, which we have not had before. It just generates an implication contraint (easy), but when going under it we must purge any existing bindings for ?x in the inert set. See Note [Shadowing of Implicit Parameters] in TcSimplify * TcMType.sizePred classifies implicit parameter constraints as size-0, as before the change There are accompanying patches to libraries 'base' and 'haddock' All the work was done by Iavor Diatchki
* Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghcIan Lynagh2012-06-131-5/+2
|\ | | | | | | | | Fix conflicts in: compiler/main/DynFlags.hs
| * Revive 'mdo' expressions, per discussion in Trac #4148Simon Peyton Jones2012-06-121-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Summary: - mdo expressions are enabled by RecursiveDo pragma - mdo expressions perform full segmentation - 'rec' groups inside 'do' are changed so they do *not* perform any segmentation. - Both 'mdo' and 'rec' are enabled by 'RecursiveDo' 'DoRec' is deprecated in favour of 'RecursiveDo' (The 'rec' keyword is also enabled by 'Arrows', as now.) Thanks to Levent for doing all the work
* | Pass DynFlags down to mk_err_msgIan Lynagh2012-06-121-1/+1
|/
* Merge remote-tracking branch 'origin/unboxed-tuple-arguments2'Paolo Capriotti2012-06-051-1/+1
|\
| * Support code generation for unboxed-tuple function argumentsunboxed-tuple-arguments2Max Bolingbroke2012-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | This is done by a 'unarisation' pre-pass at the STG level which translates away all (live) binders binding something of unboxed tuple type. This has the following knock-on effects: * The subkind hierarchy is vastly simplified (no UbxTupleKind or ArgKind) * Various relaxed type checks in typechecker, 'foreign import prim' etc * All case binders may be live at the Core level
* | Change how macros like ASSERT are definedIan Lynagh2012-06-051-0/+2
|/ | | | | By using Haskell's debugIsOn rather than CPP's "#ifdef DEBUG", we don't need to kludge things to keep the warning checker happy etc.
* Tweak the lexer: In particular, improve notFollowedBy and friendsIan Lynagh2012-05-151-7/+14
| | | | | | | | | | | | | We were hitting a problem when reading the LANGUAGE/OPTIONS pragmas from GHC.TypeLits, where the buffer ended "{-". The rules for the start-comment lexeme check that "{-" is not followed by "#", but the test returned False when there was no next character. Therefore we were lexing this as as an open-curly lexeme (only consuming the "{", and not reaching the end of the buffer), which meant the options parser think that it had reached the end of the options. Now we correctly lex as "{-".
* Refactor LHsTyVarBndrs to fix Trac #6081Simon Peyton Jones2012-05-113-21/+22
| | | | | | | | | | | | | | | This is really a small change, but it touches a lot of files quite significantly. The real goal is to put the implicitly-bound kind variables of a data/class decl in the right place, namely on the LHsTyVarBndrs type, which now looks like data LHsTyVarBndrs name = HsQTvs { hsq_kvs :: [Name] , hsq_tvs :: [LHsTyVarBndr name] } This little change made the type checker neater in a number of ways, but it was fiddly to push through the changes.
* Tidy up a remaining glitch in unificationSimon Peyton Jones2012-05-011-1/+2
| | | | | | | | | | | | | | | | | | There was one place, in type checking parallel list comprehensions where we were unifying types, but had no convenient way to use the resulting coercion; instead we just checked that it was Refl. This was Wrong Wrong; it might fail unpredicably in a GADT-like situation, and it led to extra error-generation code used only in this one place. This patch tidies it all up, by moving the 'return' method from the *comprehension* to the ParStmtBlock. The latter is a new data type, now used for each sub-chunk of a parallel list comprehension. Because of the data type change, quite a few modules are touched, but only in a fairly trivial way. The real changes are in TcMatches (and corresponding desugaring); plus deleting code from TcUnify. This patch also fixes the pretty-printing bug in Trac #6060
* Move free-var info from InstDecl to FamInstDeclSimon Peyton Jones2012-04-202-9/+9
|
* Do SCC on instance declarations (fixes Trac #5715)Simon Peyton Jones2012-04-202-11/+16
| | | | | | | | | | | | | | | | | | The trouble here is that given {-# LANGUAGE DataKinds, TypeFamilies #-} data instance Foo a = Bar (Bar a) we want to get a sensible message that we can't use the promoted 'Bar' constructor until after its definition; it's a staging error. Bud the staging mechanism that we use for vanilla data declarations don't work here. Solution is to perform strongly-connected component analysis on the instance declarations. But that in turn means that we need to track free-variable information on more HsSyn declarations, which is why so many files are touched. All the changes are boiler-platey except the ones in TcInstDcls.
* Merge branch 'master' of http://darcs.haskell.org//ghcSimon Peyton Jones2012-04-131-0/+3
|\
| * Allow promoted constructors in the typedoc production (#5948)Paolo Capriotti2012-04-061-0/+3
| |
* | Allow kind-variable binders in type signaturesSimon Peyton Jones2012-04-133-68/+4
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the last major addition to the kind-polymorphism story, by allowing (Trac #5938) type family F a -- F :: forall k. k -> * data T a -- T :: forall k. k -> * type instance F (T (a :: Maybe k)) = Char The new thing is the explicit 'k' in the type signature on 'a', which itself is inside a type pattern for F. Main changes are: * HsTypes.HsBSig now has a *pair* (kvs, tvs) of binders, the kind variables and the type variables * extractHsTyRdrTyVars returns a pair (kvs, tvs) and the function itself has moved from RdrHsSyn to RnTypes * Quite a bit of fiddling with TcHsType.tcHsPatSigType and tcPatSig which have become a bit simpler. I'm still not satisfied though. There's some consequential fiddling in TcRules too. * Removed the unused HsUtils.collectSigTysFromPats There's a consequential wibble to Haddock too
* Support qualified identifiers in quasi-quotes (#5555).Paolo Capriotti2012-04-022-1/+29
|
* Merge with HEADSimon Peyton Jones2012-03-271-14/+2
|\
| * Remove dead codeJose Pedro Magalhaes2012-03-271-12/+1
| | | | | | | | | | RdrHsSyn.extractGenericPatTyVars was a leftover from the old generic classes.
* | Merge branch 'master' of http://darcs.haskell.org//ghcSimon Peyton Jones2012-03-263-19/+84
|\ \ | |/ | | | | | | | | Conflicts: compiler/hsSyn/Convert.lhs compiler/hsSyn/HsDecls.lhs
| * Add -XExplicitNamespaces to enable using 'type' in import/exports.Iavor S. Diatchki2012-03-243-4/+19
| | | | | | | | | | | | | | | | This extension is implied by: * TypeOperators: so that we can import/export things like (+) * TypeFamilies: because associated type synonyms use "type T" to name the associated type in a subordinate list.
| * Merge remote-tracking branch 'origin/master' into type-natsIavor S. Diatchki2012-03-193-10/+11
| |\
| | * Deal with kind variables brought into scope by a kind signatureSimon Peyton Jones2012-03-143-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes Trac #5937, where a kind variable is mentioned only in the kind signature of a GADT data SMaybe :: (k -> *) -> Maybe k -> * where ... The main change is that the tcdKindSig field of TyData and TyFamily now has type Maybe (HsBndrSig (LHsKind name)), where the HsBndrSig part deals with the kind variables that the signature may bind. I also removed the now-unused PostTcKind field of UserTyVar and KindedTyVar.
| * | Only parse type literals when using `DataKinds`.Iavor S. Diatchki2012-03-183-2/+22
| | |
| * | Merge remote-tracking branch 'origin/master' into type-natsIavor S. Diatchki2012-03-134-38/+69
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: compiler/coreSyn/CoreLint.lhs compiler/deSugar/DsBinds.lhs compiler/hsSyn/HsTypes.lhs compiler/iface/IfaceType.lhs compiler/rename/RnHsSyn.lhs compiler/rename/RnTypes.lhs compiler/stgSyn/StgLint.lhs compiler/typecheck/TcHsType.lhs compiler/utils/ListSetOps.lhs
| * | Merge remote-tracking branch 'origin/master' into type-natsIavor S. Diatchki2012-02-121-17/+22
| |\ \ | | | | | | | | | | | | | | | | Conflicts: compiler/coreSyn/CoreLint.lhs
| * | | Add support for type-level "strings".Iavor S. Diatchki2012-01-242-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are types that look like "this" and "that". They are of kind `Symbol`, defined in module `GHC.TypeLits`. For each type-level symbol `X`, we have a singleton type, `TSymbol X`. The value of the singleton type can be named with the overloaded constant `tSymbol`. Here is an example: tSymbol :: TSymbol "Hello"
| * | | Merge remote-tracking branch 'origin/master' into type-natsIavor S. Diatchki2012-01-243-66/+47
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: compiler/typecheck/TcEvidence.lhs
| * \ \ \ Merge in more HEAD, fix stuff upSimon Peyton Jones2012-01-233-11/+11
| |\ \ \ \
| * | | | | Change -XTypeOperators to treat all type-operators as type-constructors.Iavor S. Diatchki2012-01-082-16/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, only type operators starting with ":" were type constructors, and writing "+" in a type resulted in a type variable. Now, type variables are always ordinary identifiers, and all operators are treated as constructors. One can still write type variables in infix form though, for example, "a `fun` b" is a type expression with 3 type variables: "a", "fun", and "b". Writing (+) in an import/export list always refers to the value (+) and not the type. To refer to the type one can write either "type (+)", or provide an explicit suobrdinate list (e.g., "(+)()"). For clarity, one can also combine the two, for example "type (+)(A,B,C)" is also accepted and means the same thing as "(+)(A,B,C)" (i.e., export the type (+), with the constructors A,B,and C).
| * | | | | Merge branch 'master' into type-natsIavor S. Diatchki2011-12-293-35/+44
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: compiler/typecheck/TcCanonical.lhs compiler/typecheck/TcSMonad.lhs
| * | | | | | Add numeric types to the parsing part of the front end.Iavor S. Diatchki2011-12-182-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the moment, the kind of the numerical literals is the type "Word" lifted to the kind level. This should probably be changed in the future.
* | | | | | | Make the 'extract' functions to find free type variablesSimon Peyton Jones2012-03-261-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of an HsType return RdrNames rather than (Located RdrNames). This means less clutter, and the individual locations are a bit arbitrary if a name occurs more than once.
* | | | | | | Refactor HsDecls.TyClDecl to extract the type HsTyDefn, which is theSimon Peyton Jones2012-03-223-122/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RHS of a data type or type synonym declaration. This can be shared between type declarations and type *instance* declarations.
* | | | | | | Deal with kind variables brought into scope by a kind signatureSimon Peyton Jones2012-03-143-10/+11
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes Trac #5937, where a kind variable is mentioned only in the kind signature of a GADT data SMaybe :: (k -> *) -> Maybe k -> * where ... The main change is that the tcdKindSig field of TyData and TyFamily now has type Maybe (HsBndrSig (LHsKind name)), where the HsBndrSig part deals with the kind variables that the signature may bind. I also removed the now-unused PostTcKind field of UserTyVar and KindedTyVar.
* | | | | | Hurrah! This major commit adds support for scoped kind variables,Simon Peyton Jones2012-03-023-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which (finally) fills out the functionality of polymorphic kinds. It also fixes numerous bugs. Main changes are: Renaming stuff ~~~~~~~~~~~~~~ * New type in HsTypes: data HsBndrSig sig = HsBSig sig [Name] which is used for type signatures in patterns, and kind signatures in types. So when you say f (x :: [a]) = x ++ x or data T (f :: k -> *) (x :: *) = MkT (f x) the signatures in both cases are a HsBndrSig. * The [Name] in HsBndrSig records the variables bound by the pattern, that is 'a' in the first example, 'k' in the second, and nothing in the third. The renamer initialises the field. * As a result I was able to get rid of RnHsSyn.extractHsTyNames :: LHsType Name -> NameSet and its friends altogether. Deleted the entire module! This led to some knock-on refactoring; in particular the type renamer now returns the free variables just like the term renamer. Kind-checking types: mainly TcHsType ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ A major change is that instead of kind-checking types in two passes, we now do one. Under the old scheme, the first pass did kind-checking and (hackily) annotated the HsType with the inferred kinds; and the second pass desugared the HsType to a Type. But now that we have kind variables inside types, the first pass (TcHsType.tc_hs_type) can go straight to Type, and zonking will squeeze out any kind unification variables later. This is much nicer, but it was much more fiddly than I had expected. The nastiest corner is this: it's very important that tc_hs_type uses lazy constructors to build the returned type. See Note [Zonking inside the knot] in TcHsType. Type-checking type and class declarations: mainly TcTyClsDecls ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ I did tons of refactoring in TcTyClsDecls. Simpler and nicer now. Typechecking bindings: mainly TcBinds ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ I rejigged (yet again) the handling of type signatures in TcBinds. It's a bit simpler now. The main change is that tcTySigs goes right through to a TcSigInfo in one step; previously it was split into two, part here and part later. Unsafe coercions ~~~~~~~~~~~~~~~~ Usually equality coercions have exactly the same kind on both sides. But we do allow an *unsafe* coercion between Int# and Bool, say, used in case error Bool "flah" of { True -> 3#; False -> 0# } --> (error Bool "flah") |> unsafeCoerce Bool Int# So what is the instantiation of (~#) here? unsafeCoerce Bool Int# :: (~#) ??? Bool Int# I'm using OpenKind here for now, but it's un-satisfying that the lhs and rhs of the ~ don't have precisely the same kind. More minor ~~~~~~~~~~ * HsDecl.TySynonym has its free variables attached, which makes the cycle computation in TcTyDecls.mkSynEdges easier. * Fixed a nasty reversed-comparison bug in FamInstEnv: @@ -490,7 +490,7 @@ lookup_fam_inst_env' match_fun one_sided ie fam tys n_tys = length tys extra_tys = drop arity tys (match_tys, add_extra_tys) - | arity > n_tys = (take arity tys, \res_tys -> res_tys ++ extra_tys) + | arity < n_tys = (take arity tys, \res_tys -> res_tys ++ extra_tys) | otherwise = (tys, \res_tys -> res_tys)
* | | | | | Implement "value" imports with the CAPIIan Lynagh2012-02-262-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to import values (i.e. non-functions) with the CAPI. This means we can access values even if (on some or all platforms) they are simple #defines.
* | | | | | Fix parsing of FFI import declsIan Lynagh2012-02-251-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | We no longer parse "staticfoo" as "static foo".
* | | | | | Remove support for CTYPE pragmas on type synonymsIan Lynagh2012-02-222-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not clear whether it's desirable or not, and it turns out that the way we use coercions in GHC means we tend to lose information about type synonyms.
View Lorry Controller Status