summaryrefslogtreecommitdiff
path: root/src/GF/Compile
diff options
context:
space:
mode:
authorkrasimir <krasimir@chalmers.se>2009-09-17 14:32:20 +0000
committerkrasimir <krasimir@chalmers.se>2009-09-17 14:32:20 +0000
commitbd2f46583c058e427bbacd6dbcfc1a0ccdf25718 (patch)
tree1acc1b004c800f4c39b28ab34db148e72b35c0d7 /src/GF/Compile
parent49ca46d95835a74ec581431e668612b3b3589350 (diff)
remove the transfer modules. We don't need anything special, a transfer module is module without concrete syntax
Diffstat (limited to 'src/GF/Compile')
-rw-r--r--src/GF/Compile/CheckGrammar.hs2
-rw-r--r--src/GF/Compile/ModDeps.hs3
-rw-r--r--src/GF/Compile/ReadFiles.hs1
-rw-r--r--src/GF/Compile/Rename.hs6
4 files changed, 3 insertions, 9 deletions
diff --git a/src/GF/Compile/CheckGrammar.hs b/src/GF/Compile/CheckGrammar.hs
index d5f464a0c..6e6e27c74 100644
--- a/src/GF/Compile/CheckGrammar.hs
+++ b/src/GF/Compile/CheckGrammar.hs
@@ -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
diff --git a/src/GF/Compile/ModDeps.hs b/src/GF/Compile/ModDeps.hs
index 812c8163f..1e689aabc 100644
--- a/src/GF/Compile/ModDeps.hs
+++ b/src/GF/Compile/ModDeps.hs
@@ -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
diff --git a/src/GF/Compile/ReadFiles.hs b/src/GF/Compile/ReadFiles.hs
index a1e0c287d..b96d3127b 100644
--- a/src/GF/Compile/ReadFiles.hs
+++ b/src/GF/Compile/ReadFiles.hs
@@ -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
diff --git a/src/GF/Compile/Rename.hs b/src/GF/Compile/Rename.hs
index b7ef65fe9..8c563eeed 100644
--- a/src/GF/Compile/Rename.hs
+++ b/src/GF/Compile/Rename.hs
@@ -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