From 3fd1f5652a3af22e90a040a821d244a91a3553a0 Mon Sep 17 00:00:00 2001 From: bjorn Date: Wed, 28 May 2008 15:10:36 +0000 Subject: Switch to new options handling. This changes lots of stuff, let me know if it broke anything. Comments: - We use a local hacked version of GetOpt that allows long forms of commands to start with a single dash. This breaks other parts of GetOpt. For example, arguments to short options now require a =, and does not allo pace after the option character. - The new command parsing is currently only used for the program command line, pragmas and the arguments for the 'i' shell command. - I made a quick hack for the options for showTerm, which currently makes it impossible to use the print style flags for cc. This will be replaced by a facility for parsing command-specific options. - The verbosity handling is broken in some places. I will fix that in a later patch. --- src-3.0/GF.hs | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) (limited to 'src-3.0/GF.hs') diff --git a/src-3.0/GF.hs b/src-3.0/GF.hs index 038d034d6..b3c971096 100644 --- a/src-3.0/GF.hs +++ b/src-3.0/GF.hs @@ -2,12 +2,30 @@ module Main where import GFC import GFI +import GF.Data.ErrM +import GF.Infra.Option +import GF.Infra.UseIO +import Paths_gf +import Data.Version import System.Environment (getArgs) +import System.Exit +import System.IO main :: IO () -main = do - args <- getArgs - case args of - "--batch":args -> mainGFC args - _ -> mainGFI args +main = + do args <- getArgs + case parseOptions args of + Ok (opts,files) -> mainOpts opts files + Bad err -> do hPutStrLn stderr err + hPutStrLn stderr "You may want to try --help." + exitFailure + +mainOpts :: Options -> [FilePath] -> IO () +mainOpts opts files = + case flag optMode opts of + ModeVersion -> putStrLn $ "Grammatical Framework (GF) version " ++ showVersion version + ModeHelp -> putStrLn helpMessage + ModeInteractive -> mainGFI opts files + ModeCompiler -> dieIOE (mainGFC opts files) + -- cgit v1.2.3