| 609fe74db289d078960f19f4c18c1660e299570e |
06-Apr-2010 |
Jesse Wilson <jessewilson@google.com> |
Adding support for hash '#' comments to our JSON parser.
Neither the JSON RFC nor the documentation of Crockford's
implementation mention these comments, but somehow the
old parser used to support these. And so we shall also.
See bug 2571423.
Change-Id: I77d64c5ec53278d8df5fe1873404f1241320504b
ain/java/org/json/JSONTokener.java
est/java/org/json/JSONTokenerTest.java
est/java/org/json/ParsingTest.java
|
| f2f7880a40aed1c8d9c27db49226e47396556aac |
25-Mar-2010 |
Jesse Wilson <jessewilson@google.com> |
Test and document our handling of nulls with getString().
Our behaviour is consistent with Crockford's.
The test confirms that the behaviour is consistent with the report
of that bug, which the submitter claims is not how it should behave.
http://code.google.com/p/android/issues/detail?id=7257
Change-Id: Ibace4bd995e3cbc8fb6c9dc509f8f4491865a647
ain/java/org/json/JSONObject.java
est/java/org/json/JSONArrayTest.java
|
| 253eebd34a7a4a30b20cbfd42dbfd7117af8a154 |
18-Mar-2010 |
Jesse Wilson <jessewilson@google.com> |
Drop needless parens from Javadoc.
Although this violates my longstanding style preference, it agrees
with almighty JJB's official ArrayList, which is Good Enough For Me.
Change-Id: I7b608c12e04d0b7789bfcabeab4b7347ad22baca
ain/java/org/json/JSONArray.java
ain/java/org/json/JSONObject.java
ain/java/org/json/JSONStringer.java
ain/java/org/json/JSONTokener.java
|
| d5b5f84864f0025c7a0f827ce17e7cbdab69c382 |
18-Mar-2010 |
Jesse Wilson <jessewilson@google.com> |
Javadoc for JSONArray.
Change-Id: I3aced2607b48210f76887e0d42b591c098ce5db7
ain/java/org/json/JSONArray.java
ain/java/org/json/JSONObject.java
|
| 82ebe52a3e4ee91ccbef38d241b2b1fd9409a03e |
17-Mar-2010 |
Jesse Wilson <jessewilson@google.com> |
Merge "Javadocs for JSONObject."
|
| db7c9b86884ef6f679ef173efbdb189ca5ceb941 |
17-Mar-2010 |
Jesse Wilson <jessewilson@google.com> |
Javadocs for JSONObject.
Change-Id: I5ec9df6a3a9baac8f4f498890cd35feff774737a
ain/java/org/json/JSON.java
ain/java/org/json/JSONObject.java
est/java/org/json/JSONObjectTest.java
|
| 38b778b364061dc87899e7fe0e3efd2502a538fd |
16-Mar-2010 |
Jesse Wilson <jessewilson@google.com> |
Fixing an @link issue that is upsetting DroidDoc.
Change-Id: I9837cfd46684ac6d5b9ec4ac6809da3c3f61d57d
ain/java/org/json/JSONTokener.java
|
| 4731ea876a120370f88d57610e3602b5c4fdb850 |
16-Mar-2010 |
Jesse Wilson <jessewilson@google.com> |
First half of JSON Javadocs.
Change-Id: I277ec3b35a28802dd7b7f82c1f4bbadbd3cc4c65
ain/java/org/json/JSONException.java
ain/java/org/json/JSONStringer.java
ain/java/org/json/JSONTokener.java
|
| fcfb52201103bf732a6233ea45daaa65e253543b |
13-Mar-2010 |
Jesse Wilson <jessewilson@google.com> |
Adding an Apache-licensed implementation of org.json
Change-Id: I1b67bac70bd25220a619e6ebe61f7f1c6f316faa
ain/java/org/json/JSON.java
ain/java/org/json/JSONArray.java
ain/java/org/json/JSONException.java
ain/java/org/json/JSONObject.java
ain/java/org/json/JSONStringer.java
ain/java/org/json/JSONTokener.java
ewrite/java/org/json/JSON.java
ewrite/java/org/json/JSONArray.java
ewrite/java/org/json/JSONException.java
ewrite/java/org/json/JSONObject.java
ewrite/java/org/json/JSONStringer.java
ewrite/java/org/json/JSONTokener.java
|
| f662e543f4bf86ccc6d4375f664268da4208b61f |
13-Mar-2010 |
Jesse Wilson <jessewilson@google.com> |
Removing the non-free org.json implementation
Change-Id: Ife53082824f5916665f198d4b2fb863271841ce0
ain/java/org/json/JSONArray.java
ain/java/org/json/JSONException.java
ain/java/org/json/JSONObject.java
ain/java/org/json/JSONStringer.java
ain/java/org/json/JSONTokener.java
|
| 4558195b4a7ee014517f1aa3c59bc6c561baa2ef |
12-Mar-2010 |
Jesse Wilson <jessewilson@google.com> |
A cleanroom implementation of the org.json API.
This implementation lacks documentation. I intend to write that after checking
it into the master branch. By not waiting we'll have more time to exercise the
code, if only in Google's own applications.
This passes all of my tests. I rewrote some of the tests to make Crockford's
implementation fail. The tests that fail on Crockford's implementation are:
JSONArrayTest
testEqualsAndHashCode equals() not consistent with hashCode()
testTokenerConstructorParseFail StackOverflowError
testStringConstructorParseFail StackOverflowError
JSONObjectTest
testOtherNumbers Object.put() accepted a NaN (via a custom Number class)
testMapConstructorWithBogusEntries JSONObject constructor doesn't validate its input!
JSONTokenerTest
testNextNWithAllRemaining off-by-one error?
testNext0 Returning an empty string should be valid
testNextCleanCommentsTrailingSingleSlash nextClean doesn't consume a trailing slash
assertNotClean The character line tabulation is not whitespace according to the JSON spec.
testNextToDoesntStopOnNull nextTo() shouldn't stop after \0 characters
testNextToConsumesNull nextTo shouldn't consume \0.
testSkipToStopsOnNull skipTo shouldn't stop when it sees '\0'
ParsingTest
testParsingLargeHexValues For input "0x80000000" Hex values are parsed as Strings if their signed value is greater than Integer.MAX_VALUE.
testSyntaxProblemUnterminatedArray Stack overflowed on input "["
Change-Id: I44c4a4a698a66bf043ed339d6bd804951e732cbf
ewrite/java/org/json/JSON.java
ewrite/java/org/json/JSONArray.java
ewrite/java/org/json/JSONException.java
ewrite/java/org/json/JSONObject.java
ewrite/java/org/json/JSONStringer.java
ewrite/java/org/json/JSONTokener.java
est/java/org/json/AllTests.java
est/java/org/json/JSONArrayTest.java
est/java/org/json/JSONObjectTest.java
est/java/org/json/JSONStringerTest.java
est/java/org/json/JSONTokenerTest.java
est/java/org/json/ParsingTest.java
est/java/org/json/SelfUseTest.java
|
| 8d7ee1eb0c3fe903d3546def87b6812754b1ba07 |
10-Mar-2010 |
Jesse Wilson <jessewilson@google.com> |
New tests for JSONObject and for JSON's self-use.
Alongside development of these tests, I'm working on a new
cleanroom implementation. The self use test was written to
prevent me from self-using in a way that the original
implementation does not.
Change-Id: Ie617aca1978bd39d85b05e5c2c7bd657ed159dd6
est/java/org/json/AllTests.java
est/java/org/json/JSONArrayTest.java
est/java/org/json/JSONObjectTest.java
est/java/org/json/JSONStringerTest.java
est/java/org/json/SelfUseTest.java
|
| 1fdd04d916eab635c6e3c28f6aceddae64d9eb20 |
17-Feb-2010 |
Jesse Wilson <jessewilson@google.com> |
Fixing packages for JSON tests
est/java/org/json/JSONArrayTest.java
est/java/org/json/JSONStringerTest.java
est/java/org/json/JSONTokenerTest.java
|
| e776e8a98a4aeace5ae69186fd714c3010ddf4aa |
16-Feb-2010 |
Jesse Wilson <jessewilson@google.com> |
First round of tests for the subset of the org.json in Android.
est/java/org/json/AllTests.java
est/java/org/json/JSONArrayTest.java
est/java/org/json/JSONStringerTest.java
est/java/org/json/JSONTokenerTest.java
|
| f6c387128427e121477c1b32ad35cdcaa5101ba3 |
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
ain/java/org/json/JSONArray.java
ain/java/org/json/JSONException.java
ain/java/org/json/JSONObject.java
ain/java/org/json/JSONStringer.java
ain/java/org/json/JSONTokener.java
|
| f72d5de56a522ac3be03873bdde26f23a5eeeb3c |
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
ain/java/org/json/JSONArray.java
ain/java/org/json/JSONException.java
ain/java/org/json/JSONObject.java
ain/java/org/json/JSONStringer.java
ain/java/org/json/JSONTokener.java
|
| 2ad60cfc28e14ee8f0bb038720836a4696c478ad |
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
ain/java/org/json/JSONArray.java
ain/java/org/json/JSONException.java
ain/java/org/json/JSONObject.java
ain/java/org/json/JSONStringer.java
ain/java/org/json/JSONTokener.java
|