Merge branch 'branch3.0'

stig · stig · commit 78d8838f3cb4 · 2011-07-27T22:37:34.000+08:00
diff --git a/Changes.md b/Changes.md
@@ -1,10 +1,14 @@
 # JSON Framework Changes
 
+## Version 3.0.2 (July 27th, 2011)
+
+* [Issue 88][#88]: Fix parsing of -0 into the integer 0.
+* [Issue 86][#86]: Make framework compile on Leopard.
+
 ## Version 3.0.1 (July 1st, 2011)
 
-* [Issue80][#80]: Kill memory leak reported by DinosaurDad.
+* [Issue 80][#80]: Kill memory leak reported by DinosaurDad.
 * Fix typo in Readme
-* Bump versions.
 
 ## Version 3.0 (June 18th, 2011)
 
diff --git a/Classes/SBJsonTokeniser.m b/Classes/SBJsonTokeniser.m
@@ -257,7 +257,11 @@ - (sbjson_token_t)getNumberToken:(NSObject**)token {
             return sbjson_token_eof;
     }
 
+    unsigned long long mantissa = 0;
+    int mantissa_length = 0;
+    
     if (ch == '0') {
+        mantissa_length++;
         if (![_stream getNextUnichar:&ch])
             return sbjson_token_eof;
 
@@ -267,9 +271,6 @@ - (sbjson_token_t)getNumberToken:(NSObject**)token {
         }
     }
 
-    unsigned long long mantissa = 0;
-    int mantissa_length = 0;
-
     while ([digits characterIsMember:ch]) {
         mantissa *= 10;
         mantissa += (ch - '0');
diff --git a/SBJson/SBJson-Info.plist b/SBJson/SBJson-Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.1</string>
+	<string>3.0.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/SBJsonTests/SBJsonTests-Info.plist b/SBJsonTests/SBJsonTests-Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.1</string>
+	<string>3.0.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Tests/Data/valid/number/integer/input b/Tests/Data/valid/number/integer/input
@@ -2,6 +2,7 @@
 -98877665544332211009988776655443322110,
 -1,
 0,
+-0,
 1,
 98877665544332211009988776655443322110
 ]
diff --git a/Tests/Data/valid/number/integer/output b/Tests/Data/valid/number/integer/output
@@ -1 +1 @@
-[-98877665544332211009988776655443322110,-1,0,1,98877665544332211009988776655443322110]
+[-98877665544332211009988776655443322110,-1,0,0,1,98877665544332211009988776655443322110]
diff --git a/sbjson-iosTests/sbjson-iosTests-Info.plist b/sbjson-iosTests/sbjson-iosTests-Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.1</string>
+	<string>3.0.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,11 @@ - (sbjson_token_t)getNumberToken:(NSObject**)token {`
`257`	`257`	`return sbjson_token_eof;`
`258`	`258`	`}`
`259`	`259`
	`260`	`+ unsigned long long mantissa = 0;`
	`261`	`+ int mantissa_length = 0;`
	`262`	`+`
`260`	`263`	`if (ch == '0') {`
	`264`	`+ mantissa_length++;`
`261`	`265`	`if (![_stream getNextUnichar:&ch])`
`262`	`266`	`return sbjson_token_eof;`
`263`	`267`
`@@ -267,9 +271,6 @@ - (sbjson_token_t)getNumberToken:(NSObject**)token {`
`267`	`271`	`}`
`268`	`272`	`}`
`269`	`273`
`270`		`- unsigned long long mantissa = 0;`
`271`		`- int mantissa_length = 0;`
`272`		`-`
`273`	`274`	`while ([digits characterIsMember:ch]) {`
`274`	`275`	`mantissa *= 10;`
`275`	`276`	`mantissa += (ch - '0');`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`-98877665544332211009988776655443322110,`
`3`	`3`	`-1,`
`4`	`4`	`0,`
	`5`	`+-0,`
`5`	`6`	`1,`
`6`	`7`	`98877665544332211009988776655443322110`
`7`	`8`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-[-98877665544332211009988776655443322110,-1,0,1,98877665544332211009988776655443322110]`
	`1`	`+[-98877665544332211009988776655443322110,-1,0,0,1,98877665544332211009988776655443322110]`