Replace stream-based dumping interface with an outputrange-based interface (#154)
Replace stream-based dumping interface with an outputrange-based interface merged-on-behalf-of: Cameron Ross <elpenguino@gmail.com>
This commit is contained in:
parent
8f9dafdef3
commit
8e0ca41eb5
17 changed files with 117 additions and 314 deletions
|
@ -14,5 +14,5 @@ void main()
|
|||
writeln("The answer is ", root["Answer"].as!int);
|
||||
|
||||
//Dump the loaded document to output.yaml.
|
||||
Dumper("output.yaml").dump(root);
|
||||
dumper(File("output.yaml", "w").lockingTextWriter).dump(root);
|
||||
}
|
||||
|
|
|
@ -47,7 +47,7 @@ void main()
|
|||
resolver.addImplicitResolver("!color", std.regex.regex("[0-9a-fA-F]{6}"),
|
||||
"0123456789abcdefABCDEF");
|
||||
|
||||
auto dumper = Dumper("output.yaml");
|
||||
auto dumper = dumper(File("output.yaml", "w").lockingTextWriter);
|
||||
dumper.representer = representer;
|
||||
dumper.resolver = resolver;
|
||||
|
||||
|
|
|
@ -119,7 +119,7 @@ void main(string[] args) //@safe
|
|||
{
|
||||
if(dump)
|
||||
{
|
||||
Dumper(file ~ ".dump").dump(nodes);
|
||||
dumper(File(file ~ ".dump", "w").lockingTextWriter).dump(nodes);
|
||||
}
|
||||
}
|
||||
void runGetBenchmark() @safe
|
||||
|
|
|
@ -297,15 +297,17 @@ void main(string[] args)
|
|||
//Generate and dump the nodes.
|
||||
Node[] generated = generate(configFile);
|
||||
|
||||
auto dumper = Dumper(args[1]);
|
||||
auto dumper = dumper(File(args[1], "w").lockingTextWriter);
|
||||
auto encoding = config["encoding"];
|
||||
dumper.encoding = encoding == "utf-16" ? Encoding.UTF_16:
|
||||
encoding == "utf-32" ? Encoding.UTF_32:
|
||||
Encoding.UTF_8;
|
||||
|
||||
dumper.indent = config["indent"].as!uint;
|
||||
dumper.textWidth = config["text-width"].as!uint;
|
||||
dumper.dump(generated);
|
||||
switch(encoding.as!string)
|
||||
{
|
||||
case "utf-16": dumper.dump!wchar(generated); break;
|
||||
case "utf-32": dumper.dump!dchar(generated); break;
|
||||
default: dumper.dump!char(generated); break;
|
||||
}
|
||||
}
|
||||
catch(YAMLException e)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue