From 61c16f2eb2a042152a2b04f709d0cefe6e5a14df Mon Sep 17 00:00:00 2001
From: "kr.angelov" <kr.angelov@gmail.com>
Date: Tue, 15 Nov 2011 13:33:44 +0000
Subject: more structured format for errors and warnings from the compiler

---
 src/compiler/GFC.hs | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'src/compiler/GFC.hs')

diff --git a/src/compiler/GFC.hs b/src/compiler/GFC.hs
index 075b82f18..3fff0701c 100644
--- a/src/compiler/GFC.hs
+++ b/src/compiler/GFC.hs
@@ -24,15 +24,21 @@ import System.IO
 import Control.Exception
 
 
-mainGFC :: Options -> [FilePath] -> IOE ()
-mainGFC opts fs = 
-    case () of
-      _ | null fs -> fail $ "No input files."
-      _ | all (extensionIs ".cf")  fs -> compileCFFiles opts fs
-      _ | all (\f -> extensionIs ".gf" f || extensionIs ".gfo" f)  fs -> compileSourceFiles opts fs
-      _ | all (extensionIs ".pgf") fs -> unionPGFFiles opts fs
-      _ -> fail $ "Don't know what to do with these input files: " ++ unwords fs
- where extensionIs ext = (== ext) .  takeExtension
+mainGFC :: Options -> [FilePath] -> IO ()
+mainGFC opts fs = do
+  r <- appIOE (case () of
+                 _ | null fs -> fail $ "No input files."
+                 _ | all (extensionIs ".cf")  fs -> compileCFFiles opts fs
+                 _ | all (\f -> extensionIs ".gf" f || extensionIs ".gfo" f)  fs -> compileSourceFiles opts fs
+                 _ | all (extensionIs ".pgf") fs -> unionPGFFiles opts fs
+                 _ -> fail $ "Don't know what to do with these input files: " ++ unwords fs)
+  case r of
+    Ok x    -> return x
+    Bad msg -> die $ if flag optVerbosity opts == Normal
+                       then ('\n':msg)
+                       else msg
+ where
+   extensionIs ext = (== ext) .  takeExtension
 
 compileSourceFiles :: Options -> [FilePath] -> IOE ()
 compileSourceFiles opts fs = 
-- 
cgit v1.2.3