1 files changed, 23 insertions, 5 deletions
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)
+