diff options
Diffstat (limited to 'lambda-calcul/haskell/src/Minilang/Lambda.hs')
| -rw-r--r-- | lambda-calcul/haskell/src/Minilang/Lambda.hs | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/lambda-calcul/haskell/src/Minilang/Lambda.hs b/lambda-calcul/haskell/src/Minilang/Lambda.hs index 9d0f3cf..d2df56f 100644 --- a/lambda-calcul/haskell/src/Minilang/Lambda.hs +++ b/lambda-calcul/haskell/src/Minilang/Lambda.hs @@ -4,12 +4,14 @@ import Minilang.Lambda.DeBruijn (eval, fromDeBruijn, toDeBruijn) import Minilang.Lambda.Eval (Env, Term) import Minilang.Lambda.Infer (Context, TypeError, infer) import Minilang.Lambda.Parser (AST, desugar) -import Minilang.Lambda.Unify (Type) +import Minilang.Lambda.Unify (Type (..)) +import Minilang.REPL.Types (Language (..)) -- | Top-level evaluator -- Load an AST into given `Env` and `Context`, returning an extended -- `Env` and `Context` with declarations bound loadProgram :: + Language -> AST -> Env -> Context -> @@ -17,9 +19,14 @@ loadProgram :: -- loadProgram (Let d r) ρ γ = do -- (ρ', γ') <- checkD 0 d ρ γ -- loadProgram r ρ' γ' -loadProgram expr env context = +loadProgram language expr env context = let term = desugar expr - in case infer term of - Left typeError -> Left typeError - Right typ -> - Right (fromDeBruijn $ eval (toDeBruijn term), typ, env, context) + v = fromDeBruijn $ eval (toDeBruijn term) + in case language of + Typed -> + case infer term of + Left typeError -> Left typeError + Right typ -> + Right (v, typ, env, context) + Untyped -> + Right (v, TyVar "<?>", env, context) |