Changeset 8820 for src/Pugs.hs

Timestamp:

01/28/06 02:09:07 (3 years ago)

Author:

audreyt

Message:

* First cut a irb-style line continuation in the interactive

Pugs shell, by waiting for more lines whenever we encounter a
parsefail. Suggested by jvoorhis.

Files:

• src/Pugs.hs (modified) (3 diffs)

src/Pugs.hs

@@ -313 +313 @@
 doRunSingle menv opts prog = (`catch` handler) $ do
     exp     <- makeProper =<< parse
+    if exp == Noop then return () else do
     env     <- theEnv
     rv      <- runImperatively env (evaluate exp)
@@ -344 +345 @@
         else print
     makeProper exp = case exp of
-        Val err@(VError _ _) -> fail $ pretty err
+        Val err@(VError (VStr msg) _)
+            | runOptShowPretty opts -> do
+--          , "\nunexpected end of input" `isPrefixOf` msg -> do
+            cont <- readline "....> "
+            case cont of
+                Just line   -> do
+                    doRunSingle menv opts (prog ++ ('\n':line))
+                    return Noop
+                _           -> fail $ pretty err
+        Val err@VError{} -> fail $ pretty err
         _ | runOptSeparately opts -> return exp
         _ -> return $ makeDumpEnv exp
@@ -353 +363 @@
     makeDumpEnv (Sym x y exp)     = Sym x y   $ makeDumpEnv exp
     makeDumpEnv exp = Stmts exp (Syn "env" [])
-    handler err = if not (isUserError err) then ioError err else do
+    handler err | isUserError err = do
         putStrLn "Internal error while running expression:"
         putStrLn $ ioeGetErrorString err
+                | otherwise = ioError err
 
 runImperatively :: TVar Env -> Eval Val -> IO Val