mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-20 00:22:51 -06:00
remove the transfer modules. We don't need anything special, a transfer module is module without concrete syntax
This commit is contained in:
@@ -62,8 +62,6 @@ checkModule ms (name,mo) = checkIn (text "checking module" <+> ppIdent name) $ d
|
||||
js' <- case mtype mo of
|
||||
MTAbstract -> checkMap (checkAbsInfo gr name mo) js
|
||||
|
||||
MTTransfer a b -> checkMap (checkAbsInfo gr name mo) js
|
||||
|
||||
MTResource -> checkMap (checkResInfo gr name mo) js
|
||||
|
||||
MTConcrete a -> do
|
||||
|
||||
@@ -99,8 +99,7 @@ moduleDeps ms = mapM deps ms where
|
||||
_ -> mt0 == mt
|
||||
-- in the same way; this defines what can be opened
|
||||
compatOType mt0 mt = case mt0 of
|
||||
MTAbstract -> mt == MTAbstract
|
||||
MTTransfer _ _ -> mt == MTAbstract
|
||||
MTAbstract -> mt == MTAbstract
|
||||
_ -> case mt of
|
||||
MTResource -> True
|
||||
MTInterface -> True
|
||||
|
||||
@@ -177,7 +177,6 @@ importsOfModule (m,mi) = (modName m,depModInfo mi [])
|
||||
depModType (MTInterface) xs = xs
|
||||
depModType (MTConcrete m2) xs = modName m2:xs
|
||||
depModType (MTInstance m2) xs = modName m2:xs
|
||||
depModType (MTTransfer o1 o2) xs = depOpen o1 (depOpen o2 xs)
|
||||
|
||||
depExtends es xs = foldr depInclude xs es
|
||||
|
||||
|
||||
@@ -131,7 +131,7 @@ tree2status o = case o of
|
||||
buildStatus :: SourceGrammar -> Ident -> SourceModInfo -> Err Status
|
||||
buildStatus gr c mo = let mo' = self2status c mo in do
|
||||
let gr1 = MGrammar ((c,mo) : modules gr)
|
||||
ops = [OSimple e | e <- allExtends gr1 c] ++ allOpens mo
|
||||
ops = [OSimple e | e <- allExtends gr1 c] ++ opens mo
|
||||
mods <- mapM (lookupModule gr1 . openedModule) ops
|
||||
let sts = map modInfo2status $ zip ops mods
|
||||
return $ if isModCnc mo
|
||||
@@ -142,9 +142,7 @@ modInfo2status :: (OpenSpec Ident,SourceModInfo) -> (OpenSpec Ident, StatusTree)
|
||||
modInfo2status (o,mo) = (o,tree2status o (jments mo))
|
||||
|
||||
self2status :: Ident -> SourceModInfo -> StatusTree
|
||||
self2status c m = mapTree (info2status (Just c)) js where -- qualify internal
|
||||
js | isModTrans m = sorted2tree $ tree2list $ jments m
|
||||
| otherwise = jments m
|
||||
self2status c m = mapTree (info2status (Just c)) (jments m)
|
||||
|
||||
forceQualif o = case o of
|
||||
OSimple i -> OQualif i i
|
||||
|
||||
Reference in New Issue
Block a user