Merge branch 'develop'

5cript · 5cript · commit 4f6e2f91ccde · 2015-11-15T22:07:07.000+01:00
diff --git a/parse/jsd_array.h b/parse/jsd_array.h
@@ -13,7 +13,8 @@ namespace JSON
 	{
 		try
 		{
-			auto pt = object.tree.get_child(name);
+		    GET_CHILD(name, pt, {});
+
 			int pos = 0;
 			for (auto const& i : pt)
 			{
diff --git a/parse/jsd_container.h b/parse/jsd_container.h
@@ -11,7 +11,7 @@ namespace JSON
 	{
 		try
 		{
-			auto pt = object.tree.get_child(name);
+			GET_CHILD(name, pt, {});
 			for (auto const& i : pt)
 			{
 				T temp;
diff --git a/parse/jsd_core.h b/parse/jsd_core.h
@@ -9,6 +9,51 @@
 
 namespace JSON
 {
+    #define GET_VALUE(TYPE, NAME, TEMP, TAG_VALUE) \
+    if (options.invalidPathHandler == InvalidPathHandlingBehaviour::IGNORE_ALL_ERROR || \
+        options.invalidPathHandler == InvalidPathHandlingBehaviour::TAG) \
+    { \
+        value = {}; \
+        auto opt = object.tree.get_optional <TYPE> (NAME); \
+        if (!opt) { \
+            if (options.invalidPathHandler == InvalidPathHandlingBehaviour::IGNORE_ALL_ERROR) \
+                return; \
+            else { \
+                value = TAG_VALUE; \
+                return; \
+            } \
+        } \
+        TEMP = opt.get(); \
+    } \
+    else \
+    { \
+        TEMP = object.tree.get <TYPE> (NAME); \
+    }
+    // MAKRO END
+
+    #define GET_CHILD(NAME, RESULT, TAG_VALUE) \
+    decltype(object.tree) RESULT;\
+    if (options.invalidPathHandler == InvalidPathHandlingBehaviour::IGNORE_ALL_ERROR || \
+        options.invalidPathHandler == InvalidPathHandlingBehaviour::TAG) \
+    { \
+        value = {}; \
+        auto opt = object.tree.get_child_optional (NAME); \
+        if (!opt) { \
+            if (options.invalidPathHandler == InvalidPathHandlingBehaviour::IGNORE_ALL_ERROR) \
+                return; \
+            else { \
+                value = TAG_VALUE; \
+                return; \
+            } \
+        } \
+        RESULT = opt.get(); \
+    } \
+    else \
+    { \
+        RESULT = object.tree.get_child (NAME); \
+    }
+    // MAKRO END
+
     #define DEFAULT_PROPERTY_ERROR_HANDLER(DEFAULT_VALUE, TAG_VALUE)		\
 	switch (options.invalidPropertyHandler) {								\
 		case (InvalidPropertyHandlingBehaviour::DEFAULT):		\
@@ -23,7 +68,7 @@ namespace JSON
 			throw exc;											\
 		default:												\
 			return;												\
-	}															\
+	}
 	// MAKRO END
 
 	#define DEFAULT_PATH_ERROR_HANDLER(DEFAULT_VALUE, TAG_VALUE)		\
@@ -40,7 +85,7 @@ namespace JSON
 			throw exc;											\
 		default:												\
 			return;												\
-	}															\
+	}
 	// MAKRO END
 }
 
diff --git a/parse/jsd_fundamental.cpp b/parse/jsd_fundamental.cpp
@@ -10,11 +10,11 @@ namespace JSON
     {
         try
         {
-            std::string s = object.tree.get<std::string>(name);
+            std::string s;
+            GET_VALUE(std::string, name, s, char());
+
             if (!s.empty())
                 value = s[0];
-            else
-                value = char();
         }
 		catch (boost::property_tree::ptree_bad_data& exc)
 		{
@@ -30,11 +30,11 @@ namespace JSON
     {
         try
         {
-            std::string s = object.tree.get<std::string>(name);
+            std::string s;
+            GET_VALUE(std::string, name, s, wchar_t());
+
             if (!s.empty())
                 value = s[0];
-            else
-                value = wchar_t();
         }
 		catch (boost::property_tree::ptree_bad_data& exc)
 		{
diff --git a/parse/jsd_fundamental.h b/parse/jsd_fundamental.h
@@ -14,7 +14,7 @@ namespace JSON
 	{
 		try
 		{
-			value = object.tree.get<T>(name);
+		    GET_VALUE(T, name, value, T());
 		}
 		catch (boost::property_tree::ptree_bad_data& exc)
 		{
diff --git a/parse/jsd_map.h b/parse/jsd_map.h
@@ -11,7 +11,7 @@ namespace JSON
 	{
 		try
 		{
-			auto pt = object.tree.get_child(name);
+			GET_CHILD(name, pt, (std::map<std::string, ValueT>()));
 			for (auto const& i : pt)
 			{
 				ValueT temp;
diff --git a/parse/jsd_options.h b/parse/jsd_options.h
@@ -29,7 +29,12 @@ namespace JSON
                        InvalidPathHandlingBehaviour invalidPathHandler = InvalidPathHandlingBehaviour::TAG);
 	};
 
-	#define DEFAULT_PARSER_OPTIONS ParsingOptions{}
+	const auto DefaultParserOptions = ParsingOptions{};
+	const auto IngoreErrorsParserOptions = ParsingOptions{InvalidPropertyHandlingBehaviour::IGNORE_ALL_ERROR, InvalidPathHandlingBehaviour::IGNORE_ALL_ERROR};
+	const auto IgnoreMissingParserOptions = ParsingOptions{InvalidPropertyHandlingBehaviour::THROW, InvalidPathHandlingBehaviour::IGNORE_ALL_ERROR};
+	const auto TagMissingParserOptions = ParsingOptions{InvalidPropertyHandlingBehaviour::THROW, InvalidPathHandlingBehaviour::TAG};
+
+	#define DEFAULT_PARSER_OPTIONS DefaultParserOptions
 }
 
 #endif
diff --git a/parse/jsd_pair.h b/parse/jsd_pair.h
@@ -11,8 +11,8 @@ namespace JSON
 	{
 		try
 		{
-			value.first = object.tree.get<T>(name+".first");
-			value.second = object.tree.get<U>(name+".second");
+		    GET_VALUE(T, name+".first", value.first, std::make_pair(T(), U()));
+		    GET_VALUE(T, name+".second", value.second, std::make_pair(T(), U()));
 		}
 		catch (boost::property_tree::ptree_bad_data& exc)
 		{
diff --git a/parse/jsd_set.h b/parse/jsd_set.h
@@ -14,7 +14,7 @@ namespace JSON
 	{
 		try
 		{
-			auto pt = object.tree.get_child(name);
+			GET_CHILD(name, pt, std::set<T>{});
 			for (auto const& i : pt)
 			{
 				T temp;
diff --git a/parse/jsd_string.cpp b/parse/jsd_string.cpp
@@ -7,7 +7,7 @@ void parse(std::string& value, std::string const& name,
 {
     try
     {
-        value = object.tree.get<std::string>(name);
+        GET_VALUE(std::string, name, value, "<undefined>");
     }
     catch (boost::property_tree::ptree_bad_data& exc)
     {
diff --git a/utility/base64.h b/utility/base64.h
@@ -83,7 +83,7 @@ namespace JSON
 		size_type size() const { return binary_.size(); }
 		size_type max_size() const noexcept { return binary_.max_size(); }
 		bool empty() const { return binary_.empty(); }
-		
+
 		void push_back(value_type const& v) { binary_.push_back(v); }
 		void pop_back() { binary_.pop_back(); }
 		void clear() noexcept { binary_.clear(); }
@@ -150,7 +150,7 @@ namespace JSON
     template <typename CharType, template <typename T, typename = std::allocator <T> > class ContainerT>
     void decodeBase64(std::string const& input, ContainerT <CharType>& bytes)
     {
-		static CharType const table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+		// static CharType const table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
 
         bytes.clear();
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@ namespace JSON`
`13`	`13`	`{`
`14`	`14`	`try`
`15`	`15`	`{`
`16`		`- auto pt = object.tree.get_child(name);`
	`16`	`+ GET_CHILD(name, pt, {});`
	`17`	`+`
`17`	`18`	`int pos = 0;`
`18`	`19`	`for (auto const& i : pt)`
`19`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace JSON`
`11`	`11`	`{`
`12`	`12`	`try`
`13`	`13`	`{`
`14`		`- auto pt = object.tree.get_child(name);`
	`14`	`+ GET_CHILD(name, pt, {});`
`15`	`15`	`for (auto const& i : pt)`
`16`	`16`	`{`
`17`	`17`	`T temp;`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,11 @@ namespace JSON`
`10`	`10`	`{`
`11`	`11`	`try`
`12`	`12`	`{`
`13`		`- std::string s = object.tree.get<std::string>(name);`
	`13`	`+ std::string s;`
	`14`	`+ GET_VALUE(std::string, name, s, char());`
	`15`	`+`
`14`	`16`	`if (!s.empty())`
`15`	`17`	`value = s[0];`
`16`		`- else`
`17`		`- value = char();`
`18`	`18`	`}`
`19`	`19`	`catch (boost::property_tree::ptree_bad_data& exc)`
`20`	`20`	`{`
`@@ -30,11 +30,11 @@ namespace JSON`
`30`	`30`	`{`
`31`	`31`	`try`
`32`	`32`	`{`
`33`		`- std::string s = object.tree.get<std::string>(name);`
	`33`	`+ std::string s;`
	`34`	`+ GET_VALUE(std::string, name, s, wchar_t());`
	`35`	`+`
`34`	`36`	`if (!s.empty())`
`35`	`37`	`value = s[0];`
`36`		`- else`
`37`		`- value = wchar_t();`
`38`	`38`	`}`
`39`	`39`	`catch (boost::property_tree::ptree_bad_data& exc)`
`40`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ namespace JSON`
`14`	`14`	`{`
`15`	`15`	`try`
`16`	`16`	`{`
`17`		`- value = object.tree.get<T>(name);`
	`17`	`+ GET_VALUE(T, name, value, T());`
`18`	`18`	`}`
`19`	`19`	`catch (boost::property_tree::ptree_bad_data& exc)`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ namespace JSON`
`11`	`11`	`{`
`12`	`12`	`try`
`13`	`13`	`{`
`14`		`- value.first = object.tree.get<T>(name+".first");`
`15`		`- value.second = object.tree.get<U>(name+".second");`
	`14`	`+ GET_VALUE(T, name+".first", value.first, std::make_pair(T(), U()));`
	`15`	`+ GET_VALUE(T, name+".second", value.second, std::make_pair(T(), U()));`
`16`	`16`	`}`
`17`	`17`	`catch (boost::property_tree::ptree_bad_data& exc)`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ void parse(std::string& value, std::string const& name,`
`7`	`7`	`{`
`8`	`8`	`try`
`9`	`9`	`{`
`10`		`- value = object.tree.get<std::string>(name);`
	`10`	`+ GET_VALUE(std::string, name, value, "<undefined>");`
`11`	`11`	`}`
`12`	`12`	`catch (boost::property_tree::ptree_bad_data& exc)`
`13`	`13`	`{`