summaryrefslogtreecommitdiff
path: root/ghc/compiler/compMan
Commit message (Collapse)AuthorAgeFilesLines
* [project @ 2005-03-22 17:13:12 by simonmar]simonmar2005-03-221-1386/+0
| | | | | | | | | | | | | | | A start on the GHC API: Flesh out the GHC module so that it can replace CompManager. Now, the clients that used CompManager consume the GHC API instead (namely Main, DriverMkDepend, and InteractiveUI). Main is significantly cleaner as a result. The interface needs more work: in particular, getInfo returns results in the form of IfaceDecls but we want to use full HsSyn and Id/DataCon/Class across the boundary instead. The interfaces for inspecting loaded modules are not yet implemented.
* [project @ 2005-03-18 13:37:27 by simonmar]simonmar2005-03-181-31/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flags cleanup. Basically the purpose of this commit is to move more of the compiler's global state into DynFlags, which is moving in the direction we need to go for the GHC API which can have multiple active sessions supported by a single GHC instance. Before: $ grep 'global_var' */*hs | wc -l 78 After: $ grep 'global_var' */*hs | wc -l 27 Well, it's an improvement. Most of what's left won't really affect our ability to host multiple sessions. Lots of static flags have become dynamic flags (yay!). Notably lots of flags that we used to think of as "driver" flags, like -I and -L, are now dynamic. The most notable static flags left behind are the "way" flags, eg. -prof. It would be nice to fix this, but it isn't urgent. On the way, lots of cleanup has happened. Everything related to static and dynamic flags lives in StaticFlags and DynFlags respectively, and they share a common command-line parser library in CmdLineParser. The flags related to modes (--makde, --interactive etc.) are now private to the front end: in fact private to Main itself, for now.
* [project @ 2005-03-17 12:03:45 by simonpj]simonpj2005-03-171-19/+19
| | | | | | | | | | Follow-up fix to this: ghc --make should check for a module graph that contains a hs-boot file with no corresponding parent module Namely, instead of complaining, just add the parent module. Merge to STABLE
* [project @ 2005-03-17 10:16:32 by simonpj]simonpj2005-03-171-29/+43
| | | | | | | ghc --make should check for a module graph that contains a hs-boot file with no corresponding parent module Merge to STABLE
* [project @ 2005-02-25 13:06:31 by simonpj]simonpj2005-02-251-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --------------------------------------------- Type signatures are no longer instantiated with skolem constants --------------------------------------------- Merge to STABLE Consider p :: a q :: b (p,q,r) = (r,r,p) Here, 'a' and 'b' end up being the same, because they are both bound to the type for 'r', which is just a meta type variable. So 'a' and 'b' can't be skolems. Sigh. This commit goes back to an earlier way of doing things, by arranging that type signatures get instantiated with *meta* type variables; then at the end we must check that they have not been unified with types, nor with each other. This is a real bore. I had to do quite a bit of related fiddling around to make error messages come out right. Improved one or two. Also a small unrelated fix to make :i (:+) print with parens in ghci. Sorry this got mixed up in the same commit.
* [project @ 2005-02-15 12:41:26 by simonmar]simonmar2005-02-151-4/+10
| | | | omit the initial foralls for :type, unless -fglasgow-exts is on
* [project @ 2005-02-14 16:38:30 by simonmar]simonmar2005-02-141-2/+16
| | | | | | | | | cmSetContext: check whether the modules specified actually exist and emit the usual Finder error message if any don't. This regressed duing the ModuleName->Module changeover, where I was a bit heavyhanded in removing moduleNameToModule: it also checked for the existence of each module and emitted a sensible exception.
* [project @ 2005-02-14 13:27:52 by simonmar]simonmar2005-02-141-4/+3
| | | | | Put the GlobalRdrEnv back into the ModIface, so it gets preserved when we reload a module without recompiling it.
* [project @ 2005-02-04 15:43:28 by simonpj]simonpj2005-02-041-65/+67
| | | | Respect --exclude-module in ghc -M; some tidying up as well
* [project @ 2005-02-02 13:28:29 by simonpj]simonpj2005-02-021-4/+4
| | | | Tidy output
* [project @ 2005-01-27 10:44:00 by simonpj]simonpj2005-01-271-204/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -------------------------------------------- Replace hi-boot files with hs-boot files -------------------------------------------- This major commit completely re-organises the way that recursive modules are dealt with. * It should have NO EFFECT if you do not use recursive modules * It is a BREAKING CHANGE if you do ====== Warning: .hi-file format has changed, so if you are ====== updating into an existing HEAD build, you'll ====== need to make clean and re-make The details: [documentation still to be done] * Recursive loops are now broken with Foo.hs-boot (or Foo.lhs-boot), not Foo.hi-boot * An hs-boot files is a proper source file. It is compiled just like a regular Haskell source file: ghc Foo.hs generates Foo.hi, Foo.o ghc Foo.hs-boot generates Foo.hi-boot, Foo.o-boot * hs-boot files are precisely a subset of Haskell. In particular: - they have the same import, export, and scoping rules - errors (such as kind errors) in hs-boot files are checked You do *not* need to mention the "original" name of something in an hs-boot file, any more than you do in any other Haskell module. * The Foo.hi-boot file generated by compiling Foo.hs-boot is a machine- generated interface file, in precisely the same format as Foo.hi * When compiling Foo.hs, its exports are checked for compatibility with Foo.hi-boot (previously generated by compiling Foo.hs-boot) * The dependency analyser (ghc -M) knows about Foo.hs-boot files, and generates appropriate dependencies. For regular source files it generates Foo.o : Foo.hs Foo.o : Baz.hi -- Foo.hs imports Baz Foo.o : Bog.hi-boot -- Foo.hs source-imports Bog For a hs-boot file it generates similar dependencies Bog.o-boot : Bog.hs-boot Bog.o-boot : Nib.hi -- Bog.hs-boto imports Nib * ghc -M is also enhanced to use the compilation manager dependency chasing, so that ghc -M Main will usually do the job. No need to enumerate all the source files. * The -c flag is no longer a "compiler mode". It simply means "omit the link step", and synonymous with -no-link.
* [project @ 2005-01-18 12:18:11 by simonpj]simonpj2005-01-181-251/+281
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ------------------------ Reorganisation of hi-boot files ------------------------ The main point of this commit is to arrange that in the Compilation Manager's dependendency graph, hi-boot files are proper nodes. This is important to make sure that we compile everything in the right order. It's a step towards hs-boot files. * The fundamental change is that CompManager.ModSummary has a new field, ms_boot :: IsBootInterface I also tided up CompManager a bit. No change to the Basic Plan. ModSummary is now exported abstractly from CompManager (was concrete) * Hi-boot files now have import declarations. The idea is they are compulsory, so that the dependency analyser can find them * I changed an invariant: the Compilation Manager used to ensure that hscMain was given a HomePackageTable only for the modules 'below' the one being compiled. This was really only important for instances and rules, and it was a bit inconvenient. So I moved the filter to the compiler itself: see HscTypes.hptInstances and hptRules. * Module Packages.hs now defines data PackageIdH = HomePackage -- The "home" package is the package -- curently being compiled | ExtPackage PackageId -- An "external" package is any other package It was just a Maybe type before, so this makes it a bit clearer. * I tried to add a bit better location info to the IfM monad, so that errors in interfaces come with a slightly more helpful error message. See the if_loc field in TcRnTypes --- and follow-on consequences * Changed Either to Maybes.MaybeErr in a couple of places (more perspicuous)
* [project @ 2005-01-14 17:57:41 by simonmar]simonmar2005-01-141-4/+15
| | | | | | | | | | | | | | HEADS UP! You now need to use an up to date Happy from CVS to build GHC. Happy version 1.15 will be released shortly. Replace the slow hacked up String-based GetImports with one based on the real Haskell parser. This requires a new addition to Happy to support parsing partial files. We now avoid reading each source file off the disk twice: once to get its module name and imports, and again to parse it. Instead we just slurp it once, and cache the StringBuffer. This should result in improved startup times for ghc --make, especially when there are lots of source files.
* [project @ 2004-12-06 10:47:22 by simonmar]simonmar2004-12-061-1/+2
| | | | Error message fixup
* [project @ 2004-11-26 16:19:45 by simonmar]simonmar2004-11-261-105/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Further integration with the new package story. GHC now supports pretty much everything in the package proposal. - GHC now works in terms of PackageIds (<pkg>-<version>) rather than just package names. You can still specify package names without versions on the command line, as long as the name is unambiguous. - GHC understands hidden/exposed modules in a package, and will refuse to import a hidden module. Also, the hidden/eposed status of packages is taken into account. - I had to remove the old package syntax from ghc-pkg, backwards compatibility isn't really practical. - All the package.conf.in files have been rewritten in the new syntax, and contain a complete list of modules in the package. I've set all the versions to 1.0 for now - please check your package(s) and fix the version number & other info appropriately. - New options: -hide-package P sets the expose flag on package P to False -ignore-package P unregisters P for this compilation For comparison, -package P sets the expose flag on package P to True, and also causes P to be linked in eagerly. -package-name is no longer officially supported. Unofficially, it's a synonym for -ignore-package, which has more or less the same effect as -package-name used to. Note that a package may be hidden and yet still be linked into the program, by virtue of being a dependency of some other package. To completely remove a package from the compiler's internal database, use -ignore-package. The compiler will complain if any two packages in the transitive closure of exposed packages contain the same module. You *must* use -ignore-package P when compiling modules for package P, if package P (or an older version of P) is already registered. The compiler will helpfully complain if you don't. The fptools build system does this. - Note: the Cabal library won't work yet. It still thinks GHC uses the old package config syntax. Internal changes/cleanups: - The ModuleName type has gone away. Modules are now just (a newtype of) FastStrings, and don't contain any package information. All the package-related knowledge is in DynFlags, which is passed down to where it is needed. - DynFlags manipulation has been cleaned up somewhat: there are no global variables holding DynFlags any more, instead the DynFlags are passed around properly. - There are a few less global variables in GHC. Lots more are scheduled for removal. - -i is now a dynamic flag, as are all the package-related flags (but using them in {-# OPTIONS #-} is Officially Not Recommended). - make -j now appears to work under fptools/libraries/. Probably wouldn't take much to get it working for a whole build.
* [project @ 2004-10-08 17:32:06 by panne]panne2004-10-081-1/+1
| | | | Fixed typo
* [project @ 2004-10-08 14:13:27 by simonmar]simonmar2004-10-081-17/+11
| | | | Comments only
* [project @ 2004-08-16 09:53:47 by simonpj]simonpj2004-08-161-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ------------------------------- Add instance information to :i Get rid of the DeclPool ------------------------------- 1. Add instance information to :info command. GHCi now prints out which instances a type or class belongs to, when you use :i 2. Tidy up printing of unqualified names in user output. Previously Outputable.PrintUnqualified was type PrintUnqualified = Name -> Bool but it's now type PrintUnqualified = ModuleName -> OccName -> Bool This turns out to be tidier even for Names, and it's now also usable when printing IfaceSyn stuff in GHCi, eliminating a grevious hack. 3. On the way to doing this, Simon M had the great idea that we could get rid of the DeclPool holding pen, which held declarations read from interface files but not yet type-checked. We do this by eagerly populating the TypeEnv with thunks what, when poked, do the type checking. This is just a logical continuation of lazy import mechanism we've now had for some while. The InstPool and RulePool still exist, but I plan to get rid of them in the same way. The new scheme does mean that more rules get sucked in than before, because previously the TypeEnv was used to mean "this thing was needed" and hence to control which rules were sucked in. But now the TypeEnv is populated more eagerly => more rules get sucked in. However this problem will go away when I get rid of the Inst and Rule pools. I should have kept these changes separate, but I didn't. Change (1) affects mainly TcRnDriver, HscMain, CompMan, InteractiveUI whereas change (3) is more wide ranging.
* [project @ 2004-08-13 13:04:50 by simonmar]simonmar2004-08-131-1/+0
| | | | Merge backend-hacking-branch onto HEAD. Yay!
* [project @ 2004-08-12 11:19:39 by simonmar]simonmar2004-08-121-1/+2
| | | | | | Take the timestamp of an interpreted linkable from the timestamp of the source file. This works better when the local clock is out of sync with the filesystem, and it's just as accurate.
* [project @ 2004-07-21 10:07:29 by simonpj]simonpj2004-07-211-1/+2
| | | | Add location information to :i command
* [project @ 2004-06-02 08:09:58 by simonpj]simonpj2004-06-021-3/+1
| | | | Comments only
* [project @ 2004-04-05 11:09:20 by simonpj]simonpj2004-04-051-4/+4
| | | | Wibble to :k
* [project @ 2004-04-05 10:50:24 by simonpj]simonpj2004-04-051-1/+17
| | | | | Add :k(ind) command to ghci to find the kind of a type. This works very, very similarly to :t(ype)
* [project @ 2004-01-08 10:45:33 by simonmar]simonmar2004-01-081-1/+1
| | | | | Fix warning message about missing Main module to refer to take into account the -main-is flag.
* [project @ 2004-01-08 10:34:02 by simonmar]simonmar2004-01-081-3/+6
| | | | | | | | If a -main-is flag was given, with a module name, use *that* module name rather than Main when deciding whether to link in batch mode or not. MERGE TO STABLE
* [project @ 2003-12-30 16:29:17 by simonpj]simonpj2003-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ---------------------------- Re-do kind inference (again) ---------------------------- [WARNING: interface file binary representation has (as usual) changed slightly; recompile your libraries!] Inspired by the lambda-cube, for some time GHC has used type Kind = Type That is, kinds were represented by the same data type as types. But GHC also supports unboxed types and unboxed tuples, and these complicate the kind system by requiring a sub-kind relationship. Notably, an unboxed tuple is acceptable as the *result* of a function but not as an *argument*. So we have the following setup: ? / \ / \ ?? (#) / \ * # where * [LiftedTypeKind] means a lifted type # [UnliftedTypeKind] means an unlifted type (#) [UbxTupleKind] means unboxed tuple ?? [ArgTypeKind] is the lub of *,# ? [OpenTypeKind] means any type at all In particular: error :: forall a:?. String -> a (->) :: ?? -> ? -> * (\(x::t) -> ...) Here t::?? (i.e. not unboxed tuple) All this has beome rather difficult to accommodate with Kind=Type, so this commit splits the two. * Kind is a distinct type, defined in types/Kind.lhs * IfaceType.IfaceKind disappears: we just re-use Kind.Kind * TcUnify.unifyKind is a distinct unifier for kinds * TyCon no longer needs KindCon and SuperKindCon variants * TcUnify.zapExpectedType takes an expected Kind now, so that in TcPat.tcMonoPatBndr we can express that the bound variable must have an argTypeKind (??). The big change is really that kind inference is much more systematic and well behaved. In particular, a kind variable can unify only with a "simple kind", which is built from * and (->). This deals neatly with awkward questions about how we can combine sub-kinding with type inference. Lots of small consequential changes, especially to the kind-checking plumbing in TcTyClsDecls. (We played a bit fast and loose before, and now we have to be more honest, in particular about how kind inference works for type synonyms. They can have kinds like (* -> #), so This cures two long-standing SourceForge bugs * 753777 (tcfail115.hs), which used erroneously to pass, but crashed in the code generator type T a = Int -> (# Int, Int #) f :: T a -> T a f t = \x -> case t x of r -> r * 753780 (tc167.hs), which used erroneously to fail f :: (->) Int# Int# Still, the result is not entirely satisfactory. In particular * The error message from tcfail115 is pretty obscure * SourceForge bug 807249 (Instance match failure on openTypeKind) is not fixed. Alas.
* [project @ 2003-11-17 14:23:30 by simonmar]simonmar2003-11-171-3/+0
| | | | | | GC some dead code. In some places, I left useful-looking but currently unused definitions in place, surrounded by #ifdef UNUSED ... #endif.
* [project @ 2003-11-05 11:39:38 by simonpj]simonpj2003-11-051-11/+20
| | | | Fix a stupid error in interactive environment handling (not present in STABLE)
* [project @ 2003-10-22 14:31:09 by simonmar]simonmar2003-10-221-1/+1
| | | | | | | | | | - In GHCi & Template Haskell, give a warning for things mentioned on the command line that we don't recognise, and then ignore them. In batch mode, these are still passed to the linker as before. - Clean up & rename the filename-suffix recognising functions in DriverPhases. There's probably a better place for these, but I've left them where they are for now.
* [project @ 2003-10-10 12:42:30 by simonpj]simonpj2003-10-101-8/+14
| | | | | | Arrange that loadImportedRules can see the module dependencies of this module, and hence know whether or not to load an hi-boot interface.
* [project @ 2003-10-09 11:58:39 by simonpj]simonpj2003-10-091-249/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ------------------------- GHC heart/lung transplant ------------------------- This major commit changes the way that GHC deals with importing types and functions defined in other modules, during renaming and typechecking. On the way I've changed or cleaned up numerous other things, including many that I probably fail to mention here. Major benefit: GHC should suck in many fewer interface files when compiling (esp with -O). (You can see this with -ddump-rn-stats.) It's also some 1500 lines of code shorter than before. ** So expect bugs! I can do a 3-stage bootstrap, and run ** the test suite, but you may be doing stuff I havn't tested. ** Don't update if you are relying on a working HEAD. In particular, (a) External Core and (b) GHCi are very little tested. But please, please DO test this version! ------------------------ Big things ------------------------ Interface files, version control, and importing declarations ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * There is a totally new data type for stuff that lives in interface files: Original names IfaceType.IfaceExtName Types IfaceType.IfaceType Declarations (type,class,id) IfaceSyn.IfaceDecl Unfoldings IfaceSyn.IfaceExpr (Previously we used HsSyn for type/class decls, and UfExpr for unfoldings.) The new data types are in iface/IfaceType and iface/IfaceSyn. They are all instances of Binary, so they can be written into interface files. Previous engronkulation concering the binary instance of RdrName has gone away -- RdrName is not an instance of Binary any more. Nor does Binary.lhs need to know about the ``current module'' which it used to, which made it specialised to GHC. A good feature of this is that the type checker for source code doesn't need to worry about the possibility that we might be typechecking interface file stuff. Nor does it need to do renaming; we can typecheck direct from IfaceSyn, saving a whole pass (module TcIface) * Stuff from interface files is sucked in *lazily*, rather than being eagerly sucked in by the renamer. Instead, we use unsafeInterleaveIO to capture a thunk for the unfolding of an imported function (say). If that unfolding is every pulled on, TcIface will scramble over the unfolding, which may in turn pull in the interface files of things mentioned in the unfolding. The External Package State is held in a mutable variable so that it can be side-effected by this lazy-sucking-in process (which may happen way later, e.g. when the simplifier runs). In effect, the EPS is a kind of lazy memo table, filled in as we suck things in. Or you could think of it as a global symbol table, populated on demand. * This lazy sucking is very cool, but it can lead to truly awful bugs. The intent is that updates to the symbol table happen atomically, but very bad things happen if you read the variable for the table, and then force a thunk which updates the table. Updates can get lost that way. I regret this subtlety. One example of the way it showed up is that the top level of TidyPgm (which updates the global name cache) to be much more disciplined about those updates, since TidyPgm may itself force thunks which allocate new names. * Version numbering in interface files has changed completely, fixing one major bug with ghc --make. Previously, the version of A.f changed only if A.f's type and unfolding was textually different. That missed changes to things that A.f's unfolding mentions; which was fixed by eagerly sucking in all of those things, and listing them in the module's usage list. But that didn't work with --make, because they might have been already sucked in. Now, A.f's version changes if anything reachable from A.f (via interface files) changes. A module with unchanged source code needs recompiling only if the versions of any of its free variables changes. [This isn't quite right for dictionary functions and rules, which aren't mentioned explicitly in the source. There are extensive comments in module MkIface, where all version-handling stuff is done.] * We don't need equality on HsDecls any more (because they aren't used in interface files). Instead we have a specialised equality for IfaceSyn (eqIfDecl etc), which uses IfaceEq instead of Bool as its result type. See notes in IfaceSyn. * The horrid bit of the renamer that tried to predict what instance decls would be needed has gone entirely. Instead, the type checker simply sucks in whatever instance decls it needs, when it needs them. Easy! Similarly, no need for 'implicitModuleFVs' and 'implicitTemplateHaskellFVs' etc. Hooray! Types and type checking ~~~~~~~~~~~~~~~~~~~~~~~ * Kind-checking of types is far far tidier (new module TcHsTypes replaces the badly-named TcMonoType). Strangely, this was one of my original goals, because the kind check for types is the Right Place to do type splicing, but it just didn't fit there before. * There's a new representation for newtypes in TypeRep.lhs. Previously they were represented using "SourceTypes" which was a funny compromise. Now they have their own constructor in the Type datatype. SourceType has turned back into PredType, which is what it used to be. * Instance decl overlap checking done lazily. Consider instance C Int b instance C a Int These were rejected before as overlapping, because when seeking (C Int Int) one couldn't tell which to use. But there's no problem when seeking (C Bool Int); it can only be the second. So instead of checking for overlap when adding a new instance declaration, we check for overlap when looking up an Inst. If we find more than one matching instance, we see if any of the candidates dominates the others (in the sense of being a substitution instance of all the others); and only if not do we report an error. ------------------------ Medium things ------------------------ * The TcRn monad is generalised a bit further. It's now based on utils/IOEnv.lhs, the IO monad with an environment. The desugarer uses the monad too, so that anything it needs can get faulted in nicely. * Reduce the number of wired-in things; in particular Word and Integer are no longer wired in. The latter required HsLit.HsInteger to get a Type argument. The 'derivable type classes' data types (:+:, :*: etc) are not wired in any more either (see stuff about derivable type classes below). * The PersistentComilerState is now held in a mutable variable in the HscEnv. Previously (a) it was passed to and then returned by many top-level functions, which was painful; (b) it was invariably accompanied by the HscEnv. This change tidies up top-level plumbing without changing anything important. * Derivable type classes are treated much more like 'deriving' clauses. Previously, the Ids for the to/from functions lived inside the TyCon, but now the TyCon simply records their existence (with a simple boolean). Anyone who wants to use them must look them up in the environment. This in turn makes it easy to generate the to/from functions (done in types/Generics) using HsSyn (like TcGenDeriv for ordinary derivings) instead of CoreSyn, which in turn means that (a) we don't have to figure out all the type arguments etc; and (b) it'll be type-checked for us. Generally, the task of generating the code has become easier, which is good for Manuel, who wants to make it more sophisticated. * A Name now says what its "parent" is. For example, the parent of a data constructor is its type constructor; the parent of a class op is its class. This relationship corresponds exactly to the Avail data type; there may be other places we can exploit it. (I made the change so that version comparison in interface files would be a bit easier; but in fact it tided up other things here and there (see calls to Name.nameParent). For example, the declaration pool, of declararations read from interface files, but not yet used, is now keyed only by the 'main' name of the declaration, not the subordinate names. * New types OccEnv and OccSet, with the usual operations. OccNames can be efficiently compared, because they have uniques, thanks to the hashing implementation of FastStrings. * The GlobalRdrEnv is now keyed by OccName rather than RdrName. Not only does this halve the size of the env (because we don't need both qualified and unqualified versions in the env), but it's also more efficient because we can use a UniqFM instead of a FiniteMap. Consequential changes to Provenance, which has moved to RdrName. * External Core remains a bit of a hack, as it was before, done with a mixture of HsDecls (so that recursiveness and argument variance is still inferred), and IfaceExprs (for value declarations). It's not thoroughly tested. ------------------------ Minor things ------------------------ * DataCon fields dcWorkId, dcWrapId combined into a single field dcIds, that is explicit about whether the data con is a newtype or not. MkId.mkDataConWorkId and mkDataConWrapId are similarly combined into MkId.mkDataConIds * Choosing the boxing strategy is done for *source* type decls only, and hence is now in TcTyDecls, not DataCon. * WiredIn names are distinguished by their n_sort field, not by their location, which was rather strange * Define Maybes.mapCatMaybes :: (a -> Maybe b) -> [a] -> [b] and use it here and there * Much better pretty-printing of interface files (--show-iface) Many, many other small things. ------------------------ File changes ------------------------ * New iface/ subdirectory * Much of RnEnv has moved to iface/IfaceEnv * MkIface and BinIface have moved from main/ to iface/ * types/Variance has been absorbed into typecheck/TcTyDecls * RnHiFiles and RnIfaces have vanished entirely. Their work is done by iface/LoadIface * hsSyn/HsCore has gone, replaced by iface/IfaceSyn * typecheck/TcIfaceSig has gone, replaced by iface/TcIface * typecheck/TcMonoType has been renamed to typecheck/TcHsType * basicTypes/Var.hi-boot and basicTypes/Generics.hi-boot have gone altogether
* [project @ 2003-07-18 13:25:55 by simonmar]simonmar2003-07-181-20/+4
| | | | | We don't need hacky filename comparisons in ppFilesFromSummaries now that the real bug in SysTools has been fixed.
* [project @ 2003-07-18 13:18:06 by simonmar]simonmar2003-07-181-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revision to the filename policy changes of yesterday. This fixes the broken stage2 and library builds. The new story is this: A Haskell source filename should take the form <path>/<basename>.<extension> where <path> is any directory <basename> is the name of the module, with dots replaced by slashes. <extension> is ".hs" or ".lhs". given a source filename in this form, GHC will produce object and interface files named respectively: <hidir>/<basename>.<hisuf> <odir>/<basename>.<osuf> where <hidir> is the value of the -hidir flag, if one was given, or the value of <path> from the source file otherwise. <odir> the same, for the -odir flag. <osuf> the object suffix (settable with the -osuf flag) <hisuf> the hi suffix (settable with the -hisuf flag) For example, if I have a module A.B.C, in source file foo/A/B/C.hs, then GHC will create foo/A/B/C.hi and foo/A/B/C.o. If GHC is given a source filename which is *not* of the form <path>/<basename>.<extension>, then it uses a different strategy. This happens if the filename does not follow the module name. In this case, GHC will set <path> to be the directory in which the source file resides, and <basename> to the module name with dots replaced by slashes, and then use the rules above. For example, if we put module A.B.C in foo/bar/baz.hs, then GHC will produce foo/bar/A/B/C.o and foo/bar/A/B/C.hi.
* [project @ 2003-07-17 12:04:50 by simonmar]simonmar2003-07-171-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filename-related cleanup & fixes -------------------------------- This commit rationalises some of our filename policies. The new story is this: When compiling a Haskell module A.B.C: The object file is placed in <obj-path>/A/B/C.o The interface file is placed in <hi-path>/A/B/C.hi Where <objpath> is - the argument of the -odir flag, if one was given - the element of the search path in which the source file was found, when in --make mode. - "." otherwise. Where <hipath> is - the argument of the -hidir flag, if one was given - the element of the search path in which the source file was found, when in --make mode. - "." otherwise. NOTE, in particular, that the name of the source file has no bearing on the name of the object or interface file any more. This is a nchange from the previous semantics, where the name of the object file would, under certain circumstances, follow the name of the source file. eg. before, if you said ghc -c dir/foo.hs you would get dir/foo.o. Now, you get something like Main.o, depending on what module is in foo.hs. This means that the driver pipeline machinery now needs to pass around a Maybe ModLocation, which is filled in by the Hsc phase and used later on to figure out the name of the object file (this was fairly painful, but seems to be the only way to get the right behaviour).
* [project @ 2003-07-16 15:27:36 by sof]sof2003-07-161-3/+7
| | | | ppFilesFromSummaries.toPpFile: make it clear that file paths are being eq-tested here
* [project @ 2003-02-19 11:51:35 by simonmar]simonmar2003-02-191-5/+12
| | | | | | | | | If -no-hs-main is specified in --make mode, attempt linking even when there's no Main module. Fixes bug #686620 MERGE TO STABLE
* [project @ 2003-01-09 12:01:45 by simonmar]simonmar2003-01-091-2/+2
| | | | Fix the stage2 build even more.
* [project @ 2003-01-08 15:47:54 by simonmar]simonmar2003-01-081-5/+15
| | | | Improve the missing module message in the compilation manager, too.
* [project @ 2003-01-08 15:28:04 by simonmar]simonmar2003-01-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Improve missing-module error messages. eg. hello2.hs:1: Failed to load interface for `Foo': Could not find interface file for `Foo' (use -v to see a list of the files searched for) and if we add the -v flag: hello2.hs:1: Failed to load interface for `Foo': Could not find interface file for `Foo' locations searched: Foo.hi Foo.hi-boot-6 Foo.hi-boot /home/simonmar/builds/i386-unknown-linux/libraries/haskell-src/Foo.hi /home/simonmar/builds/i386-unknown-linux/libraries/haskell98/Foo.hi /home/simonmar/builds/i386-unknown-linux/libraries/readline/Foo.hi /home/simonmar/builds/i386-unknown-linux/libraries/unix/Foo.hi /home/simonmar/builds/i386-unknown-linux/libraries/network/Foo.hi /home/simonmar/builds/i386-unknown-linux/libraries/base/Foo.hi
* [project @ 2002-12-18 16:29:25 by simonmar]simonmar2002-12-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Auto" packages. The big change here is that it is no longer necessary to explicitly say '-package X' on the command line if X is a package containing hierarchical Haskell modules. All packages marked "auto" contribute to the import path, so their modules are always available. At link time, the compiler knows which packages are actually used by the program, and it links in only those libraries needed. There's one exception: one-shot linking. If you link a program using ghc -o prog A.o B.o ... then you need to explicitly add -package flags for each package required (except base & haskell98) because the compiler has no information about the package dependencies in this case. Package configs have a new field: auto, which is either True or False. Non-auto packages must be mentioned on the command-line as usual. Non-auto packages are still required for: - non-hierarchical libraries (to avoid polluting the module namespace) - packages with no Haskell content - if you want more than one version of a package, or packages providing overlapping functionality where the user must decide which one to use. Doc changes to follow...
* [project @ 2002-12-17 13:50:28 by simonmar]simonmar2002-12-171-1/+1
| | | | | - add -no-link flag (omits link step, except in GHCi) - tidy up some informmational messages
* [project @ 2002-12-02 17:10:13 by simonpj]simonpj2002-12-021-4/+5
| | | | Use the right PackageIfaceTable in cmInfoThing
* [project @ 2002-10-25 21:59:51 by simonpj]simonpj2002-10-251-1/+1
| | | | Put findLinkable in Finder.lhs, where it can be found in non-ghci stage1 compilers!
* [project @ 2002-10-25 15:23:03 by simonpj]simonpj2002-10-251-20/+4
| | | | | | | | | | | | | | | | | ------------------------ More dependency fiddling ------------------------ WARNING: Interface file format has changed (again) You need to 'make clean' in all library code * Orphan modules are now kept separately Home-package dependencies now contain only home-package dependencies! See HscTypes.Dependencies * Linker now uses the dependencies to do dynamic linking Result: Template Haskell should work even without --make (not yet tested)
* [project @ 2002-10-17 14:26:16 by simonmar]simonmar2002-10-171-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Finder overhaul. The finder had got pretty complicated; this commit is mainly a cleanup, with one new feature: - the finder has a cache (again). The cache may be flushed by calling flushFinderCache, which actually only flushes home modules from the cache, because package modules are assumed not to move. This change is apropos of some other changes which will result in the finder being called more often, so we think a cache is going to be worthwhile. Also a couple of bugs were fixed: - the field ml_hi_file in a ModLocation is now *always* the name of the .hi file. If you need a .hi-boot file, you have to make it up by changing the suffix of ml_hi_file. (DriverMkDepend and RnHiFiles do this). This was the cause of a bug, but I can't remember the details. - The -odir flag now works in a more reasonable way: hierarchical modules get put in subdirectories of the -odir directory. eg. if your module is A.B.C, and -odir D is specified, then the object will be D/A/B/C.o; previously it would have been D/C.o.
* [project @ 2002-10-01 08:59:43 by simonpj]simonpj2002-10-011-3/+4
| | | | Use the ModSummary fields in record construction
* [project @ 2002-09-25 16:00:50 by simonmar]simonmar2002-09-251-2/+5
| | | | | | When a command-line evaluation returns an exception, revert to the old interactive context, because the new context will bind 'it' to a name that doesn't exist in the linker's symbol table.
* [project @ 2002-09-13 15:02:25 by simonpj]simonpj2002-09-133-749/+343
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -------------------------------------- Make Template Haskell into the HEAD -------------------------------------- This massive commit transfers to the HEAD all the stuff that Simon and Tim have been doing on Template Haskell. The meta-haskell-branch is no more! WARNING: make sure that you * Update your links if you are using link trees. Some modules have been added, some have gone away. * Do 'make clean' in all library trees. The interface file format has changed, and you can get strange panics (sadly) if GHC tries to read old interface files: e.g. ghc-5.05: panic! (the `impossible' happened, GHC version 5.05): Binary.get(TyClDecl): ForeignType * You need to recompile the rts too; Linker.c has changed However the libraries are almost unaltered; just a tiny change in Base, and to the exports in Prelude. NOTE: so far as TH itself is concerned, expression splices work fine, but declaration splices are not complete. --------------- The main change --------------- The main structural change: renaming and typechecking have to be interleaved, because we can't rename stuff after a declaration splice until after we've typechecked the stuff before (and the splice itself). * Combine the renamer and typecheker monads into one (TcRnMonad, TcRnTypes) These two replace TcMonad and RnMonad * Give them a single 'driver' (TcRnDriver). This driver replaces TcModule.lhs and Rename.lhs * The haskell-src library package has a module Language/Haskell/THSyntax which defines the Haskell data type seen by the TH programmer. * New modules: hsSyn/Convert.hs converts THSyntax -> HsSyn deSugar/DsMeta.hs converts HsSyn -> THSyntax * New module typecheck/TcSplice type-checks Template Haskell splices. ------------- Linking stuff ------------- * ByteCodeLink has been split into ByteCodeLink (which links) ByteCodeAsm (which assembles) * New module ghci/ObjLink is the object-code linker. * compMan/CmLink is removed entirely (was out of place) Ditto CmTypes (which was tiny) * Linker.c initialises the linker when it is first used (no need to call initLinker any more). Template Haskell makes it harder to know when and whether to initialise the linker. ------------------------------------- Gathering the LIE in the type checker ------------------------------------- * Instead of explicitly gathering constraints in the LIE tcExpr :: RenamedExpr -> TcM (TypecheckedExpr, LIE) we now dump the constraints into a mutable varabiable carried by the monad, so we get tcExpr :: RenamedExpr -> TcM TypecheckedExpr Much less clutter in the code, and more efficient too. (Originally suggested by Mark Shields.) ----------------- Remove "SysNames" ----------------- Because the renamer and the type checker were entirely separate, we had to carry some rather tiresome implicit binders (or "SysNames") along inside some of the HsDecl data structures. They were both tiresome and fragile. Now that the typechecker and renamer are more intimately coupled, we can eliminate SysNames (well, mostly... default methods still carry something similar). ------------- Clean up HsPat ------------- One big clean up is this: instead of having two HsPat types (InPat and OutPat), they are now combined into one. This is more consistent with the way that HsExpr etc is handled; there are some 'Out' constructors for the type checker output. So: HsPat.InPat --> HsPat.Pat HsPat.OutPat --> HsPat.Pat No 'pat' type parameter in HsExpr, HsBinds, etc Constructor patterns are nicer now: they use HsPat.HsConDetails for the three cases of constructor patterns: prefix, infix, and record-bindings The *same* data type HsConDetails is used in the type declaration of the data type (HsDecls.TyData) Lots of associated clean-up operations here and there. Less code. Everything is wonderful.
* [project @ 2002-09-04 11:06:19 by simonmar]simonmar2002-09-041-4/+3
| | | | Import fixups
View Lorry Controller Status