- Solved Issue 2: Negative values are not handled

- Value now throws an exception if the wrong As*type*() is used

Jzon.cpp

@@ -236,10 +236,15 @@ namespace Jzon
 			return 0;
 		else
 		{
-			std::stringstream sstr(valueStr);
-			int val;
-			sstr >> val;
-			return val;
+			if (GetValueType() == VT_INT)
+			{
+				std::stringstream sstr(valueStr);
+				int val;
+				sstr >> val;
+				return val;
+			}
+			else
+				throw ValueException();
 		}
 	}
 	double Value::AsDouble() const
@@ -248,18 +253,26 @@ namespace Jzon
 			return 0.0;
 		else
 		{
-			std::stringstream sstr(valueStr);
-			double val;
-			sstr >> val;
-			return val;
+			if (GetValueType() == VT_DOUBLE)
+			{
+				std::stringstream sstr(valueStr);
+				double val;
+				sstr >> val;
+				return val;
+			}
+			else
+				throw ValueException();
 		}
 	}
 	bool Value::AsBool() const
 	{
 		if (IsNull())
 			return false;
 		else
-			return (valueStr == "true");
+			if (GetValueType() == VT_BOOL)
+				return (valueStr == "true");
+			else
+				throw ValueException();
 	}
 
 	void Value::SetNull()
@@ -383,7 +396,7 @@ namespace Jzon
 			{
 				char c = (*it);
 
-				if (c != '0' && c != '1' && c != '2' && c != '3' && c != '4' && c != '5' && c != '6' && c != '7' && c != '8' && c != '9' && c != '.')
+				if (c != '0' && c != '1' && c != '2' && c != '3' && c != '4' && c != '5' && c != '6' && c != '7' && c != '8' && c != '9' && c != '.' && c != '-')
 				{
 					onlyNumbers = false;
 				}

Jzon.h

@@ -48,6 +48,12 @@ namespace Jzon
 		TypeException() : std::exception("A Node was used as the wrong type")
 		{}
 	};
+	class ValueException : public std::exception
+	{
+	public:
+		ValueException() : std::exception("A Value was used as the wrong type")
+		{}
+	};
 
 	struct Format
 	{