summaryrefslogtreecommitdiff
path: root/src/GF/Devel/Compile/Extend.hs
diff options
context:
space:
mode:
authoraarne <aarne@cs.chalmers.se>2007-12-06 15:50:54 +0000
committeraarne <aarne@cs.chalmers.se>2007-12-06 15:50:54 +0000
commitbfd215aa7f79c97a5488349dc372f473950ea38d (patch)
tree4ff9cc393490edcf7f38efe73047907ad1a38dbb /src/GF/Devel/Compile/Extend.hs
parentf08eb82f2beb069a0f9da2dbba4c6f09cf781e83 (diff)
started grammar checking with new internal format
Diffstat (limited to 'src/GF/Devel/Compile/Extend.hs')
-rw-r--r--src/GF/Devel/Compile/Extend.hs10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/GF/Devel/Compile/Extend.hs b/src/GF/Devel/Compile/Extend.hs
index fa6f65726..8dbbe0382 100644
--- a/src/GF/Devel/Compile/Extend.hs
+++ b/src/GF/Devel/Compile/Extend.hs
@@ -109,9 +109,9 @@ rebuildModule gr mo@(i,mi) = case mtype mi of
-- copy interface contents to instance
MTInstance i0 -> do
- m1 <- lookupModule gr i0
- testErr (isInterface m1) ("not an interface:" +++ prt i0)
- js1 <- extendMod False i0 (const True) i (mjments m1) (mjments mi)
+ m0 <- lookupModule gr i0
+ testErr (isInterface m0) ("not an interface:" +++ prt i0)
+ js1 <- extendMod False i0 (const True) i (mjments m0) (mjments mi)
--- to avoid double inclusions, in instance J of I0 = J0 ** ...
case mextends mi of
@@ -120,7 +120,9 @@ rebuildModule gr mo@(i,mi) = case mtype mi of
mes <- mapM (lookupModule gr . fst) es ---- restricted?? 12/2007
let notInExts c _ = all (notMember c . mjments) mes
let js2 = filterWithKey notInExts js1
- return $ (i,mi {mjments = js2})
+ return $ (i,mi {
+ mjments = js2
+ })
-- copy functor contents to instantiation, and also add opens
_ -> case minstances mi of