summaryrefslogtreecommitdiff
path: root/src/GF/Shell
diff options
context:
space:
mode:
Diffstat (limited to 'src/GF/Shell')
-rw-r--r--src/GF/Shell/HelpFile.hs9
-rw-r--r--src/GF/Shell/ShellCommands.hs5
2 files changed, 8 insertions, 6 deletions
diff --git a/src/GF/Shell/HelpFile.hs b/src/GF/Shell/HelpFile.hs
index 215a33875..18dcd3579 100644
--- a/src/GF/Shell/HelpFile.hs
+++ b/src/GF/Shell/HelpFile.hs
@@ -212,12 +212,12 @@ txtHelpFile =
"\n -fail show strings whose parse fails prefixed by #FAIL" ++
"\n -ambiguous show strings that have more than one parse prefixed by #AMBIGUOUS" ++
"\n options for selecting parsing method:" ++
- "\n (default)parse using an overgenerating CFG" ++
+ "\n -fcfg parse using a fast variant of MCFG (default is no HOAS in grammar)" ++
+ "\n -old parse using an overgenerating CFG (default if HOAS in grammar)" ++
"\n -cfg parse using a much less overgenerating CFG" ++
"\n -mcfg parse using an even less overgenerating MCFG" ++
- "\n -fcfg parse using a faster variant of MCFG" ++
- "\n Note: the first time parsing with -cfg, -mcfg, and -fcfg might take a long time" ++
- "\n options that only work for the default parsing method:" ++
+ "\n Note: the first time parsing with -cfg, -mcfg, and -fcfg may take a long time" ++
+ "\n options that only work for the -old default parsing method:" ++
"\n -n non-strict: tolerates morphological errors" ++
"\n -ign ignore unknown words when parsing" ++
"\n -raw return context-free terms in raw form" ++
@@ -594,6 +594,7 @@ txtHelpFile =
"\n -lexer=chars each character is a token" ++
"\n -lexer=code use Haskell's lex" ++
"\n -lexer=codevars like code, but treat unknown words as variables, ?? as meta " ++
+ "\n -lexer=textvars like text, but treat unknown words as variables, ?? as meta " ++
"\n -lexer=text with conventions on punctuation and capital letters" ++
"\n -lexer=codelit like code, but treat unknown words as string literals" ++
"\n -lexer=textlit like text, but treat unknown words as string literals" ++
diff --git a/src/GF/Shell/ShellCommands.hs b/src/GF/Shell/ShellCommands.hs
index ff3960eef..08b9720bd 100644
--- a/src/GF/Shell/ShellCommands.hs
+++ b/src/GF/Shell/ShellCommands.hs
@@ -184,8 +184,9 @@ optionsOfCommand co = case co of
CTransformGrammar _ -> flags "printer"
CConvertLatex _ -> none
CLinearize _ -> both "utf8 table struct record all multi" "lang number unlexer mark"
- CParse -> both "ambiguous fail cut new newer cfg mcfg fcfg n ign raw v lines all prob"
- "cat lang lexer parser number rawtrees"
+ CParse ->
+ both "ambiguous fail cut new newer old cfg mcfg fcfg n ign raw v lines all prob"
+ "cat lang lexer parser number rawtrees"
CTranslate _ _ -> opts "cat lexer parser"
CGenerateRandom -> both "cf prob" "cat lang number depth atoms noexpand doexpand"
CGenerateTrees -> both "metas" "atoms depth alts cat lang number noexpand doexpand"