From 0789403a4b4b23c83412f8b2efc13fbe1cd85875 Mon Sep 17 00:00:00 2001
From: Patrick Boettcher <patrick.boettcher@posteo.de>
Date: Sat, 24 Dec 2016 00:09:04 +0100
Subject: [PATCH] validator: items and additionalItems implemented

---
 README.md                     |  2 +-
 src/json-schema-validator.hpp | 60 ++++++++++++++++++++++++++++++++---
 2 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 89c12fb..64aefc3 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ int main(void)
 There is an application which can be used for testing the validator with the
 [JSON-Schema-Test-Suite](https://github.com/json-schema-org/JSON-Schema-Test-Suite).
 
-Currently **107** of ~**308** tests are still failing, because simply not all keywords and
+Currently **93** of ~**308** tests are still failing, because simply not all keywords and
 their functionalities have been implemented. Some of the missing feature will
 require a rework. Some will only work with external libraries. (remote references)
 
diff --git a/src/json-schema-validator.hpp b/src/json-schema-validator.hpp
index d15a11e..234420f 100644
--- a/src/json-schema-validator.hpp
+++ b/src/json-schema-validator.hpp
@@ -177,9 +177,6 @@ class json_validator
 
 	void validate_array(json &instance, const json &schema, const std::string &name)
 	{
-		not_yet_implemented(schema, "items", "array");
-		not_yet_implemented(schema, "additionalItems", "array");
-
 		validate_type(schema, "array", name);
 
 		// maxItems
@@ -205,11 +202,64 @@ class json_validator
 						throw std::out_of_range(name + " should have only unique items.");
 				}
 			}
+
+		// items and additionalItems
+		// default to empty schemas
+		auto items_iter = schema.find("items");
+		json items = {};
+		if (items_iter != schema.end())
+			items = items_iter.value();
+
+		auto additionalItems_iter = schema.find("additionalItems");
+		json additionalItems = {};
+		if (additionalItems_iter != schema.end())
+			additionalItems = additionalItems_iter.value();
+
+		size_t i = 0;
+		bool validation_done = false;
+
+		for (auto &value : instance) {
+			std::string sub_name = name + "[" + std::to_string(i) + "]";
+
+			switch (items.type()) {
+
+			case json::value_t::array:
+
+				if (i < items.size())
+					validate(value, items[i], sub_name);
+				else {
+					switch (additionalItems.type()) { // items is an array
+					                                  // we need to take into consideration additionalItems
+					case json::value_t::object:
+						validate(value, additionalItems, sub_name);
+						break;
+
+					case json::value_t::boolean:
+						if (additionalItems == false)
+							throw std::out_of_range("additional values in array are not allowed for " + sub_name);
+						else
+							validation_done = true;
+						break;
+
+					default:
+						break;
+					}
 				}
 
-				if (instance.size() != array_to_set.size())
-					throw std::out_of_range(name + " should have only unique items.");
+				break;
+
+			case json::value_t::object: // items is a schema
+				validate(value, items, sub_name);
+				break;
+
+			default:
+				break;
 			}
+			if (validation_done)
+				break;
+
+			i++;
+		}
 	}
 
 	void validate_object(json &instance, const json &schema, const std::string &name)