From c8898f51bfb320a0856bc6b464d9931dcc9b4fd8 Mon Sep 17 00:00:00 2001 From: aarne Date: Thu, 29 May 2008 22:32:58 +0000 Subject: [PATCH] sync with laptop version, irrelevant changes --- lib/resource-1.4/french/MorphoFre.gf | 2 +- src-3.0/GF/Compile/Compute.hs | 8 ++++---- 2 files changed, 5 insertions(+), 5 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 73ba202fa..1c68de71b 100644 --- a/src-3.0/GF/Compile/Compute.hs +++ b/src-3.0/GF/Compile/Compute.hs @@ -330,10 +330,10 @@ computeTermOpt rec gr = comput True where ---- return $ V ty (map snd cs') return $ T i cs' V ty cs -> do - -- 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' + 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' cs' T i cs -> do pty0 <- getTableType i