From: simonmar <unknown>
Date: Wed, 23 Jun 1999 10:33:04 +0000 (+0000)
Subject: [project @ 1999-06-23 10:33:03 by simonmar]
X-Git-Tag: Approximately_9120_patches~6106
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=14a17049447fc3532b81ea2e2ff7e2637a607be1

[project @ 1999-06-23 10:33:03 by simonmar]
rename -ddump-rdr to -ddump-parsed, and make it work.
---

diff --git a/ghc/compiler/main/CmdLineOpts.lhs b/ghc/compiler/main/CmdLineOpts.lhs
index ffe9d6b..8652480 100644
--- a/ghc/compiler/main/CmdLineOpts.lhs
+++ b/ghc/compiler/main/CmdLineOpts.lhs
@@ -27,7 +27,7 @@ module CmdLineOpts (
 	opt_D_dump_foreign,
 	opt_D_dump_inlinings,
 	opt_D_dump_occur_anal,
-	opt_D_dump_rdr,
+	opt_D_dump_parsed,
 	opt_D_dump_realC,
 	opt_D_dump_rn,
 	opt_D_dump_rules,
@@ -305,7 +305,7 @@ opt_D_dump_flatC		= lookUp  SLIT("-ddump-flatC")
 opt_D_dump_foreign		= lookUp  SLIT("-ddump-foreign-stubs")
 opt_D_dump_inlinings		= lookUp  SLIT("-ddump-inlinings")
 opt_D_dump_occur_anal		= lookUp  SLIT("-ddump-occur-anal")
-opt_D_dump_rdr			= lookUp  SLIT("-ddump-rdr")
+opt_D_dump_parsed		= lookUp  SLIT("-ddump-parsed")
 opt_D_dump_realC		= lookUp  SLIT("-ddump-realC")
 opt_D_dump_rn			= lookUp  SLIT("-ddump-rn")
 opt_D_dump_simpl		= lookUp  SLIT("-ddump-simpl")
diff --git a/ghc/compiler/main/Main.lhs b/ghc/compiler/main/Main.lhs
index 2406609..9a62fae 100644
--- a/ghc/compiler/main/Main.lhs
+++ b/ghc/compiler/main/Main.lhs
@@ -87,13 +87,18 @@ doIt (core_cmds, stg_cmds)
   = doIfSet opt_Verbose 
 	(hPutStr stderr "Glasgow Haskell Compiler, version " 	>>
  	 hPutStr stderr compiler_version                    	>>
-	 hPutStr stderr ", for Haskell 98\n")			>>
+	 hPutStr stderr ", for Haskell 98\n"			>>
+	 hPutStr stderr "\tcompiled by GHC version "		>>
+	 hPutStr stderr booter_version				>>
+	 hPutStr stderr "\n")					>>
 
 	--------------------------  Reader  ----------------
-    show_pass "Reader"	>>
-    _scc_     "Reader"
+    show_pass "Parser"	>>
+    _scc_     "Parser"
     parseModule		>>= \ (mod_name, rdr_module) ->
 
+    dumpIfSet opt_D_dump_parsed "Parser" (ppr rdr_module) >>
+
     dumpIfSet opt_D_source_stats "Source Statistics"
 	(ppSourceStats False rdr_module)	 	>>
 
@@ -358,6 +363,11 @@ compiler_version =
   go ls@[x,y] = '.':ls
   go (x:xs)   = x:go xs
 
+booter_version
+ = case "\ 
+	\ __GLASGOW_HASKELL__" of
+    ' ':n:ns -> n:'.':ns
+    ' ':m    -> m
 \end{code}
 
 \begin{code}