term macro help

2 files changed, 17 insertions, 7 deletions

diff --git a/src-3.0/GF/Command/Commands.hs b/src-3.0/GF/Command/Commands.hs
index 6fd4a1fb2..7441e6fb5 100644
--- a/src-3.0/GF/Command/Commands.hs
+++ b/src-3.0/GF/Command/Commands.hs
@@ -114,14 +114,21 @@ allCommands pgf = Map.fromList [
      }),
   ("dt",  emptyCommandInfo {
      longname = "define_tree",
-     syntax = "dt IDENT (TREE | STRING)", -- | '<' COMMANDLINE)",
+     syntax = "dt IDENT (TREE | STRING | \"<\" COMMANDLINE)",
      synopsis = "define a tree or string macro",
      explanation = unlines [
        "Defines IDENT as macro for TREE or STRING, until IDENT gets redefined.",
-       -- "The defining value can also come from a command, preceded by '<'.",
+       "The defining value can also come from a command, preceded by \"<\".",
+       "If the command gives many values, the first one is selected.",
        "A use of the macro has the form %IDENT. Currently this use cannot be",
        "a subtree of another tree. This command must be a line of its own",
        "and thus cannot be a part of a pipe."
+       ],
+     examples = [
+       ("dt ex \"hello world\"                    -- define ex as string"),
+       ("dt ex UseN man_N                         -- define ex as string"),
+       ("dt ex < p -cat=NP \"the man in the car\" -- define ex as parse result"),
+       ("l -lang=LangSwe %ex | ps -to_utf8        -- linearize the tree ex")
        ] 
      }),
   ("e",  emptyCommandInfo {
diff --git a/src-3.0/GF/Command/Interpreter.hs b/src-3.0/GF/Command/Interpreter.hs
index 3e774a693..ee354bd45 100644
--- a/src-3.0/GF/Command/Interpreter.hs
+++ b/src-3.0/GF/Command/Interpreter.hs
@@ -3,6 +3,7 @@ module GF.Command.Interpreter (
   mkCommandEnv,
   emptyCommandEnv,
   interpretCommandLine,
+  interpretPipe,
   getCommandOp
   ) where
 
@@ -36,15 +37,17 @@ interpretCommandLine :: CommandEnv -> String -> IO ()
 interpretCommandLine env line =
   case readCommandLine line of
     Just []    -> return ()
-    Just pipes -> do res <- runInterruptibly (mapM_ interPipe pipes)
+    Just pipes -> do res <- runInterruptibly (mapM_ (interpretPipe env) pipes)
                      case res of
                        Left ex -> putStrLnFlush (show ex)
                        Right x -> return x
     Nothing    -> putStrLnFlush "command not parsed"
- where
-   interPipe cs = do
-     (_,s) <- intercs ([],"") cs
+
+interpretPipe env cs = do
+     v@(_,s) <- intercs ([],"") cs
      putStrLnFlush s
+     return v
+  where
    intercs treess [] = return treess
    intercs (trees,_) (c:cs) = do
      treess2 <- interc trees c
@@ -52,7 +55,7 @@ interpretCommandLine env line =
    interc es comm@(Command co _ arg) = case co of
      '%':f -> case Map.lookup f (commandmacros env) of
        Just css -> do
-         mapM_ interPipe (appLine (getCommandArg env arg es) css) 
+         mapM_ (interpretPipe env) (appLine (getCommandArg env arg es) css) 
          return ([],[]) ---- return ?
        _ -> do
          putStrLn $ "command macro " ++ co ++ " not interpreted"