From 5c7bd4c5c7e251d4205398207467aa5e2d02eb33 Mon Sep 17 00:00:00 2001 From: aarne Date: Sat, 24 Feb 2007 09:16:30 +0000 Subject: [PATCH] cc output as pipable string --- lib/resource-1.0/german/ParadigmsGer.gf | 2 +- src/GF/Shell.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/resource-1.0/german/ParadigmsGer.gf b/lib/resource-1.0/german/ParadigmsGer.gf index 1fe5c3f31..f0b96e016 100644 --- a/lib/resource-1.0/german/ParadigmsGer.gf +++ b/lib/resource-1.0/german/ParadigmsGer.gf @@ -155,7 +155,7 @@ oper -- - 2p sg imperative, -- - 1/3p sg imperfect indicative, -- - 1/3p sg imperfect subjunctive (because this uncommon form can have umlaut) --- - the perfect participle +-- - the perfect participle -- -- mkV : (x1,_,_,_,_,x6 : Str) -> V ; -- geben, gibt, gib, gab, gäbe, gegeben diff --git a/src/GF/Shell.hs b/src/GF/Shell.hs index 19394855e..29a4b6c23 100644 --- a/src/GF/Shell.hs +++ b/src/GF/Shell.hs @@ -380,11 +380,11 @@ execC co@(comm, opts0) sa@(sh@(st,(h,_,_,_)),a) = checkOptions st co >> case com maybe (I.identC "?") id $ -- meaningful if no opers in t maybe (resourceOfShellState st) (return . I.identC) $ -- topmost res getOptVal opts useResource -- flag -res=m - justOutput opts (putStrLn (err id (prin . stripTerm) ( + returnArg (AString (err id (prin . stripTerm) ( string2srcTerm src m t >>= Ch.justCheckLTerm src >>= Co.computeConcrete src))) sa ---- Co.computeConcreteRec src))) sa +--- Co.computeConcreteRec src)) sa CShowOpers t -> do m <- return $ maybe (I.identC "?") id $ -- meaningful if no opers in t