runtime: add CEK Evaluator

- on track for #108
gelisam · Jan 14, 2024 · ea1aea6 · ea1aea6
1 parent 9cc4dab
commit ea1aea6
Show file tree

Hide file tree

Showing 11 changed files with 929 additions and 379 deletions.
diff --git a/klister.cabal b/klister.cabal
@@ -61,6 +61,7 @@ library
       Core.Builder
       Datatype
       Env
+      CEKEvaluator
       Evaluator
       Expander
       Expander.DeclScope

diff --git a/repl/Main.hs b/repl/Main.hs
@@ -4,11 +4,9 @@
 {-# LANGUAGE ViewPatterns #-}
 module Main where
 
-import Control.Exception
+import Control.Exception hiding (evaluate)
 import Control.Lens hiding (argument)
 import Control.Monad
-import Control.Monad.Trans.Reader
-import Control.Monad.Trans.Except
 
 import Data.Foldable (for_)
 import Data.IORef
@@ -22,7 +20,7 @@ import System.Exit (exitFailure, exitSuccess)
 import System.IO
 import System.Directory
 
-import Evaluator
+import CEKEvaluator
 import Expander
 import ModuleName
 import Parser
@@ -148,7 +146,6 @@ repl ctx startWorld = do
                         prettyPrint expr
                         putStrLn ""
                         currentWorld <- readIORef theWorld
-                        runExceptT (runReaderT (runEval (eval expr)) (phaseEnv runtime currentWorld)) >>=
-                          \case
-                            Left evalErr -> print evalErr
-                            Right val -> prettyPrintLn val
+                        prettyPrintLn $ evaluateIn (phaseEnv runtime currentWorld) expr
+                            -- Left evalErr -> print evalErr
+                            -- Right val -> prettyPrintLn val