From cfe8ebc1fbbf60d7d90aaa4776b029b5eb84ae98 Mon Sep 17 00:00:00 2001 From: aarne Date: Fri, 3 Oct 2003 06:31:34 +0000 Subject: Restored read term in editor. --- src/GF/Compile/ShellState.hs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/GF/Compile/ShellState.hs') diff --git a/src/GF/Compile/ShellState.hs b/src/GF/Compile/ShellState.hs index 85bc24ae0..3c1dffb07 100644 --- a/src/GF/Compile/ShellState.hs +++ b/src/GF/Compile/ShellState.hs @@ -23,11 +23,11 @@ import Arch (ModTime) -- multilingual state with grammars and options data ShellState = ShSt { - abstract :: Maybe Ident , -- pointer to actual abstract; nothing in empty st + abstract :: Maybe Ident , -- pointer to actual abstract, if not empty st concrete :: Maybe Ident , -- pointer to primary concrete concretes :: [(Ident,Ident)], -- list of all concretes - canModules :: CanonGrammar , -- the place where abstracts and concretes reside - srcModules :: G.SourceGrammar , -- the place of saved resource modules + canModules :: CanonGrammar , -- compiled abstracts and concretes + srcModules :: G.SourceGrammar , -- saved resource modules cfs :: [(Ident,CF)] , -- context-free grammars morphos :: [(Ident,Morpho)], -- morphologies gloptions :: Options, -- global options @@ -69,6 +69,7 @@ data StateGrammar = StGr { cncId :: Ident, grammar :: CanonGrammar, cf :: CF, +---- parser :: StaticParserInfo, morpho :: Morpho } @@ -91,7 +92,8 @@ cncModuleIdST = stateGrammarST -- form a shell state from a canonical grammar grammar2shellState :: Options -> (CanonGrammar, G.SourceGrammar) -> Err ShellState -grammar2shellState opts (gr,sgr) = updateShellState opts emptyShellState (gr,(sgr,[])) +grammar2shellState opts (gr,sgr) = + updateShellState opts emptyShellState (gr,(sgr,[])) -- update a shell state from a canonical grammar -- cgit v1.2.3