generic-library/valijson
1
0
Fork 0
mirror of https://github.com/tristanpenman/valijson.git synced 2025-03-03 12:58:03 +01:00
Code Issues Projects Releases Wiki Activity

Fix instances in schema_parser.hpp that should use maybe*

Browse Source
This commit is contained in:
Daniel D'Avella 2018-08-28 14:46:36 -04:00
parent c2f22fddf5
commit d23f4047ed
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/valijson/schema_parser.hpp
View File

@ -1985,7 +1985,7 @@ private:
constraints::RequiredConstraint constraint;
for (const AdapterType v : node.getArray()) {
if (!v.isString()) {
if (!v.maybeString()) {
throw std::runtime_error("Expected required property name to "
"be a string value");
}
@ -2028,7 +2028,7 @@ private:
TypeConstraint constraint;
if (node.isString()) {
if (node.maybeString()) {
const TypeConstraint::JsonType type =
TypeConstraint::jsonTypeFromString(node.getString());
@ -2039,10 +2039,10 @@ private:
constraint.addNamedType(type);
} else if (node.isArray()) {
} else if (node.maybeArray()) {
int index = 0;
for (const AdapterType v : node.getArray()) {
if (v.isString()) {
if (v.maybeString()) {
const TypeConstraint::JsonType type =
TypeConstraint::jsonTypeFromString(v.getString());
@ -2054,7 +2054,7 @@ private:
constraint.addNamedType(type);
} else if (v.isObject() && version == kDraft3) {
} else if (v.maybeObject() && version == kDraft3) {
const std::string childPath = nodePath + "/" +
std::to_string(index);
const Subschema *subschema = makeOrReuseSchema<AdapterType>(
@ -2069,7 +2069,7 @@ private:
index++;
}
} else if (node.isObject() && version == kDraft3) {
} else if (node.maybeObject() && version == kDraft3) {
const Subschema *subschema = makeOrReuseSchema<AdapterType>(
rootSchema, rootNode, node, currentScope, nodePath,
fetchDoc, NULL, NULL, docCache, schemaCache);