Fix critical list evaluation bug and REPL updates

src/REPL.hs

@@ -8,7 +8,8 @@ import Research
 
 import Control.Exception         (SomeException, catch)
 import Control.Monad.IO.Class    (liftIO)
-import Data.List                 (intercalate)
+import Data.Char                 (isSpace)
+import Data.List                 (dropWhile, dropWhileEnd, intercalate)
 import System.Console.Haskeline
 
 import qualified Data.Map as Map
@@ -20,23 +21,27 @@ repl env = runInputT defaultSettings (loop env)
     loop env = do
       minput <- getInputLine "tricu < "
       case minput of
-        Nothing -> outputStrLn "Goodbye!"
-        Just ":_exit" -> outputStrLn "Goodbye!"
-        Just ":_load" -> do
-          path <- getInputLine "File path to load < "
-          case path of
-            Nothing -> do
-              outputStrLn "No input received; stopping import."
-              loop env
-            Just path -> do
-              loadedEnv <- liftIO $ evaluateFile path
-              loop $ Map.union loadedEnv env
-        Just "" -> do
-          outputStrLn ""
-          loop env
-        Just input -> do
-          newEnv <- liftIO $ (processInput env input `catch` errorHandler env)
-          loop newEnv
+        Nothing -> outputStrLn "Exiting tricu"
+        Just s -> case strip s of 
+          "!exit" -> outputStrLn "Exiting tricu"
+          "!load" -> do
+            path <- getInputLine "File path to load < "
+            case path of
+              Nothing -> do
+                outputStrLn "No input received; stopping import."
+                loop env
+              Just path -> do
+                loadedEnv <- liftIO $ evaluateFileWithContext env (strip path)
+                loop $ Map.delete "__result" (Map.union loadedEnv env)
+          "" -> do
+            outputStrLn ""
+            loop env
+          input -> do
+            case (take 2 input) of 
+              "--" -> loop env
+              _ -> do
+                newEnv <- liftIO $ (processInput env input `catch` errorHandler env)
+                loop newEnv
   
     processInput :: Env -> String -> IO Env
     processInput env input = do
@@ -44,8 +49,7 @@ repl env = runInputT defaultSettings (loop env)
           newEnv = evalTricu env asts
       case Map.lookup "__result" newEnv of
         Just r -> do
-          putStrLn $ "tricu > " ++ show r
-          putStrLn $ "READ -: \"" ++ decodeResult r ++ "\""
+          putStrLn $ "tricu > " ++ decodeResult r
         Nothing -> return ()
       return newEnv
     
@@ -53,12 +57,13 @@ repl env = runInputT defaultSettings (loop env)
     errorHandler env e = do
       putStrLn $ "Error: " ++ show e
       return env
+    
+    strip :: String -> String
+    strip = dropWhileEnd isSpace . dropWhile isSpace
 
 decodeResult :: T -> String
 decodeResult tc = case toNumber tc of
   Right num -> show num
   Left _ -> case toString tc of
-    Right str -> str
-    Left _ -> case toList tc of
-      Right list -> "[" ++ intercalate ", " (map decodeResult list) ++ "]"
-      Left _ -> ""
+    Right str -> "\"" ++ str ++ "\""
+    Left _ -> formatResult TreeCalculus tc