GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 03:32:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

print "no trees found" in GF shell if an empty tree list is returned by p or pt

Browse Source
This commit is contained in:
aarne
2008-11-10 16:23:09 +00:00
parent 821fbe7ddb
commit ca59050abc
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/GF/Command/Commands.hs
View File

@@ -186,7 +186,7 @@ allCommands cod pgf = Map.fromList [
let pgfr = optRestricted opts let pgfr = optRestricted opts
let dp = return $ valIntOpts "depth" 4 opts let dp = return $ valIntOpts "depth" 4 opts
let ts = generateAllDepth pgfr (optType opts) dp let ts = generateAllDepth pgfr (optType opts) dp
return $ fromTrees $ take (optNumInf opts) ts returnFromTrees $ take (optNumInf opts) ts
}), }),
("h", emptyCommandInfo { ("h", emptyCommandInfo {
longname = "help", longname = "help",
@@ -304,7 +304,7 @@ allCommands cod pgf = Map.fromList [
"The default start category can be overridden by the -cat flag.", "The default start category can be overridden by the -cat flag.",
"See also the ps command for lexing and character encoding." "See also the ps command for lexing and character encoding."
], ],
exec = \opts -> return . fromTrees . concatMap (par opts) . toStrings, exec = \opts -> returnFromTrees . concatMap (par opts) . toStrings,
flags = [ flags = [
("cat","target category of parsing"), ("cat","target category of parsing"),
("lang","the languages of parsing (comma-separated, no spaces)") ("lang","the languages of parsing (comma-separated, no spaces)")
@@ -382,7 +382,7 @@ allCommands cod pgf = Map.fromList [
"pt -compute (plus one two) -- compute value", "pt -compute (plus one two) -- compute value",
"p \"foo\" | pt -typecheck -- type check parse results" "p \"foo\" | pt -typecheck -- type check parse results"
], ],
exec = \opts -> return . fromTrees . treeOps (map prOpt opts), exec = \opts -> returnFromTrees . treeOps (map prOpt opts),
options = treeOpOptions pgf options = treeOpOptions pgf
}), }),
("q", emptyCommandInfo { ("q", emptyCommandInfo {
@@ -593,6 +593,10 @@ allCommands cod pgf = Map.fromList [
toStrings = map showAsString toStrings = map showAsString
toString = unwords . toStrings toString = unwords . toStrings
returnFromTrees ts = return $ case ts of
[] -> (ts, "no trees found")
_ -> fromTrees ts
prGrammar opts = case opts of prGrammar opts = case opts of
_ | isOpt "cats" opts -> unwords $ map showType $ categories pgf _ | isOpt "cats" opts -> unwords $ map showType $ categories pgf
_ | isOpt "fullform" opts -> concatMap _ | isOpt "fullform" opts -> concatMap