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

Make flag value checking depend on the command. Fixed spurious error messages with pm -printer values.

Browse Source
This commit is contained in:
bringert
2004-12-09 09:51:41 +00:00
parent 8c252ebd5c
commit f45bdbfa54
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/GF/Shell/ShellCommands.hs
View File

@@ -90,19 +90,21 @@ isValidOption st co op = case op of
testErr (elem o $ optsOf co) ("invalid option:" +++ prOpt op) testErr (elem o $ optsOf co) ("invalid option:" +++ prOpt op)
Opt (o,[x]) -> do Opt (o,[x]) -> do
testErr (elem o (flagsOf co)) ("invalid flag:" +++ o) testErr (elem o (flagsOf co)) ("invalid flag:" +++ o)
testValidFlag st o x testValidFlag st co o x
_ -> Bad $ "impossible option" +++ prOpt op _ -> Bad $ "impossible option" +++ prOpt op
where where
optsOf co = ("tr" :) $ fst $ optionsOfCommand co optsOf co = ("tr" :) $ fst $ optionsOfCommand co
flagsOf co = snd $ optionsOfCommand co flagsOf co = snd $ optionsOfCommand co
testValidFlag :: ShellState -> OptFunId -> String -> Err () testValidFlag :: ShellState -> Command -> OptFunId -> String -> Err ()
testValidFlag st f x = case f of testValidFlag st co f x = case f of
"cat" -> testIn (map prQIdent_ (allCategories st)) "cat" -> testIn (map prQIdent_ (allCategories st))
"lang" -> testIn (map prt (allLanguages st)) "lang" -> testIn (map prt (allLanguages st))
"res" -> testIn (map prt (allResources (srcModules st))) "res" -> testIn (map prt (allResources (srcModules st)))
"number" -> testN "number" -> testN
"printer" -> testInc customGrammarPrinter "printer" -> case co of
CPrintGrammar -> testInc customGrammarPrinter
CPrintMultiGrammar -> testInc customMultiGrammarPrinter
"lexer" -> testInc customTokenizer "lexer" -> testInc customTokenizer
"unlexer" -> testInc customUntokenizer "unlexer" -> testInc customUntokenizer
"depth" -> testN "depth" -> testN