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/Compile/ReadFiles.hs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/GF/Compile/ReadFiles.hs')

diff --git a/src/GF/Compile/ReadFiles.hs b/src/GF/Compile/ReadFiles.hs
index de61d5e42..f8b6f9e51 100644
--- a/src/GF/Compile/ReadFiles.hs
+++ b/src/GF/Compile/ReadFiles.hs
@@ -179,6 +179,7 @@ importsOfModule (m,mi) = (modName m,depModInfo mi [])
       depModType (mtype mi)  .
       depExtends (extend mi) .
       depWith    (mwith mi)  .
+      depExDeps  (mexdeps mi).
       depOpens   (opens mi)
 
     depModType (MTAbstract)       xs = xs
@@ -190,16 +191,22 @@ importsOfModule (m,mi) = (modName m,depModInfo mi [])
 
     depExtends es xs = foldr depInclude xs es
 
-    depWith (Just (m,_,os)) xs = modName m : depOpens os xs
+    depWith (Just (m,_,is)) xs = modName m : depInsts is xs
     depWith Nothing         xs = xs
 
+    depExDeps eds xs = map modName eds ++ xs
+
     depOpens os xs = foldr depOpen xs os
 
+    depInsts is xs = foldr depInst xs is
+
     depInclude (m,_) xs = modName m:xs
 
     depOpen (OSimple n  ) xs = modName n:xs
     depOpen (OQualif _ n) xs = modName n:xs
 
+    depInst (m,n) xs = modName m:modName n:xs
+
     modName = prIdent
 
 -- | options can be passed to the compiler by comments in @--#@, in the main file
-- 
cgit v1.2.3