file name as option in commands

2 files changed, 27 insertions, 4 deletions

diff --git a/src-3.0/GF/Command/Commands.hs b/src-3.0/GF/Command/Commands.hs
index 231f6db77..9ed57f376 100644
--- a/src-3.0/GF/Command/Commands.hs
+++ b/src-3.0/GF/Command/Commands.hs
@@ -200,9 +200,14 @@ allCommands pgf = Map.fromList [
   ("ps", emptyCommandInfo {
      longname = "put_string",
      synopsis = "return a string, possibly processed with a function",
-     exec = \opts -> 
-       return . fromString . maybe id id (stringOp (concatMap prOpt opts)) . toString,
-     flags = ["cat","lang"]
+     explanation = unlines [
+       "Returns a string obtained by its argument string by applying",
+       "string processing functions in the order given in the command line",
+       "option list. Thus 'ps -f -g s' returns g (f s). Typical string processors",
+       "are lexers and unlexers."
+       ], 
+     exec = \opts -> return . fromString . stringOps opts . toString,
+     options = ["lextext","lexcode","lexmixed","unlextext","unlexcode","unlexmixed"]
      }),
   ("q",  emptyCommandInfo {
      longname = "quit",
@@ -228,12 +233,22 @@ allCommands pgf = Map.fromList [
                fromTrees [t | Just t <- [readExp s]] 
          _ | isOpt "lines" opts -> fromStrings $ lines s 
          _ -> fromString s 
+     }),
+  ("wf", emptyCommandInfo {
+     longname = "write_file",
+     synopsis = "send string or tree to a file",
+     exec = \opts arg -> do
+         let file = valIdOpts "file" "_gftmp" opts
+         writeFile file (toString arg)
+         return void
      })
   ]
  where
    lin opts t = unlines [linearize pgf lang t    | lang <- optLangs opts]
    par opts s = concat  [parse pgf lang (optCat opts) s | lang <- optLangs opts]
  
+   void = ([],[])
+
    optLin opts t = case opts of 
      _ | isOpt "treebank" opts -> unlines $ (abstractName pgf ++ ": " ++ showExp t) :
           [lang ++ ": " ++ linea lang t | lang <- optLangs opts]
@@ -266,3 +281,7 @@ allCommands pgf = Map.fromList [
 
    morphos opts s = 
      [lookupMorpho (buildMorpho pgf (mkCId la)) s | la <- optLangs opts]
+
+   -- ps -f -g s returns g (f s)
+   stringOps opts s = foldr app s (reverse (map prOpt opts)) where
+     app f = maybe id id (stringOp f) 
diff --git a/src-3.0/GF/Command/Parse.hs b/src-3.0/GF/Command/Parse.hs
index 34988632d..5a0deaaf5 100644
--- a/src-3.0/GF/Command/Parse.hs
+++ b/src-3.0/GF/Command/Parse.hs
@@ -5,6 +5,7 @@ import PGF.Data(Exp)
 import GF.Command.Abstract
 
 import Data.Char
+import Control.Monad
 import qualified Text.ParserCombinators.ReadP as RP
 
 readCommandLine :: String -> Maybe CommandLine
@@ -32,6 +33,9 @@ pOption = do
   RP.option (OOpt flg) (fmap (OFlag flg) (RP.char '=' >> pValue))
 
 pValue = do
-  fmap VId  pIdent
+  fmap VId  pFilename
   RP.<++
   fmap (VInt . read) (RP.munch1 isDigit)
+
+pFilename = liftM2 (:) (RP.satisfy isFileFirst) (RP.munch (not . isSpace)) where
+  isFileFirst c = not (isSpace c) && not (isDigit c)