From 6c0620a90b0b708e62ce6a339ca57ce0d01db986 Mon Sep 17 00:00:00 2001 From: Patrick Boettcher Date: Tue, 27 Dec 2016 00:42:56 +0100 Subject: [PATCH] validator: check unimplemented keyword after resolve nested schemas --- src/json-validator.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/json-validator.cpp b/src/json-validator.cpp index 5f5d6fa..3862bf4 100644 --- a/src/json-validator.cpp +++ b/src/json-validator.cpp @@ -538,11 +538,6 @@ void json_validator::validate_object(json &instance, const json &schema, const s void json_validator::validate(json &instance, const json &schema_, const std::string &name) { - not_yet_implemented(schema_, "allOf", "all"); - not_yet_implemented(schema_, "anyOf", "all"); - not_yet_implemented(schema_, "oneOf", "all"); - not_yet_implemented(schema_, "not", "all"); - const json *schema = &schema_; do { @@ -558,6 +553,11 @@ void json_validator::validate(json &instance, const json &schema_, const std::st break; } while (1); // loop in case of nested refs + not_yet_implemented(*schema, "allOf", "all"); + not_yet_implemented(*schema, "anyOf", "all"); + not_yet_implemented(*schema, "oneOf", "all"); + not_yet_implemented(*schema, "not", "all"); + validate_enum(instance, *schema, name); switch (instance.type()) {