summaryrefslogtreecommitdiff
path: root/src-3.0/GF/Compile/Rename.hs
diff options
context:
space:
mode:
authoraarne <aarne@cs.chalmers.se>2008-05-31 16:30:36 +0000
committeraarne <aarne@cs.chalmers.se>2008-05-31 16:30:36 +0000
commitbd7d0c7c5e62b1c008be9ce0d85e8d0592fec0eb (patch)
tree5ba9b80e706791ed37e1e000b2bf6ea8c1e802bc /src-3.0/GF/Compile/Rename.hs
parent9229c157642c3503d365f42fe5ecac414958ab9b (diff)
printing line numbers in rename and check-grammar error messages
Diffstat (limited to 'src-3.0/GF/Compile/Rename.hs')
-rw-r--r--src-3.0/GF/Compile/Rename.hs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src-3.0/GF/Compile/Rename.hs b/src-3.0/GF/Compile/Rename.hs
index 83bb97d50..28055b85e 100644
--- a/src-3.0/GF/Compile/Rename.hs
+++ b/src-3.0/GF/Compile/Rename.hs
@@ -58,7 +58,7 @@ renameModule ms (name,mod) = errIn ("renaming module" +++ prt name) $ case mod o
ModMod mo -> do
let js1 = jments mo
status <- buildStatus (MGrammar ms) name mod
- js2 <- mapsErrTree (renameInfo status) js1
+ js2 <- mapsErrTree (renameInfo mo status) js1
let mod2 = ModMod $ mo {opens = map forceQualif (opens mo), jments = js2}
return $ (name,mod2) : ms
@@ -160,8 +160,9 @@ forceQualif o = case o of
OSimple q i -> OQualif q i i
OQualif q _ i -> OQualif q i i
-renameInfo :: Status -> (Ident,Info) -> Err (Ident,Info)
-renameInfo status (i,info) = errIn ("renaming definition of" +++ prt i) $
+renameInfo :: Module Ident Info -> Status -> (Ident,Info) -> Err (Ident,Info)
+renameInfo mo status (i,info) = errIn
+ ("renaming definition of" +++ prt i +++ showPosition mo i) $
liftM ((,) i) $ case info of
AbsCat pco pfs -> liftM2 AbsCat (renPerh (renameContext status) pco)
(renPerh (mapM rent) pfs)