diff options
Diffstat (limited to 'src/GF/Shell')
| -rw-r--r-- | src/GF/Shell/HelpFile.hs | 13 | ||||
| -rw-r--r-- | src/GF/Shell/PShell.hs | 8 | ||||
| -rw-r--r-- | src/GF/Shell/ShellCommands.hs | 8 |
3 files changed, 16 insertions, 13 deletions
diff --git a/src/GF/Shell/HelpFile.hs b/src/GF/Shell/HelpFile.hs index e55495e66..2723e5fbc 100644 --- a/src/GF/Shell/HelpFile.hs +++ b/src/GF/Shell/HelpFile.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/04/21 16:23:20 $ --- > CVS $Author: bringert $ --- > CVS $Revision: 1.2 $ +-- > CVS $Date: 2005/05/12 10:03:33 $ +-- > CVS $Author: aarne $ +-- > CVS $Revision: 1.3 $ -- -- Help on shell commands. Generated from HelpFile by 'make help'. -- PLEASE DON'T EDIT THIS FILE. @@ -297,13 +297,16 @@ txtHelpFile = "\n examples:" ++ "\n p \"zero is even\" | pt -transform=solve -- solve ?'s in parse result" ++ "\n" ++ - "\n" ++ "\n* st, show_tree: st Tree" ++ "\n Prints the tree as a string. Unlike pt, this command cannot be" ++ "\n used in a pipe to produce a tree, since its output is a string." ++ "\n flags:" ++ "\n -printer show the tree in a special format (-printer=xml supported)" ++ "\n" ++ + "\nwt, wrap_tree: wt Fun" ++ + "\n Wraps the tree as the sole argument of Fun." ++ + "\n flags:" ++ + "\n -c compute the resulting new tree to normal form" ++ "\n" ++ "\n-- subshells" ++ "\n" ++ @@ -516,4 +519,4 @@ txtHelpFile = "\n -unlexer=bind like identity, but bind at \"&+\"" ++ "\n" ++ "\n-- *: Commands and options marked with * are not yet implemented." ++ - [] + []
\ No newline at end of file diff --git a/src/GF/Shell/PShell.hs b/src/GF/Shell/PShell.hs index 92574ff9b..480284ccf 100644 --- a/src/GF/Shell/PShell.hs +++ b/src/GF/Shell/PShell.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/04/21 16:46:12 $ --- > CVS $Author: bringert $ --- > CVS $Revision: 1.20 $ +-- > CVS $Date: 2005/05/12 10:03:33 $ +-- > CVS $Author: aarne $ +-- > CVS $Revision: 1.21 $ -- -- parsing GF shell commands. AR 11\/11\/2001 ----------------------------------------------------------------------------- @@ -97,7 +97,7 @@ pCommand ws = case ws of "gt" : [] -> aUnit CGenerateTrees "gt" : t -> aTerm CGenerateTrees t "pt" : s -> aTerm CPutTerm s ------ "wt" : f : s -> aTerm (CWrapTerm (string2id f)) s + "wt" : f : s -> aTerm (CWrapTerm (pzIdent f)) s "ma" : s -> aString CMorphoAnalyse s "tt" : s -> aString CTestTokenizer s "cc" : s -> aUnit $ CComputeConcrete $ unwords s diff --git a/src/GF/Shell/ShellCommands.hs b/src/GF/Shell/ShellCommands.hs index 542b940ab..d6a2c8d3e 100644 --- a/src/GF/Shell/ShellCommands.hs +++ b/src/GF/Shell/ShellCommands.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/05/11 10:28:16 $ --- > CVS $Author: peb $ --- > CVS $Revision: 1.32 $ +-- > CVS $Date: 2005/05/12 10:03:33 $ +-- > CVS $Author: aarne $ +-- > CVS $Revision: 1.33 $ -- -- The datatype of shell commands and the list of their options. ----------------------------------------------------------------------------- @@ -173,7 +173,7 @@ optionsOfCommand co = case co of CGenerateRandom -> flags "cat lang number depth" CGenerateTrees -> both "metas" "depth alts cat lang number" CPutTerm -> flags "transform number" - CWrapTerm _ -> none + CWrapTerm _ -> opts "c" CMorphoAnalyse -> both "short" "lang" CTestTokenizer -> flags "lexer" CComputeConcrete _ -> flags "res" |