msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

several treebanks in shell state

Browse Source
This commit is contained in:
aarne
2006-03-02 20:27:42 +00:00
parent 32508e37b3
commit 6c5763615f
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/GF/Compile/ShellState.hs
View File

@@ -273,7 +273,8 @@ prShellStateInfo sh = unlines [
"canonical modules :" +++ unwords (map (P.prt .fst) (M.modules (canModules sh))), "canonical modules :" +++ unwords (map (P.prt .fst) (M.modules (canModules sh))),
"source modules : " +++ unwords (map (P.prt .fst) (M.modules (srcModules sh))), "source modules : " +++ unwords (map (P.prt .fst) (M.modules (srcModules sh))),
"global options : " +++ prOpts (gloptions sh), "global options : " +++ prOpts (gloptions sh),
"transfer modules : " +++ unwords (map (P.prt . fst) (transfers sh)) "transfer modules : " +++ unwords (map (P.prt . fst) (transfers sh)),
"treebanks : " +++ unwords (map (P.prt . fst) (treebanks sh))
] ]
abstractName :: ShellState -> String abstractName :: ShellState -> String

19
src/GF/Shell.hs
View File

@@ -308,13 +308,18 @@ execC co@(comm, opts0) sa@(sh@(st,(h,_,_,_)),a) = checkOptions st co >> case com
returnArg (AString $ unlines $ mkTreebank opts st comm ts) sa returnArg (AString $ unlines $ mkTreebank opts st comm ts) sa
CLookupTreebank -> do CLookupTreebank -> do
case treebanks st of let tbs = treebanks st
[] -> returnArg (AError "no treebank") sa if null tbs
(_,tb):_ -> do then returnArg (AError "no treebank") sa
let s = prCommandArg a else do
let tes = map (string2treeErr gro . snd) $ lookupTreebank tb s let tbi = maybe (fst $ head tbs) I.identC (getOptVal opts (aOpt "treebank"))
terms = [t | Ok t <- tes] case lookup tbi tbs of
returnArg (ATrms terms) sa Nothing -> returnArg (AError ("no treebank" +++ prt tbi)) sa
Just tb -> do
let s = prCommandArg a
let tes = map (string2treeErr gro . snd) $ lookupTreebank tb s
terms = [t | Ok t <- tes]
returnArg (ATrms terms) sa
CShowTreeGraph | oElem emitCode opts -> do -- -o CShowTreeGraph | oElem emitCode opts -> do -- -o
returnArg (AString $ visualizeTrees opts $ strees $ s2t a) sa returnArg (AString $ visualizeTrees opts $ strees $ s2t a) sa