fixup: rename evaluator

klister.cabal

@@ -61,7 +61,7 @@ library
       Core.Builder
       Datatype
       Env
-      CEKEvaluator
+      Evaluator
       Expander
       Expander.DeclScope
       Expander.Error

repl/Main.hs

@@ -20,7 +20,7 @@ import System.Exit (exitFailure, exitSuccess)
 import System.IO
 import System.Directory
 
-import CEKEvaluator
+import Evaluator
 import Expander
 import ModuleName
 import Parser

src/CEKEvaluator.hs → src/Evaluator.hs

@@ -28,7 +28,7 @@ The bird's eye view:
 
 -}
 
-module CEKEvaluator
+module Evaluator
   ( EvalError (..)
   , EvalResult (..)
   , TypeError (..)
@@ -58,23 +58,6 @@ import Syntax.SrcLoc
 import Type
 import Value
 
--- -----------------------------------------------------------------------------
--- Top level API
-
-evaluate :: Core -> Value
-evaluate =  evaluateIn mempty
-
-evaluateIn :: VEnv -> Core -> Value
-evaluateIn e = yield . until final step . start e . unCore
-  where
-    yield (Up v _ Halt) = v
-    yield _                 = error "evaluate: completed impossibly"
-
-evaluateWithExtendedEnv :: VEnv -> [(Ident, Var, Value)] -> Core -> Value
-evaluateWithExtendedEnv env exts = evaluateIn (inserter exts)
-  where
-    inserter = foldl' (\acc (n,x,v) -> Env.insert x n v acc) env
-
 -- -----------------------------------------------------------------------------
 -- Interpreter Data Types
 
@@ -448,6 +431,9 @@ final _                     = False
 start :: VEnv -> CoreF TypePattern ConstructorPattern Core -> EState
 start e c = Down c e Halt
 
+yield :: EState -> Value
+yield (Up v _ Halt) = v
+yield _             = error "evaluate: completed impossibly"
 
 extend :: Ident -> Var -> Value -> VEnv -> VEnv
 extend i var = Env.insert var i
@@ -552,3 +538,16 @@ doDataCase loc v0 ((pat, rhs) : ps) env kont =
     match fk sk ((PatternVar n x, tgt) : more) =
       match fk (sk . extend n x tgt) more
 
+-- -----------------------------------------------------------------------------
+-- Top level API
+
+evaluate :: Core -> Value
+evaluate =  evaluateIn mempty
+
+evaluateIn :: VEnv -> Core -> Value
+evaluateIn e = yield . until final step . start e . unCore
+
+evaluateWithExtendedEnv :: VEnv -> [(Ident, Var, Value)] -> Core -> Value
+evaluateWithExtendedEnv env exts = evaluateIn (inserter exts)
+  where
+    inserter = foldl' (\acc (n,x,v) -> Env.insert x n v acc) env

src/Expander.hs

@@ -66,7 +66,7 @@ import Binding
 import Core
 import Datatype
 import qualified Env
-import CEKEvaluator
+import Evaluator
 import qualified Expander.Primitives as Prims
 import Expander.DeclScope
 import Expander.Syntax

src/Expander/Error.hs

@@ -19,7 +19,7 @@ import Data.Foldable
 
 import Core
 import Datatype
-import CEKEvaluator
+import Evaluator
 import Expander.Task
 import Kind
 import KlisterPath

src/Expander/Monad.hs

@@ -177,7 +177,7 @@ import Control.Lens.IORef
 import Core
 import Datatype
 import Env
-import CEKEvaluator
+import Evaluator
 import Expander.DeclScope
 import Expander.Error
 import Expander.Task

src/Pretty.hs

@@ -26,7 +26,7 @@ import Binding.Info
 import Core
 import Datatype
 import Env
-import CEKEvaluator (EvalResult(..), EvalError(..), TypeError(..))
+import Evaluator (EvalResult(..), EvalError(..), TypeError(..))
 import Kind
 import Module
 import ModuleName

src/World.hs

@@ -13,7 +13,7 @@ import Data.Maybe (fromMaybe)
 import Core (MacroVar, Var)
 import Datatype
 import Env
-import CEKEvaluator (EvalResult)
+import Evaluator (EvalResult)
 import Module
 import ModuleName
 import Phase

tests/Golden.hs

@@ -25,7 +25,7 @@ import System.IO (Handle, openFile, hClose, IOMode(WriteMode))
 import System.IO.Silently (hCapture_)
 import System.Directory
 
-import CEKEvaluator
+import Evaluator
 import Expander
 import Expander.Monad
 import ModuleName

tests/Test.hs

@@ -34,7 +34,7 @@ import qualified Hedgehog.Internal.Property as Prop (forAllT)
 import Alpha
 import Core
 import Core.Builder
-import CEKEvaluator (EvalResult(..))
+import Evaluator (EvalResult(..))
 import Expander
 import Expander.Monad
 import Module