Skip to content
Browse files

Merge branch 'branch3.0'

  • Loading branch information...
2 parents a885564 + 4be3143 commit 78d8838f3cb4e6e4359e5f98826b72cd7097c05b @stig committed Jul 27, 2011
View
8 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)
View
7 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');
View
2 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>
View
2 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>
View
1 Tests/Data/valid/number/integer/input
@@ -2,6 +2,7 @@
-98877665544332211009988776655443322110,
-1,
0,
+-0,
1,
98877665544332211009988776655443322110
]
View
2 Tests/Data/valid/number/integer/output
@@ -1 +1 @@
-[-98877665544332211009988776655443322110,-1,0,1,98877665544332211009988776655443322110]
+[-98877665544332211009988776655443322110,-1,0,0,1,98877665544332211009988776655443322110]
View
2 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>

0 comments on commit 78d8838

Please sign in to comment.
Something went wrong with that request. Please try again.