Merge pull request andyburke#21 from crappygraphix/json-parse-long

andyburke · andyburke · commit 0b60deddbda1 · 2014-10-02T15:27:46.000-07:00
Added ability to parse long values.
diff --git a/external/JSON.cs b/external/JSON.cs
@@ -12,7 +12,7 @@
 /// Spec. details, see http://www.json.org/
 /// 
 /// JSON uses Arrays and Objects. These correspond here to the datatypes ArrayList and Hashtable.
-/// All numbers are parsed to floats or ints.
+/// All numbers are parsed to floats, ints, or longs.
 /// </summary>
 public class JSON
 {
@@ -279,11 +279,17 @@ protected static object ParseNumber (char[] json, ref int index, ref bool succes
  			success = float.TryParse (token, NumberStyles.Any, CultureInfo.InvariantCulture, out number);
  			return number;
  		}
- 		else
+ 		else if(token.Length <= 10)
  		{
  			int number;
  			success = int.TryParse(token, out number);
  			return number;
+ 		} 
+ 		else 
+ 		{
+ 			long number;
+ 			success = long.TryParse(token, out number);
+ 			return number;
  		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`/// Spec. details, see http://www.json.org/`
`13`	`13`	`///`
`14`	`14`	`/// JSON uses Arrays and Objects. These correspond here to the datatypes ArrayList and Hashtable.`
`15`		`-/// All numbers are parsed to floats or ints.`
	`15`	`+/// All numbers are parsed to floats, ints, or longs.`
`16`	`16`	`/// </summary>`
`17`	`17`	`public class JSON`
`18`	`18`	`{`
`@@ -279,11 +279,17 @@ protected static object ParseNumber (char[] json, ref int index, ref bool succes`
`279`	`279`	`success = float.TryParse (token, NumberStyles.Any, CultureInfo.InvariantCulture, out number);`
`280`	`280`	`return number;`
`281`	`281`	`}`
`282`		`- else`
	`282`	`+ else if(token.Length <= 10)`
`283`	`283`	`{`
`284`	`284`	`int number;`
`285`	`285`	`success = int.TryParse(token, out number);`
`286`	`286`	`return number;`
	`287`	`+ }`
	`288`	`+ else`
	`289`	`+ {`
	`290`	`+ long number;`
	`291`	`+ success = long.TryParse(token, out number);`
	`292`	`+ return number;`
`287`	`293`	`}`
`288`	`294`	`}`
`289`	`295`