msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

wf,vt,vp,vd,aw should store files in utf8

Browse Source
This commit is contained in:
krasimir
2010-04-28 17:37:53 +00:00
parent a59f2cd9fe
commit f3bee9fd36
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/compiler/GF/Command/Commands.hs
View File

@@ -155,7 +155,7 @@ allCommands env@(pgf, mos) = Map.fromList [
let file s = "_grph." ++ s
let view = optViewGraph opts
let format = optViewFormat opts
writeFile (file "dot") grph
writeUTF8File (file "dot") grph
system $ "dot -T" ++ format ++ " " ++ file "dot" ++ " > " ++ file format
system $ view ++ " " ++ file format
return void
@@ -737,7 +737,7 @@ allCommands env@(pgf, mos) = Map.fromList [
let file s = "_grphd." ++ s
let view = optViewGraph opts
let format = optViewFormat opts
writeFile (file "dot") grphs
writeUTF8File (file "dot") grphs
system $ "dot -T" ++ format ++ " " ++ file "dot" ++ " > " ++ file format
system $ view ++ " " ++ file format
return void
@@ -778,7 +778,7 @@ allCommands env@(pgf, mos) = Map.fromList [
let file s = "_grph." ++ s
let view = optViewGraph opts
let format = optViewFormat opts
writeFile (file "dot") grph
writeUTF8File (file "dot") grph
system $ "dot -T" ++ format ++ " " ++ file "dot" ++ " > " ++ file format
system $ view ++ " " ++ file format
return void
@@ -818,7 +818,7 @@ allCommands env@(pgf, mos) = Map.fromList [
let file s = "_grph." ++ s
let view = optViewGraph opts
let format = optViewFormat opts
writeFile (file "dot") grph
writeUTF8File (file "dot") grph
system $ "dot -T" ++ format ++ " " ++ file "dot" ++ " > " ++ file format
system $ view ++ " " ++ file format
return void
@@ -844,7 +844,7 @@ allCommands env@(pgf, mos) = Map.fromList [
let file = valStrOpts "file" "_gftmp" opts
if isOpt "append" opts
then appendFile file (toString arg)
else writeFile file (toString arg)
else writeUTF8File file (toString arg)
return void,
options = [
("append","append to file, instead of overwriting it")

7
src/compiler/GF/Infra/UseIO.hs
View File

@@ -184,3 +184,10 @@ putPointE v opts msg act = do
else when (verbAtLeast opts v) $ putStrLnE ""
return a
writeUTF8File :: FilePath -> String -> IO ()
writeUTF8File fpath content = do
h <- openFile fpath WriteMode
hSetEncoding h utf8
hPutStr h content
hClose h