X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FMain.hs;h=cf25bde3b8e6d22389047e7a5f1c6720c6534b4b;hb=4307f28b4d201d71a11dd304796ce7319fbb3345;hp=7da0074e2c7536b24455c740cb388426620ef6ad;hpb=3a223cd2811d46295048b3a2dab11403ca291b20;p=ghc-hetmet.git diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs index 7da0074..cf25bde 100644 --- a/ghc/compiler/main/Main.hs +++ b/ghc/compiler/main/Main.hs @@ -1,7 +1,7 @@ {-# OPTIONS -fno-warn-incomplete-patterns -optc-DNON_POSIX_SOURCE #-} ----------------------------------------------------------------------------- --- $Id: Main.hs,v 1.131 2003/07/21 15:14:18 ross Exp $ +-- $Id: Main.hs,v 1.137 2004/08/12 13:10:40 simonmar Exp $ -- -- GHC Driver program -- @@ -31,12 +31,12 @@ import Packages ( showPackages, getPackageConfigMap, basePackage, haskell98Package ) import DriverPipeline ( staticLink, doMkDLL, runPipeline ) -import DriverState ( buildCoreToDo, buildStgToDo, +import DriverState ( buildStgToDo, findBuildTag, getPackageExtraGhcOpts, unregFlags, v_GhcMode, v_GhcModeFlag, GhcMode(..), v_Keep_tmp_files, v_Ld_inputs, v_Ways, - v_OptLevel, v_Output_file, v_Output_hi, + v_Output_file, v_Output_hi, readPackageConf, verifyOutputFiles, v_NoLink, v_Build_tag ) @@ -44,7 +44,7 @@ import DriverFlags ( buildStaticHscOpts, dynamic_flags, processArgs, static_flags) import DriverMkDepend ( beginMkDependHS, endMkDependHS ) -import DriverPhases ( isSourceFile ) +import DriverPhases ( isSourceFilename ) import DriverUtil ( add, handle, handleDyn, later, unknownFlagsErr ) import CmdLineOpts ( dynFlag, restoreDynFlags, @@ -99,8 +99,7 @@ main = -- an IO exception probably isn't our fault, so don't panic IOException _ -> hPutStrLn stderr (show exception) AsyncException StackOverflow -> - hPutStrLn stderr "stack overflow: use +RTS -K \ - \to increase it" + hPutStrLn stderr "stack overflow: use +RTS -K to increase it" _other -> hPutStr stderr (show (Panic (show exception))) exitWith (ExitFailure 1) ) $ do @@ -141,12 +140,8 @@ main = -- -O and --interactive are not a good combination -- ditto with any kind of way selection - orig_opt_level <- readIORef v_OptLevel - when (orig_opt_level > 0 && mode == DoInteractive) $ - do putStr "warning: -O conflicts with --interactive; -O turned off.\n" - writeIORef v_OptLevel 0 orig_ways <- readIORef v_Ways - when (notNull orig_ways && mode == DoInteractive) $ + when (notNull orig_ways && isInteractive mode) $ do throwDyn (UsageError "--interactive can't be used with -prof, -ticky, -unreg or -smp.") @@ -167,7 +162,6 @@ main = -- build the default DynFlags (these may be adjusted on a per -- module basis by OPTIONS pragmas and settings in the interpreter). - core_todo <- buildCoreToDo stg_todo <- buildStgToDo -- set the "global" HscLang. The HscLang can be further adjusted on a module @@ -177,17 +171,19 @@ main = build_tag <- readIORef v_Build_tag let lang = case mode of DoInteractive -> HscInterpreted + DoEval _ -> HscInterpreted _other | build_tag /= "" -> HscC | otherwise -> hscLang dyn_flags -- for ways other that the normal way, we must -- compile via C. - setDynFlags (dyn_flags{ coreToDo = core_todo, - stgToDo = stg_todo, + setDynFlags (dyn_flags{ stgToDo = stg_todo, hscLang = lang, -- leave out hscOutName for now hscOutName = panic "Main.main:hscOutName not set", - verbosity = 1 + verbosity = case mode of + DoEval _ -> 0 + _other -> 1 }) -- The rest of the arguments are "dynamic" @@ -215,7 +211,7 @@ main = Everything else is considered to be a linker object, and passed straight through to the linker. -} - looks_like_an_input m = isSourceFile m + looks_like_an_input m = isSourceFilename m || looksLikeModuleName m || '.' `notElem` m @@ -225,7 +221,9 @@ main = normal_fileish_paths = map normalisePath fileish_args (srcs, objs) = partition looks_like_an_input normal_fileish_paths - mapM_ (add v_Ld_inputs) objs + -- Note: have v_Ld_inputs maintain the order in which 'objs' occurred on + -- the command-line. + mapM_ (add v_Ld_inputs) (reverse objs) ---------------- Display banners and configuration ----------- showBanners mode conf_file static_opts @@ -255,9 +253,13 @@ main = (staticLink o_files def_hs_pkgs) } #ifndef GHCI - DoInteractive -> throwDyn (CmdLineError "not built for interactive use") + DoInteractive -> noInteractiveError + DoEval _ -> noInteractiveError + where + noInteractiveError = throwDyn (CmdLineError "not built for interactive use") #else - DoInteractive -> interactiveUI srcs + DoInteractive -> interactiveUI srcs Nothing + DoEval expr -> interactiveUI srcs (Just expr) #endif -- ----------------------------------------------------------------------------- @@ -273,7 +275,7 @@ checkOptions mode srcs objs = do -- -ohi sanity check ohi <- readIORef v_Output_hi if (isJust ohi && - (mode == DoMake || mode == DoInteractive || srcs `lengthExceeds` 1)) + (mode == DoMake || isInteractive mode || srcs `lengthExceeds` 1)) then throwDyn (UsageError "-ohi can only be used when compiling a single source file") else do @@ -285,13 +287,16 @@ checkOptions mode srcs objs = do -- Check that there are some input files (except in the interactive -- case) - if null srcs && null objs && mode /= DoInteractive + if null srcs && null objs && not (isInteractive mode) then throwDyn (UsageError "no input files") else do -- Verify that output files point somewhere sensible. verifyOutputFiles +isInteractive DoInteractive = True +isInteractive (DoEval _) = True +isInteractive _ = False -- ----------------------------------------------------------------------------- -- Compile files in one-shot mode. @@ -328,9 +333,9 @@ doMake :: [String] -> IO () doMake [] = throwDyn (UsageError "no input files") doMake srcs = do dflags <- getDynFlags - state <- cmInit Batch - graph <- cmDepAnal state dflags srcs - (_, ok_flag, _) <- cmLoadModules state dflags graph + state <- cmInit Batch dflags + graph <- cmDepAnal state srcs + (_, ok_flag, _) <- cmLoadModules state graph when (failed ok_flag) (exitWith (ExitFailure 1)) return ()