2c9d464389
After experiments with loading the whole file at once, and with decoding and parsing in separate thread, lazy reader turned to be the fastest/least memory intensive solution. Characters are now decoded in small batches. This improved parsing speed by ~20%. No global state anymore. Anchors are now zero terminated strings and TagDirectives are a simple array. Event structure was changed to prevent size increase. Minor fixes and improvements.
73 lines
2.1 KiB
D
73 lines
2.1 KiB
D
|
|
// Copyright Ferdinand Majerech 2011.
|
|
// Distributed under the Boost Software License, Version 1.0.
|
|
// (See accompanying file LICENSE_1_0.txt or copy at
|
|
// http://www.boost.org/LICENSE_1_0.txt)
|
|
|
|
module dyaml.testcompare;
|
|
|
|
|
|
import dyaml.testcommon;
|
|
import dyaml.token;
|
|
|
|
|
|
/**
|
|
* Test parser by comparing output from parsing two equivalent YAML files.
|
|
*
|
|
* Params: verbose = Print verbose output?
|
|
* dataFilename = YAML file to parse.
|
|
* canonicalFilename = Another file to parse, in canonical YAML format.
|
|
*/
|
|
void testParser(bool verbose, string dataFilename, string canonicalFilename)
|
|
{
|
|
auto dataEvents = Loader(dataFilename).parse();
|
|
auto canonicalEvents = Loader(canonicalFilename).parse();
|
|
|
|
assert(dataEvents.length == canonicalEvents.length);
|
|
|
|
|
|
foreach(e; 0 .. dataEvents.length)
|
|
{
|
|
assert(dataEvents[e].id == canonicalEvents[e].id);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
* Test loader by comparing output from loading two equivalent YAML files.
|
|
*
|
|
* Params: verbose = Print verbose output?
|
|
* dataFilename = YAML file to load.
|
|
* canonicalFilename = Another file to load, in canonical YAML format.
|
|
*/
|
|
void testLoader(bool verbose, string dataFilename, string canonicalFilename)
|
|
{
|
|
auto data = Loader(dataFilename).loadAll();
|
|
auto canonical = Loader(canonicalFilename).loadAll();
|
|
|
|
assert(data.length == canonical.length, "Unequal node count");
|
|
foreach(n; 0 .. data.length)
|
|
{
|
|
if(data[n] != canonical[n])
|
|
{
|
|
if(verbose)
|
|
{
|
|
writeln("Normal value:");
|
|
writeln(data[n].debugString);
|
|
writeln("\n");
|
|
writeln("Canonical value:");
|
|
writeln(canonical[n].debugString);
|
|
}
|
|
assert(false, "testLoader(" ~ dataFilename ~ ", " ~ canonicalFilename ~ ") failed");
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
unittest
|
|
{
|
|
writeln("D:YAML comparison unittest");
|
|
run("testParser", &testParser, ["data", "canonical"]);
|
|
run("testLoader", &testLoader, ["data", "canonical"], ["test_loader_skip"]);
|
|
}
|