msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

add missing cases in vapply in the partial evaluator

Browse Source
This commit is contained in:
krasimir
2016-03-03 06:59:50 +00:00
parent 508bc346e5
commit 4ba9712f16
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/GF/Compile/Compute/ConcreteNew.hs
View File

@@ -416,7 +416,6 @@ apply' env t vs =
return $ \ svs -> vapply (gloc env) r (map ($svs) vs) return $ \ svs -> vapply (gloc env) r (map ($svs) vs)
-} -}
App t1 t2 -> apply' env t1 . (:vs) =<< value env t2 App t1 t2 -> apply' env t1 . (:vs) =<< value env t2
Meta i -> return $ \ svs -> VMeta i (zip (local env) svs) (map ($svs) vs)
_ -> do fv <- value env t _ -> do fv <- value env t
return $ \ svs -> vapply (gloc env) (fv svs) (map ($svs) vs) return $ \ svs -> vapply (gloc env) (fv svs) (map ($svs) vs)
@@ -437,6 +436,8 @@ vapply loc v vs =
VS (VV t pvs fs) s -> VS (VV t pvs [vapply loc f vs|f<-fs]) s VS (VV t pvs fs) s -> VS (VV t pvs [vapply loc f vs|f<-fs]) s
VFV fs -> vfv [vapply loc f vs|f<-fs] VFV fs -> vfv [vapply loc f vs|f<-fs]
VCApp f vs0 -> VCApp f (vs0++vs) VCApp f vs0 -> VCApp f (vs0++vs)
VMeta i env vs0 -> VMeta i env (vs0++vs)
VGen i vs0 -> VGen i (vs0++vs)
v -> bug $ "vapply "++show v++" "++show vs v -> bug $ "vapply "++show v++" "++show vs
vbeta loc bt f (v:vs) = vbeta loc bt f (v:vs) =