From 5f731b3ad6f19cdcc3b160b63b9b0531c5739ad0 Mon Sep 17 00:00:00 2001 From: aarne Date: Fri, 7 Mar 2008 14:47:10 +0000 Subject: [PATCH] new Finnish paradigms integrated --- src/GF/Compile/Rename.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/GF/Compile/Rename.hs b/src/GF/Compile/Rename.hs index bc5925d22..2ac992fd2 100644 --- a/src/GF/Compile/Rename.hs +++ b/src/GF/Compile/Rename.hs @@ -103,7 +103,8 @@ renameIdentTerm env@(act,imps) t = [] -> alt c ("constant not found:" +++ prt c) fs -> case nub [f c | f <- fs] of [tr] -> return tr - ts -> return $ Strs $ (cnIC "#conflict") : reverse ts + ts@(t:_) -> trace ("WARNING: conflict" +++ unwords (map prt ts)) (return t) +---- ts -> return $ Strs $ (cnIC "#conflict") : reverse ts -- a warning will be generated in CheckGrammar, and the head returned -- in next V: -- Bad $ "conflicting imports:" +++ unwords (map prt ts)