Changeset 4393 for src/Pugs/Prim/Eval.hs

Timestamp:

06/05/05 10:22:56 (4 years ago)

Author:

gaal

svk:copy_cache_prev:

6052

Message:

"critical" evals (use, require, prelude) now raise exceptions on comilation errors (autrijus)++
TODO: figure out why error coordinates for Prelude are wrong;
Have the build process sanity-test the Prelude

Files:

• src/Pugs/Prim/Eval.hs (modified) (2 diffs)

src/Pugs/Prim/Eval.hs

@@ -12 +12 @@
 import Pugs.Embed
 import Pugs.Internals
+import Pugs.Pretty
 
 data EvalError = EvalErrorFatal
@@ -76 +77 @@
     errSV <- findSymRef "$!" glob
     case val of
-        VError str _ -> do
+        err@(VError str _) -> do
             writeRef errSV (VStr str)
             when (evalError style == EvalErrorFatal) $ do
                 --trace ("fatal error" ++ str) $ return ()
                 --FIXME: this should be made to throw an exception.
-                fail str
+                liftIO $ fail $ pretty err
             retEmpty
         _ -> do