From cf00c8bd0b631e8fc611c86234a9808a1873df50 Mon Sep 17 00:00:00 2001 From: hallgren Date: Fri, 16 Nov 2012 13:47:10 +0000 Subject: [PATCH] new-comp: rewrite f (x|y) into (f x|f y) With this change, all languages in molto/mgl/mixture except German and Polish can be compiled. --- src/compiler/GF/Compile/Compute/ConcreteNew.hs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/compiler/GF/Compile/Compute/ConcreteNew.hs b/src/compiler/GF/Compile/Compute/ConcreteNew.hs index 49752aebb..7380cccad 100644 --- a/src/compiler/GF/Compile/Compute/ConcreteNew.hs +++ b/src/compiler/GF/Compile/Compute/ConcreteNew.hs @@ -265,8 +265,12 @@ vapply v vs = vbeta bt f (v:vs) = case (bt,v) of - (Implicit,VImplArg v) -> vapply (f v) vs - (Explicit, v) -> vapply (f v) vs + (Implicit,VImplArg v) -> ap v + (Explicit, v) -> ap v + where + ap (VFV avs) = VFV [vapply (f v) vs|v<-avs] + ap v = vapply (f v) vs + {- beta env b x t (v:vs) = case (b,v) of