GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-22 09:32:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

several treebanks in shell state

Browse Source
This commit is contained in:
aarne
2006-03-02 20:27:42 +00:00
parent 27467d32fd
commit 6cd06a5efc
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

11
src/GF/Shell.hs
View File

@@ -308,9 +308,14 @@ 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
else do
let tbi = maybe (fst $ head tbs) I.identC (getOptVal opts (aOpt "treebank"))
case lookup tbi tbs of
Nothing -> returnArg (AError ("no treebank" +++ prt tbi)) sa
Just tb -> do
let s = prCommandArg a let s = prCommandArg a
let tes = map (string2treeErr gro . snd) $ lookupTreebank tb s let tes = map (string2treeErr gro . snd) $ lookupTreebank tb s
terms = [t | Ok t <- tes] terms = [t | Ok t <- tes]