diff options
| author | aarne <aarne@cs.chalmers.se> | 2005-12-01 17:58:31 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2005-12-01 17:58:31 +0000 |
| commit | da22eac1803ea4e29dd88888157918878f75d149 (patch) | |
| tree | 91d01a6110cc9159a93e729a56b68f2d7ad9dfac /src/GF/Compile/ShellState.hs | |
| parent | 56f62f31d88348e25636e13d9f8f57a04c1b0b74 (diff) | |
making apply_transfer work
Diffstat (limited to 'src/GF/Compile/ShellState.hs')
| -rw-r--r-- | src/GF/Compile/ShellState.hs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/GF/Compile/ShellState.hs b/src/GF/Compile/ShellState.hs index 09209fa2d..bbae69efe 100644 --- a/src/GF/Compile/ShellState.hs +++ b/src/GF/Compile/ShellState.hs @@ -357,21 +357,18 @@ stateGrammarOfLang :: ShellState -> Language -> StateGrammar stateGrammarOfLang st0 l = StGr { absId = err (const (identC "Abs")) id $ M.abstractOfConcrete allCan l, --- cncId = l, - grammar = can, + grammar = allCan, cf = maybe emptyCF id (lookup l (cfs st)), mcfg = maybe [] id $ lookup l $ mcfgs st, cfg = maybe [] id $ lookup l $ cfgs st, pInfo = maybe (Prs.buildPInfo [] []) id $ lookup l $ pInfos st, morpho = maybe emptyMorpho id (lookup l (morphos st)), probs = maybe emptyProbs id (lookup l (probss st)), - loptions = errVal noOptions $ lookupOptionsCan can + loptions = errVal noOptions $ lookupOptionsCan allCan } where - st = purgeShellState $ st0 {concrete = Just l} + st = purgeShellState $ errVal st0 $ changeMain (Just l) st0 allCan = canModules st - can = allCan ----- can = M.partOfGrammar allCan ----- (l, maybe M.emptyModInfo id (lookup l (M.modules allCan))) grammarOfLang :: ShellState -> Language -> CanonGrammar cfOfLang :: ShellState -> Language -> CF @@ -413,6 +410,7 @@ stateAbstractGrammar st = StGr { globalOptions :: ShellState -> Options allLanguages :: ShellState -> [Language] +allTransfers :: ShellState -> [Ident] allCategories :: ShellState -> [G.Cat] allStateGrammars :: ShellState -> [StateGrammar] allStateGrammarsWithNames :: ShellState -> [(Language, StateGrammar)] @@ -421,7 +419,9 @@ allActiveStateGrammarsWithNames :: ShellState -> [(Language, StateGrammar)] allActiveGrammars :: ShellState -> [StateGrammar] globalOptions = gloptions -allLanguages = map (fst . fst) . concretes +--allLanguages = map (fst . fst) . concretes +allLanguages = M.allConcreteModules . canModules +allTransfers = map fst . transfers allCategories = map fst . allCatsOf . canModules allStateGrammars = map snd . allStateGrammarsWithNames |