diff options
| author | aarne <aarne@chalmers.se> | 2014-02-09 19:55:17 +0000 |
|---|---|---|
| committer | aarne <aarne@chalmers.se> | 2014-02-09 19:55:17 +0000 |
| commit | 6faaa795c5f7954ae66f55b29f822e30a4aae64b (patch) | |
| tree | 9c0aa9b5a3eab2e2cdc832d63c10e98667e16622 /src | |
| parent | 1746e3ad2aad6c1334cc1e5d8a051deb0f12cb36 (diff) | |
disabled ad hoc overloading, as it still causes mysterious errors. It is just a few lines in Rename.hs
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) |