From 10dbb55ed8f789b54b7390a8bd9b79c4d335c033 Mon Sep 17 00:00:00 2001 From: Ferdinand Majerech Date: Fri, 18 Nov 2011 12:28:29 +0100 Subject: [PATCH] Minor documentation and API fixes. --- doc/doctrees/environment.pickle | Bin 12705 -> 12705 bytes doc/html/api/dyaml.node.html | 10 ---------- doc/html/api/dyaml.resolver.html | 8 ++++---- doc/html/articles/spec_differences.html | 2 +- doc/html/index.html | 2 +- doc/html/search.html | 2 +- doc/html/tutorials/custom_types.html | 2 +- doc/html/tutorials/getting_started.html | 2 +- doc/html/tutorials/yaml_syntax.html | 2 +- dyaml/node.d | 4 ++-- dyaml/resolver.d | 8 ++++---- 11 files changed, 16 insertions(+), 26 deletions(-) diff --git a/doc/doctrees/environment.pickle b/doc/doctrees/environment.pickle index 5abd626d2511e19827e35b507d2010d071007127..62f0768d577ce8556c445bddcae74f7a8bc1046a 100644 GIT binary patch delta 62 zcmZ3OyfAq~o4(-$&&ySY8OrXCmp4xEJmMIhp#x!_+bNu33SpjX>B+EzFptZ;-@IM_ G6(az8T^$hs delta 62 zcmZ3OyfAq~o4#T4t2+C68OrXCmp3NAD&tt4p#x!7$IQzxg)l2EGc)X<3ZA!Z-md?O F5dfW99xVU> diff --git a/doc/html/api/dyaml.node.html b/doc/html/api/dyaml.node.html index 1b55f6b..a991ebd 100644 --- a/doc/html/api/dyaml.node.html +++ b/doc/html/api/dyaml.node.html @@ -92,16 +92,6 @@ - -
package ScalarStyle scalarStyle; -
-

Node scalar style. Used to remember style this node was loaded with.

- -
-
package CollectionStyle collectionStyle; -
-

Node collection style. Used to remember style this node was loaded with.

-
this(T)(T value, in string tag = null);
diff --git a/doc/html/api/dyaml.resolver.html b/doc/html/api/dyaml.resolver.html index 91f5d4f..3cc3f2d 100644 --- a/doc/html/api/dyaml.resolver.html +++ b/doc/html/api/dyaml.resolver.html @@ -53,7 +53,7 @@

Can be used to implicitly resolve custom data types of scalar values.

-
this(in const(bool) defaultImplicitResolvers = true); +
this(bool defaultImplicitResolvers = true);

Construct a Resolver.

@@ -61,12 +61,12 @@ you can use defaultImplicitResolvers to disable default resolvers.

-Parameters:
+Parameters:
const(bool) defaultImplicitResolvers
bool defaultImplicitResolvers Use default YAML implicit resolvers?
-
void addImplicitResolver(string tag, Regex!(char) regexp, in string first); +
void addImplicitResolver(string tag, Regex!(char) regexp, string first);

Add an implicit scalar resolver.

@@ -97,7 +97,7 @@ { auto loader = Loader("file.txt"); auto resolver = new Resolver(); - resolver.addImplicitResolver("!tag", std.regex.regex("A*"), "A"); + resolver.addImplicitResolver("!tag", std.regex.regex("A.*"), "A"); loader.resolver = resolver; //Note that we have no constructor from tag "!tag", so we can't diff --git a/doc/html/articles/spec_differences.html b/doc/html/articles/spec_differences.html index eaff95f..10219d9 100644 --- a/doc/html/articles/spec_differences.html +++ b/doc/html/articles/spec_differences.html @@ -138,7 +138,7 @@ struct appears in Phobos.

© Copyright 2011, Ferdinand Majerech. Based on PyYAML http://www.pyyaml.org by Kirill Simonov. - Last updated on Nov 17, 2011. + Last updated on Nov 18, 2011. Created using Sphinx 1.0.7.
diff --git a/doc/html/index.html b/doc/html/index.html index e50c9f3..394af19 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -104,7 +104,7 @@
© Copyright 2011, Ferdinand Majerech. Based on PyYAML http://www.pyyaml.org by Kirill Simonov. - Last updated on Nov 17, 2011. + Last updated on Nov 18, 2011. Created using Sphinx 1.0.7.
diff --git a/doc/html/search.html b/doc/html/search.html index bd5a860..6dcbd2b 100644 --- a/doc/html/search.html +++ b/doc/html/search.html @@ -87,7 +87,7 @@
© Copyright 2011, Ferdinand Majerech. Based on PyYAML http://www.pyyaml.org by Kirill Simonov. - Last updated on Nov 17, 2011. + Last updated on Nov 18, 2011. Created using Sphinx 1.0.7.
diff --git a/doc/html/tutorials/custom_types.html b/doc/html/tutorials/custom_types.html index ebf6387..fe96d63 100644 --- a/doc/html/tutorials/custom_types.html +++ b/doc/html/tutorials/custom_types.html @@ -364,7 +364,7 @@ directory of the D:YAML package.

© Copyright 2011, Ferdinand Majerech. Based on PyYAML http://www.pyyaml.org by Kirill Simonov. - Last updated on Nov 17, 2011. + Last updated on Nov 18, 2011. Created using Sphinx 1.0.7.
diff --git a/doc/html/tutorials/getting_started.html b/doc/html/tutorials/getting_started.html index 8358077..43d7eb3 100644 --- a/doc/html/tutorials/getting_started.html +++ b/doc/html/tutorials/getting_started.html @@ -237,7 +237,7 @@ example in the example/getting_st
© Copyright 2011, Ferdinand Majerech. Based on PyYAML http://www.pyyaml.org by Kirill Simonov. - Last updated on Nov 17, 2011. + Last updated on Nov 18, 2011. Created using Sphinx 1.0.7.
diff --git a/doc/html/tutorials/yaml_syntax.html b/doc/html/tutorials/yaml_syntax.html index 14f48a9..255c713 100644 --- a/doc/html/tutorials/yaml_syntax.html +++ b/doc/html/tutorials/yaml_syntax.html @@ -330,7 +330,7 @@ Some of these might change in the future (especially !!map and !!set).

© Copyright 2011, Ferdinand Majerech. Based on PyYAML http://www.pyyaml.org by Kirill Simonov. - Last updated on Nov 17, 2011. + Last updated on Nov 18, 2011. Created using Sphinx 1.0.7.
diff --git a/dyaml/node.d b/dyaml/node.d index 054252b..b38f182 100644 --- a/dyaml/node.d +++ b/dyaml/node.d @@ -180,9 +180,9 @@ struct Node package: //Tag of the node. Tag tag_; - ///Node scalar style. Used to remember style this node was loaded with. + //Node scalar style. Used to remember style this node was loaded with. ScalarStyle scalarStyle = ScalarStyle.Invalid; - ///Node collection style. Used to remember style this node was loaded with. + //Node collection style. Used to remember style this node was loaded with. CollectionStyle collectionStyle = CollectionStyle.Invalid; public: diff --git a/dyaml/resolver.d b/dyaml/resolver.d index ba3327d..d83807a 100644 --- a/dyaml/resolver.d +++ b/dyaml/resolver.d @@ -61,7 +61,7 @@ final class Resolver * * Params: defaultImplicitResolvers = Use default YAML implicit resolvers? */ - this(in bool defaultImplicitResolvers = true) + this(bool defaultImplicitResolvers = true) { defaultScalarTag_ = Tag("tag:yaml.org,2002:str"); defaultSequenceTag_ = Tag("tag:yaml.org,2002:seq"); @@ -104,7 +104,7 @@ final class Resolver * { * auto loader = Loader("file.txt"); * auto resolver = new Resolver(); - * resolver.addImplicitResolver("!tag", std.regex.regex("A*"), "A"); + * resolver.addImplicitResolver("!tag", std.regex.regex("A.*"), "A"); * loader.resolver = resolver; * * //Note that we have no constructor from tag "!tag", so we can't @@ -115,7 +115,7 @@ final class Resolver * } * -------------------- */ - void addImplicitResolver(string tag, Regex!char regexp, in string first) + void addImplicitResolver(string tag, Regex!char regexp, string first) { foreach(const dchar c; first) { @@ -141,7 +141,7 @@ final class Resolver * * Returns: Resolved tag. */ - Tag resolve(in NodeID kind, Tag tag, string value, in bool implicit) + Tag resolve(NodeID kind, Tag tag, string value, bool implicit) { if(!tag.isNull() && tag.get() != "!"){return tag;}