From ff0c0085cf9a3f2b02f31fdb7472b36547f055f9 Mon Sep 17 00:00:00 2001
From: krasimir <krasimir@chalmers.se>
Date: Sat, 31 Jan 2009 10:49:01 +0000
Subject: bug fix in the module dependencies checker

---
 src/GF/Grammar/Binary.hs  | 10 +++++-----
 src/GF/Grammar/Printer.hs |  6 ++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/GF/Grammar')

diff --git a/src/GF/Grammar/Binary.hs b/src/GF/Grammar/Binary.hs
index cb2690425..65fbfcd89 100644
--- a/src/GF/Grammar/Binary.hs
+++ b/src/GF/Grammar/Binary.hs
@@ -31,9 +31,9 @@ instance (Ord i, Binary i, Binary a) => Binary (MGrammar i a) where
   get               = fmap MGrammar get
 
 instance (Ord i, Binary i, Binary a) => Binary (ModInfo i a) where
-  put mi = do put (mtype mi,mstatus mi,flags mi,extend mi,mwith mi,opens mi,jments mi,positions mi)
-  get    = do (mtype,mstatus,flags,extend,mwith,opens,jments,positions) <- get
-              return (ModInfo mtype mstatus flags extend mwith opens jments positions)
+  put mi = do put (mtype mi,mstatus mi,flags mi,extend mi,mwith mi,opens mi,mexdeps mi,jments mi,positions mi)
+  get    = do (mtype,mstatus,flags,extend,mwith,opens,med,jments,positions) <- get
+              return (ModInfo mtype mstatus flags extend mwith opens med jments positions)
 
 instance (Binary i) => Binary (ModuleType i) where
   put MTAbstract       = putWord8 0
@@ -264,5 +264,5 @@ instance Binary MetaSymb where
 
 decodeModHeader :: FilePath -> IO SourceModule
 decodeModHeader fpath = do
-  (m,mtype,mstatus,flags,extend,mwith,opens) <- decodeFile fpath
-  return (m,ModInfo mtype mstatus flags extend mwith opens Map.empty Map.empty)
+  (m,mtype,mstatus,flags,extend,mwith,opens,med) <- decodeFile fpath
+  return (m,ModInfo mtype mstatus flags extend mwith opens med Map.empty Map.empty)
diff --git a/src/GF/Grammar/Printer.hs b/src/GF/Grammar/Printer.hs
index 7145ff33b..ef4508717 100644
--- a/src/GF/Grammar/Printer.hs
+++ b/src/GF/Grammar/Printer.hs
@@ -25,7 +25,7 @@ import Data.Maybe (maybe)
 import Data.List  (intersperse)
 
 ppModule :: SourceModule -> Doc
-ppModule (mn, ModInfo mtype mstat opts exts with opens jments _) =
+ppModule (mn, ModInfo mtype mstat opts exts with opens _ jments _) =
     (let defs = tree2list jments
      in if null defs
           then hdr
@@ -58,7 +58,7 @@ ppModule (mn, ModInfo mtype mstat opts exts with opens jments _) =
       ppExtends (id,MIOnly   incs) = ppIdent id              <+> brackets (commaPunct ppIdent incs)
       ppExtends (id,MIExcept incs) = ppIdent id <+> char '-' <+> brackets (commaPunct ppIdent incs)
       
-      ppWith (id,ext,opens) = ppExtends (id,ext) <+> text "with" <+> commaPunct ppOpenSpec opens
+      ppWith (id,ext,opens) = ppExtends (id,ext) <+> text "with" <+> commaPunct ppInstSpec opens
 
 ppOptions opts = 
   text "flags" $$
@@ -210,6 +210,8 @@ ppLabel = ppIdent . label2ident
 ppOpenSpec (OSimple id)   = ppIdent id
 ppOpenSpec (OQualif id n) = parens (ppIdent id <+> equals <+> ppIdent n)
 
+ppInstSpec (id,n) = parens (ppIdent id <+> equals <+> ppIdent n)
+
 ppLocDef (id, (mbt, e)) =
   ppIdent id <+>
   (case mbt of {Just t -> colon  <+> ppTerm 0 t; Nothing -> empty} <+> equals <+> ppTerm 0 e) <+> semi
-- 
cgit v1.2.3