[Gtk2hs-commit] gtk2hs/tools/c2hs/toplevel Main.hs,1.4,1.5

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/tools/c2hs/toplevel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23077/tools/c2hs/toplevel

Modified Files:
	Main.hs 
Log Message:
Merge all changes from branch-0-9-8 into the MAIN branch.


Index: Main.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/c2hs/toplevel/Main.hs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Main.hs	31 May 2005 18:17:37 -0000	1.4
+++ Main.hs	22 Jun 2005 16:01:22 -0000	1.5
@@ -206,7 +206,6 @@
 	  | Output  String      -- file where the generated file should go
 	  | OutDir  String      -- directory where generates files should go
 	  | PreComp String      -- write or read a precompiled header
-          | OldParser           -- use the old lexer/parser
 	  | Version	        -- print version information on stderr
 	  | Error   String      -- error occured during processing of options
 	  deriving Eq
@@ -215,7 +214,6 @@
 	      | GenBind	      -- trace `GenBind'
 	      | CTrav	      -- trace `CTrav'
 	      | CHS	      -- dump binding file
-              | CAST          -- dump the C AST
 	      deriving Eq
 
 -- option description suitable for `GetOpt'
@@ -258,10 +256,6 @@
          ["precomp"]
          (ReqArg PreComp "FILE")
          "generate or read precompiled header file FILE",
-  Option []
-         ["old-parser"]
-         (NoArg OldParser)
-         "use the old C lexer/parser",
   Option ['v'] 
 	 ["version"] 
 	 (NoArg Version) 
@@ -274,7 +268,6 @@
 dumpArg "genbind"  = Dump GenBind
 dumpArg "ctrav"    = Dump CTrav
 dumpArg "chs"      = Dump CHS
-dumpArg "ast"      = Dump CAST
 dumpArg _          = Error "Illegal dump type."
 
 -- main process (set up base configuration, analyse command line, and execute
@@ -414,7 +407,6 @@
 processOpt (Output  fname  )  = setOutput  fname
 processOpt (OutDir  fname  )  = setOutDir  fname
 processOpt (PreComp fname  )  = setPreComp fname
-processOpt (OldParser      )  = setOldParser
 processOpt Version            = do
 			          (version, _, _) <- getId 
 			          putStrCIO (version ++ "\n")
@@ -484,7 +476,6 @@
 setDump GenBind  = setTraces $ \ts -> ts {traceGenBindSW = True}
 setDump CTrav    = setTraces $ \ts -> ts {traceCTravSW   = True}
 setDump CHS      = setTraces $ \ts -> ts {dumpCHSSW	 = True}
-setDump CAST     = setTraces $ \ts -> ts {dumpCASTSW	 = True}
 
 -- set flag to keep the pre-processed header file
 --
@@ -535,11 +526,6 @@
 setPreComp      :: FilePath -> CST s ()
 setPreComp fname = setSwitch $ \sb -> sb { preCompSB = Just fname }
 
--- set flag to use the old lexer/parser
---
-setOldParser :: CST s ()
-setOldParser  = setSwitch $ \sb -> sb {oldParsSB = True}
-
 
 -- compilation process
 -- -------------------