From 10264a1d133c6a2e183f250a0c6c87f4667aa9d3 Mon Sep 17 00:00:00 2001 From: aarne Date: Thu, 29 May 2008 08:23:23 +0000 Subject: [PATCH] type computed in table T [...] --- lib/resource-1.4/french/MorphoFre.gf | 2 +- src-3.0/GF/Compile/Compute.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/resource-1.4/french/MorphoFre.gf b/lib/resource-1.4/french/MorphoFre.gf index a27c1ebf4..5464c8875 100644 --- a/lib/resource-1.4/french/MorphoFre.gf +++ b/lib/resource-1.4/french/MorphoFre.gf @@ -11,7 +11,7 @@ resource MorphoFre = CommonRomance, ResFre ** open PhonoFre, Prelude, Predef in { -flags optimize=all ; +flags optimize=noexpand ; --2 Front vowels -- diff --git a/src-3.0/GF/Compile/Compute.hs b/src-3.0/GF/Compile/Compute.hs index a2550201c..e42efba8c 100644 --- a/src-3.0/GF/Compile/Compute.hs +++ b/src-3.0/GF/Compile/Compute.hs @@ -386,10 +386,10 @@ computeTermOpt rec gr = comput True where ---- return $ V ty (map snd cs') return $ T i cs' V ty cs -> do + ty' <- comp g ty -- if there are no variables, don't even go inside cs' <- if (null g) then return cs else mapM (comp g) cs ----- return $ V ty (map snd cs') - return $ V ty cs' + return $ V ty' cs' T i cs -> do pty0 <- getTableType i