From 32f18b515e55f2e4bad42ffe8451e23437410bbc Mon Sep 17 00:00:00 2001 From: hallgren Date: Thu, 3 Sep 2015 20:42:38 +0000 Subject: [PATCH] GF shell: write_file now writes one tree per line This compensates for other changes that removed line breaks. Maybe it should have a -lines options like ps and rf? --- src/compiler/GF/Command/CommandInfo.hs | 2 +- src/compiler/GF/Command/CommonCommands.hs | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/compiler/GF/Command/CommandInfo.hs b/src/compiler/GF/Command/CommandInfo.hs index 1763e57c0..7d68f9221 100644 --- a/src/compiler/GF/Command/CommandInfo.hs +++ b/src/compiler/GF/Command/CommandInfo.hs @@ -49,7 +49,7 @@ void = Piped ([],"") stringAsExpr = H.ELit . H.LStr -- should be a pattern macro -- ** Converting command input -toString = unwords . toStrings + toStrings = map showAsString where showAsString t = case t of diff --git a/src/compiler/GF/Command/CommonCommands.hs b/src/compiler/GF/Command/CommonCommands.hs index 63dba526d..0037ba249 100644 --- a/src/compiler/GF/Command/CommonCommands.hs +++ b/src/compiler/GF/Command/CommonCommands.hs @@ -193,8 +193,8 @@ commonCommands = fmap (mapCommandExec liftSIO) $ Map.fromList [ exec = \opts arg-> do let file = valStrOpts "file" "_gftmp" opts if isOpt "append" opts - then restricted $ appendFile file (toString arg) - else restricted $ writeUTF8File file (toString arg) + then restricted $ appendFile file (toLines arg) + else restricted $ writeUTF8File file (toLines arg) return void, options = [ ("append","append to file, instead of overwriting it") @@ -259,3 +259,7 @@ trie = render . pptss . H.toTrie . map H.toATree H.Oth e -> pp (H.showExpr [] e) H.Ap f [[]] -> pp (H.showCId f) H.Ap f tss -> H.showCId f $$ nest 2 (pptss tss) + +-- ** Converting command input +toString = unwords . toStrings +toLines = unlines . toStrings \ No newline at end of file