From f3b02ad279109238f63f17e6c0054df726d7b43c Mon Sep 17 00:00:00 2001 From: krasimir Date: Wed, 13 May 2009 06:49:37 +0000 Subject: [PATCH] in command 'ai' send the output through the pipe --- src/GF/Command/Commands.hs | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/GF/Command/Commands.hs b/src/GF/Command/Commands.hs index 6891b45b0..fff9e011d 100644 --- a/src/GF/Command/Commands.hs +++ b/src/GF/Command/Commands.hs @@ -600,18 +600,21 @@ allCommands cod env@(pgf, mos) = Map.fromList [ exec = \opts arg -> do case arg of [Fun id []] -> case Map.lookup id (funs (abstract pgf)) of - Just (ty,def) -> putStrLn (render (text "fun" <+> text (prCId id) <+> colon <+> ppType 0 ty $$ - if def == EEq [] - then empty - else text "def" <+> text (prCId id) <+> char '=' <+> ppExpr 0 def)) + Just (ty,def) -> return $ fromString $ + render (text "fun" <+> text (prCId id) <+> colon <+> ppType 0 ty $$ + if def == EEq [] + then empty + else text "def" <+> text (prCId id) <+> char '=' <+> ppExpr 0 def) Nothing -> case Map.lookup id (cats (abstract pgf)) of - Just hyps -> putStrLn (render (text "cat" <+> text (prCId id) <+> hsep (map ppHypo hyps) $$ - space $$ - text "fun" <+> vcat [text (prCId fid) <+> colon <+> ppType 0 ty - | (fid,ty) <- functionsToCat pgf id])) - Nothing -> putStrLn "unknown identifier" - _ -> putStrLn "a single identifier is expected from the command" - return void + Just hyps -> do return $ fromString $ + render (text "cat" <+> text (prCId id) <+> hsep (map ppHypo hyps) $$ + space $$ + text "fun" <+> vcat [text (prCId fid) <+> colon <+> ppType 0 ty + | (fid,ty) <- functionsToCat pgf id]) + Nothing -> do putStrLn "unknown identifier" + return void + _ -> do putStrLn "a single identifier is expected from the command" + return void }) ] where