make it possible to override opers defined in an interface by syntax 'instance Foo of Bar - [f,g,h]'

This commit is contained in:
aarne
2011-03-12 11:24:14 +00:00
parent 87aa41d503
commit afbfbaa73a
6 changed files with 17 additions and 15 deletions

View File

@@ -178,7 +178,7 @@ importsOfModule (m,mi) = (modName m,depModInfo mi [])
depModType (MTResource) xs = xs
depModType (MTInterface) xs = xs
depModType (MTConcrete m2) xs = modName m2:xs
depModType (MTInstance m2) xs = modName m2:xs
depModType (MTInstance (m2,_)) xs = modName m2:xs
depExtends es xs = foldr depInclude xs es

View File

@@ -89,10 +89,10 @@ rebuildModule gr mo@(i,mi@(ModInfo mt stat fs_ me mw ops_ med_ js_)) = do
("module" +++ showIdent i +++
"has open interfaces and must therefore be declared incomplete")
case mt of
MTInstance i0 -> do
MTInstance (i0,mincl) -> do
m1 <- lookupModule gr i0
testErr (isModRes m1) ("interface expected instead of" +++ showIdent i0)
js' <- extendMod gr False (i0,const True) i (jments m1) (jments mi)
js' <- extendMod gr False (i0, isInherited mincl) i (jments m1) (jments mi)
--- to avoid double inclusions, in instance I of I0 = J0 ** ...
case extends mi of
[] -> return $ replaceJudgements mi js'