make Loader interface a bit more consistent (#124)
make Loader interface a bit more consistent merged-on-behalf-of: BBasile <BBasile@users.noreply.github.com>
This commit is contained in:
parent
a20d7143e7
commit
a0ac38fbd7
19 changed files with 94 additions and 74 deletions
|
@ -78,7 +78,7 @@ void main()
|
|||
constructor.addConstructorScalar("!color", &constructColorScalar);
|
||||
constructor.addConstructorMapping("!color-mapping", &constructColorMapping);
|
||||
|
||||
auto loader = Loader("input.yaml");
|
||||
auto loader = Loader.fromFile("input.yaml");
|
||||
loader.constructor = constructor;
|
||||
|
||||
auto root = loader.load();
|
||||
|
|
|
@ -4,7 +4,7 @@ import dyaml;
|
|||
void main()
|
||||
{
|
||||
//Read the input.
|
||||
Node root = Loader("input.yaml").load();
|
||||
Node root = Loader.fromFile("input.yaml").load();
|
||||
|
||||
//Display the data read.
|
||||
foreach(string word; root["Hello World"])
|
||||
|
|
|
@ -83,7 +83,7 @@ void main()
|
|||
resolver.addImplicitResolver("!color", std.regex.regex("[0-9a-fA-F]{6}"),
|
||||
"0123456789abcdefABCDEF");
|
||||
|
||||
auto loader = Loader("input.yaml");
|
||||
auto loader = Loader.fromFile("input.yaml");
|
||||
loader.constructor = constructor;
|
||||
loader.resolver = resolver;
|
||||
|
||||
|
|
|
@ -104,7 +104,7 @@ void main(string[] args) //@safe
|
|||
else { fileWorkingCopy[] = fileInMemory[]; }
|
||||
void[] fileToLoad = reload ? fileInMemory : fileWorkingCopy;
|
||||
|
||||
auto loader = Loader(fileToLoad);
|
||||
auto loader = Loader.fromBuffer(fileToLoad);
|
||||
if(scanOnly)
|
||||
{
|
||||
loader.scanBench();
|
||||
|
|
|
@ -264,7 +264,7 @@ Node generateNode(const string type, bool root = false)
|
|||
|
||||
Node[] generate(const string configFileName)
|
||||
{
|
||||
config = Loader(configFileName).load();
|
||||
config = Loader.fromFile(configFileName).load();
|
||||
|
||||
minNodesDocument = config["min-nodes-per-document"].as!long;
|
||||
|
||||
|
|
|
@ -90,7 +90,7 @@ void main(string[] args)
|
|||
writeln("------------------------------------------------------------");
|
||||
try
|
||||
{
|
||||
auto loader = Loader(file);
|
||||
auto loader = Loader.fromFile(file);
|
||||
|
||||
size_t idx = 0;
|
||||
foreach(ref document; loader)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue