summaryrefslogtreecommitdiff
path: root/src/GF/Compile
diff options
context:
space:
mode:
authoraarne <aarne@cs.chalmers.se>2008-03-07 14:47:10 +0000
committeraarne <aarne@cs.chalmers.se>2008-03-07 14:47:10 +0000
commit5f731b3ad6f19cdcc3b160b63b9b0531c5739ad0 (patch)
treefb271d9cf6782c3bf3ada36f4b451f62dfccee51 /src/GF/Compile
parent27508654c01c5ebad3c495629ccbd49c067429ab (diff)
new Finnish paradigms integrated
Diffstat (limited to 'src/GF/Compile')
-rw-r--r--src/GF/Compile/Rename.hs3
1 files changed, 2 insertions, 1 deletions
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)