diff options
| author | aarne <aarne@cs.chalmers.se> | 2006-06-03 13:03:17 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2006-06-03 13:03:17 +0000 |
| commit | 4a3d280df50a059f75f9c61a5afd932add789341 (patch) | |
| tree | 5bf77b44989e653fc6be9256936169e032bd39e3 /src/GF/Compile/ShellState.hs | |
| parent | 97dada16f61dc3dbcb7a4a9ffc02a55db713f54a (diff) | |
fixed a file reading bug ; improved pi
Diffstat (limited to 'src/GF/Compile/ShellState.hs')
| -rw-r--r-- | src/GF/Compile/ShellState.hs | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/GF/Compile/ShellState.hs b/src/GF/Compile/ShellState.hs index c4798f8d9..3a7115b34 100644 --- a/src/GF/Compile/ShellState.hs +++ b/src/GF/Compile/ShellState.hs @@ -35,6 +35,7 @@ import GF.Probabilistic.Probabilistic import GF.Compile.NoParse import GF.Infra.Option import GF.Infra.Ident +import GF.Infra.UseIO (justModuleName) import GF.System.Arch (ModTime) import qualified Transfer.InterpreterAPI as T @@ -69,7 +70,7 @@ data ShellState = ShSt { treebanks :: [(Ident,Treebank)], -- ^ treebanks probss :: [(Ident,Probs)], -- ^ probability distributions gloptions :: Options, -- ^ global options - readFiles :: [(FilePath,ModTime)],-- ^ files read + readFiles :: [(String,(FilePath,ModTime))],-- ^ files read absCats :: [(G.Cat,(G.Context, [(G.Fun,G.Type)], [((G.Fun,Int),G.Type)]))], -- ^ cats, (their contexts, @@ -197,8 +198,8 @@ grammar2shellState opts (gr,sgr) = -- | update a shell state from a canonical grammar updateShellState :: Options -> NoParse -> Maybe Ident -> ShellState -> - ((Int,G.SourceGrammar,CanonGrammar),[(FilePath,ModTime)]) -> - ---- (CanonGrammar,(G.SourceGrammar,[(FilePath,ModTime)])) -> + ((Int,G.SourceGrammar,CanonGrammar),[(String,(FilePath,ModTime))]) -> + ---- (CanonGrammar,(G.SourceGrammar,[(String,(FilePath,ModTime))])) -> Err ShellState updateShellState opts ign mcnc sh ((_,sgr,gr),rts) = do let cgr0 = M.updateMGrammar (canModules sh) gr @@ -271,7 +272,7 @@ updateShellState opts ign mcnc sh ((_,sgr,gr),rts) = do treebanks = treebanks sh, probss = zip concrs probss, gloptions = gloptions sh, --- opts, -- this would be command-line options - readFiles = [ft | ft@(f,_) <- readFiles sh, notInrts f] ++ rts, + readFiles = [ft | ft@(_,(f,_)) <- readFiles sh, notInrts f] ++ rts, absCats = csi, statistics = [StDepTypes deps,StBoundVars binds], transfers = transfers sh @@ -455,6 +456,9 @@ allActiveStateGrammarsWithNames st = allActiveGrammars = map snd . allActiveStateGrammarsWithNames +pathOfModule :: ShellState -> Ident -> FilePath +pathOfModule sh m = maybe "module not found" fst $ lookup (P.prt m) $ readFiles sh + -- command-line option -lang=foo overrides the actual grammar in state grammarOfOptState :: Options -> ShellState -> StateGrammar grammarOfOptState opts st = @@ -531,14 +535,6 @@ changeOptions :: (Options -> Options) -> ShellStateOper --- __________ this is OBSOLETE changeOptions f sh = sh {gloptions = f (gloptions sh)} -changeModTimes :: [(FilePath,ModTime)] -> ShellStateOper ---- __________ this is OBSOLETE -changeModTimes mfs - (ShSt a c cs can src cfs old_pinfos mcfgs fcfgs cfgs pinfos ms tbs pbs os ff ts ss trs) = - ShSt a c cs can src cfs old_pinfos mcfgs fcfgs cfgs pinfos ms tbs pbs os ff' ts ss trs - where - ff' = mfs ++ [mf | mf@(f,_) <- ff, notElem f (map fst mfs)] - addGlobalOptions :: Options -> ShellStateOper addGlobalOptions = changeOptions . addOptions |