From c212633be8264ce724ad2304861ee4cf0111b70b Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Mon, 18 Jun 2007 21:21:13 +0000
Subject: fixed the mysterious "file..gfc" error

---
 src/GF/Compile/Rename.hs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/GF/Compile/Rename.hs')

diff --git a/src/GF/Compile/Rename.hs b/src/GF/Compile/Rename.hs
index 52fb44211..0a148f02f 100644
--- a/src/GF/Compile/Rename.hs
+++ b/src/GF/Compile/Rename.hs
@@ -103,8 +103,9 @@ renameIdentTerm env@(act,imps) t =
         []  -> alt c ("constant not found:" +++ prt c) 
         fs -> case nub [f c | f <- fs]  of
           [tr] -> return tr
-          ts@(tr:_) -> 
-            Bad $ "conflicting imports:" +++ unwords (map prt ts) 
+          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) 
 
 
 --- | would it make sense to optimize this by inlining?
-- 
cgit v1.2.3