diff options
| author | aarne <aarne@cs.chalmers.se> | 2007-12-04 20:13:36 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2007-12-04 20:13:36 +0000 |
| commit | dc1c8355633ba2fe57046a19a579f5cd154835f7 (patch) | |
| tree | 36b3f8b36efb0ab54b5c7db8279be65b051bfd69 /src/GF/Devel/Compile/Extend.hs | |
| parent | 11982849b97203f2d5822df7391074a96b7d6f1a (diff) | |
restored interface and instance - at least for a while
Diffstat (limited to 'src/GF/Devel/Compile/Extend.hs')
| -rw-r--r-- | src/GF/Devel/Compile/Extend.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/GF/Devel/Compile/Extend.hs b/src/GF/Devel/Compile/Extend.hs index b621999dc..a10f8d929 100644 --- a/src/GF/Devel/Compile/Extend.hs +++ b/src/GF/Devel/Compile/Extend.hs @@ -53,7 +53,7 @@ extendModule gf nmo0 = do m <- lookupModule gf n -- test that the module types match, and find out if the old is complete - testErr (mtype mo == mtype m) + testErr True ---- (mtype mo == mtype m) ("illegal extension type to module" +++ prt name) return (m, isCompleteModule m) @@ -103,10 +103,10 @@ tryInsert unif indir tree z@(x, info) = case Data.Map.lookup x tree of -- AR 24/10/2003 rebuildModule :: GF -> SourceModule -> Err SourceModule rebuildModule gr mo@(i,mi) = case mtype mi of - MTConcrete i0 -> do + MTInstance i0 -> do m1 <- lookupModule gr i0 - testErr (mtype m1 == MTAbstract) - ("abstract expected as type of" +++ prt i0) + testErr (mtype m1 == MTInterface) + ("interface expected as type of" +++ prt i0) js' <- extendMod False i0 (const True) i (mjments m1) (mjments mi) --- to avoid double inclusions, in instance I of I0 = J0 ** ... case mextends mi of |
