From 3d973adb33161aceb5fc0d6fd6744280fced0c70 Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Thu, 17 Nov 2011 22:11:56 +0000 Subject: [PATCH] rebuildModule should do location globalization too --- src/compiler/GF/Compile/Update.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/GF/Compile/Update.hs b/src/compiler/GF/Compile/Update.hs index 6a6195910..252563a72 100644 --- a/src/compiler/GF/Compile/Update.hs +++ b/src/compiler/GF/Compile/Update.hs @@ -114,7 +114,7 @@ rebuildModule gr mo@(i,mi@(ModInfo mt stat fs_ me mw ops_ med_ msrc_ env_ js_)) [i | i <- is, notElem i infs] unless (stat' == MSComplete || stat == MSIncomplete) (checkError (text "module" <+> ppIdent i <+> text "remains incomplete")) - ModInfo mt0 _ fs me' _ ops0 _ _ _ js <- checkErr $ lookupModule gr ext + ModInfo mt0 _ fs me' _ ops0 _ fpath _ js <- checkErr $ lookupModule gr ext let ops1 = nub $ ops_ ++ -- N.B. js has been name-resolved already [OQualif i j | (i,j) <- ops] ++ @@ -124,7 +124,7 @@ rebuildModule gr mo@(i,mi@(ModInfo mt stat fs_ me mw ops_ med_ msrc_ env_ js_)) --- check if me is incomplete let fs1 = fs `addOptions` fs_ -- new flags have priority - let js0 = [ci | ci@(c,_) <- tree2list js, isInherited incl c] + let js0 = [(c,globalizeLoc fpath j) | (c,j) <- tree2list js, isInherited incl c] let js1 = buildTree (tree2list js_ ++ js0) let med1= nub (ext : infs ++ insts ++ med_) return $ ModInfo mt0 stat' fs1 me Nothing ops1 med1 msrc_ env_ js1