GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-24 10:22:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

bugfix in PGF.Expr.apply

Browse Source
This commit is contained in:
krasimir
2009-07-05 16:07:34 +00:00
parent 279ff9a6d2
commit bb3040e2c4
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/PGF/Expr.hs
View File

@@ -290,13 +290,7 @@ eval funs env (EPi x e1 e2)= VClosure env (EPi x e1 e2)
apply :: Funs -> Env -> Expr -> [Value] -> Value apply :: Funs -> Env -> Expr -> [Value] -> Value
apply funs env e [] = eval funs env e apply funs env e [] = eval funs env e
apply funs env (EVar x) vs = case Map.lookup x env of apply funs env (EVar x) vs = case Map.lookup x env of
Just v -> case (v,vs) of Just v -> applyValue funs env v vs
(VApp f vs0 , vs) -> apply funs env (EVar f) (vs0++vs)
(VLit _ , vs) -> error "literal of function type"
(VMeta i vs0 , vs) -> VMeta i (vs0++vs)
(VGen i vs0 , vs) -> VGen i (vs0++vs)
(VSusp i vs0 k , vs) -> VSusp i (vs0++vs) k
(VClosure env (EAbs x e),v:vs) -> apply funs (Map.insert x v env) e vs
Nothing -> case Map.lookup x funs of Nothing -> case Map.lookup x funs of
Just (_,a,eqs) -> if a <= length vs Just (_,a,eqs) -> if a <= length vs
then let (as,vs') = splitAt a vs then let (as,vs') = splitAt a vs
@@ -308,6 +302,12 @@ apply funs env (EAbs x e) (v:vs) = apply funs (Map.insert x v env) e vs
apply funs env (EMeta k) vs = VMeta k vs apply funs env (EMeta k) vs = VMeta k vs
apply funs env (ELit l) vs = error "literal of function type" apply funs env (ELit l) vs = error "literal of function type"
applyValue funs env (VApp f vs0) vs = apply funs env (EVar f) (vs0++vs)
applyValue funs env (VLit _) vs = error "literal of function type"
applyValue funs env (VMeta i vs0) vs = VMeta i (vs0++vs)
applyValue funs env (VGen i vs0) vs = VGen i (vs0++vs)
applyValue funs env (VSusp i vs0 k) vs = VSusp i vs0 (\v -> applyValue funs env (k v) vs)
applyValue funs _ (VClosure env (EAbs x e)) (v:vs) = apply funs (Map.insert x v env) e vs
----------------------------------------------------- -----------------------------------------------------
-- Pattern matching -- Pattern matching