diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/GF/Compile/Rename.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler/GF/Compile/Rename.hs b/src/compiler/GF/Compile/Rename.hs index e2ee5934b..2974a1a36 100644 --- a/src/compiler/GF/Compile/Rename.hs +++ b/src/compiler/GF/Compile/Rename.hs @@ -101,15 +101,16 @@ renameIdentTerm' env@(act,imps) t0 = text "given" <+> fsep (punctuate comma (map (ppIdent . fst) qualifs))) fs -> case nub [f c | f <- fs] of [tr] -> return tr +{- ts -> return $ AdHocOverload ts -- name conflicts resolved as overloading in TypeCheck.RConcrete AR 31/1/2014 -- the old definition is below and still presupposed in TypeCheck.Concrete -{- +-} ts@(t:_) -> do checkWarn (text "atomic term" <+> ppTerm Qualified 0 t0 $$ text "conflict" <+> hsep (punctuate comma (map (ppTerm Qualified 0) ts)) $$ text "given" <+> fsep (punctuate comma (map (ppIdent . fst) qualifs))) return t --} + -- a warning will be generated in CheckGrammar, and the head returned -- in next V: -- Bad $ "conflicting imports:" +++ unwords (map prt ts) |