You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/04/01 23:58:02 UTC
[14/51] [partial] incubator-juneau-website git commit: Javadoc
updates.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5aed2f48/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html
index af626d1..9100ae9 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html
@@ -202,7 +202,7 @@
<span class="sourceLineNo">194</span> o = session.cast(m, pMeta, eType);<a name="line.194"></a>
<span class="sourceLineNo">195</span> } else {<a name="line.195"></a>
<span class="sourceLineNo">196</span> Collection l = (sType.canCreateNewInstance(outer) ? (Collection)sType.newInstance() : new ObjectList(session));<a name="line.196"></a>
-<span class="sourceLineNo">197</span> o = parseIntoCollection2(session, r, l, sType.getElementType(), pMeta);<a name="line.197"></a>
+<span class="sourceLineNo">197</span> o = parseIntoCollection2(session, r, l, sType, pMeta);<a name="line.197"></a>
<span class="sourceLineNo">198</span> }<a name="line.198"></a>
<span class="sourceLineNo">199</span> } else if (sType.canCreateNewBean(outer)) {<a name="line.199"></a>
<span class="sourceLineNo">200</span> BeanMap m = session.newBeanMap(outer, sType.getInnerClass());<a name="line.200"></a>
@@ -211,13 +211,13 @@
<span class="sourceLineNo">203</span> o = sType.newInstanceFromString(outer, parseString(session, r));<a name="line.203"></a>
<span class="sourceLineNo">204</span> } else if (sType.canCreateNewInstanceFromNumber(outer) && StringUtils.isFirstNumberChar((char)c)) {<a name="line.204"></a>
<span class="sourceLineNo">205</span> o = sType.newInstanceFromNumber(session, outer, parseNumber(session, r, sType.getNewInstanceFromNumberClass()));<a name="line.205"></a>
-<span class="sourceLineNo">206</span> } else if (sType.isArray()) {<a name="line.206"></a>
+<span class="sourceLineNo">206</span> } else if (sType.isArray() || sType.isArgs()) {<a name="line.206"></a>
<span class="sourceLineNo">207</span> if (c == '{') {<a name="line.207"></a>
<span class="sourceLineNo">208</span> ObjectMap m = new ObjectMap(session);<a name="line.208"></a>
<span class="sourceLineNo">209</span> parseIntoMap2(session, r, m, string(), object(), pMeta);<a name="line.209"></a>
<span class="sourceLineNo">210</span> o = session.cast(m, pMeta, eType);<a name="line.210"></a>
<span class="sourceLineNo">211</span> } else {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> ArrayList l = (ArrayList)parseIntoCollection2(session, r, new ArrayList(), sType.getElementType(), pMeta);<a name="line.212"></a>
+<span class="sourceLineNo">212</span> ArrayList l = (ArrayList)parseIntoCollection2(session, r, new ArrayList(), sType, pMeta);<a name="line.212"></a>
<span class="sourceLineNo">213</span> o = session.toArray(sType, l);<a name="line.213"></a>
<span class="sourceLineNo">214</span> }<a name="line.214"></a>
<span class="sourceLineNo">215</span> } else if (c == '{') {<a name="line.215"></a>
@@ -407,456 +407,403 @@
<span class="sourceLineNo">399</span> throw new ParseException(session, "Could not find the end of the field name.");<a name="line.399"></a>
<span class="sourceLineNo">400</span> }<a name="line.400"></a>
<span class="sourceLineNo">401</span><a name="line.401"></a>
-<span class="sourceLineNo">402</span> private <E> Collection<E> parseIntoCollection2(JsonParserSession session, ParserReader r, Collection<E> l, ClassMeta<E> elementType, BeanPropertyMeta pMeta) throws Exception {<a name="line.402"></a>
+<span class="sourceLineNo">402</span> private <E> Collection<E> parseIntoCollection2(JsonParserSession session, ParserReader r, Collection<E> l, ClassMeta<?> type, BeanPropertyMeta pMeta) throws Exception {<a name="line.402"></a>
<span class="sourceLineNo">403</span><a name="line.403"></a>
<span class="sourceLineNo">404</span> int S0=0; // Looking for outermost [<a name="line.404"></a>
<span class="sourceLineNo">405</span> int S1=1; // Looking for starting [ or { or " or ' or LITERAL or ]<a name="line.405"></a>
<span class="sourceLineNo">406</span> int S2=2; // Looking for , or ]<a name="line.406"></a>
<span class="sourceLineNo">407</span> int S3=3; // Looking for starting [ or { or " or ' or LITERAL<a name="line.407"></a>
<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span> int state = S0;<a name="line.409"></a>
-<span class="sourceLineNo">410</span> int c = 0;<a name="line.410"></a>
-<span class="sourceLineNo">411</span> while (c != -1) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span> c = r.read();<a name="line.412"></a>
-<span class="sourceLineNo">413</span> if (state == S0) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> if (c == '[')<a name="line.414"></a>
-<span class="sourceLineNo">415</span> state = S1;<a name="line.415"></a>
-<span class="sourceLineNo">416</span> } else if (state == S1) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span> if (c == ']') {<a name="line.417"></a>
-<span class="sourceLineNo">418</span> return l;<a name="line.418"></a>
-<span class="sourceLineNo">419</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.419"></a>
-<span class="sourceLineNo">420</span> skipCommentsAndSpace(session, r.unread());<a name="line.420"></a>
-<span class="sourceLineNo">421</span> } else if (c != -1) {<a name="line.421"></a>
-<span class="sourceLineNo">422</span> l.add(parseAnything(session, elementType, r.unread(), l, pMeta));<a name="line.422"></a>
-<span class="sourceLineNo">423</span> state = S2;<a name="line.423"></a>
-<span class="sourceLineNo">424</span> }<a name="line.424"></a>
-<span class="sourceLineNo">425</span> } else if (state == S2) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span> if (c == ',') {<a name="line.426"></a>
-<span class="sourceLineNo">427</span> state = S3;<a name="line.427"></a>
-<span class="sourceLineNo">428</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span> skipCommentsAndSpace(session, r.unread());<a name="line.429"></a>
-<span class="sourceLineNo">430</span> } else if (c == ']') {<a name="line.430"></a>
-<span class="sourceLineNo">431</span> return l;<a name="line.431"></a>
-<span class="sourceLineNo">432</span> } else {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> break; // Invalid character found.<a name="line.433"></a>
-<span class="sourceLineNo">434</span> }<a name="line.434"></a>
-<span class="sourceLineNo">435</span> } else if (state == S3) {<a name="line.435"></a>
-<span class="sourceLineNo">436</span> if (session.isCommentOrWhitespace(c)) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> skipCommentsAndSpace(session, r.unread());<a name="line.437"></a>
-<span class="sourceLineNo">438</span> } else if (c == ']') {<a name="line.438"></a>
-<span class="sourceLineNo">439</span> break;<a name="line.439"></a>
-<span class="sourceLineNo">440</span> } else if (c != -1) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span> l.add(parseAnything(session, elementType, r.unread(), l, pMeta));<a name="line.441"></a>
-<span class="sourceLineNo">442</span> state = S2;<a name="line.442"></a>
-<span class="sourceLineNo">443</span> }<a name="line.443"></a>
-<span class="sourceLineNo">444</span> }<a name="line.444"></a>
-<span class="sourceLineNo">445</span> }<a name="line.445"></a>
-<span class="sourceLineNo">446</span> if (state == S0)<a name="line.446"></a>
-<span class="sourceLineNo">447</span> throw new ParseException(session, "Expected '[' at beginning of JSON array.");<a name="line.447"></a>
-<span class="sourceLineNo">448</span> if (state == S1)<a name="line.448"></a>
-<span class="sourceLineNo">449</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.449"></a>
-<span class="sourceLineNo">450</span> if (state == S2)<a name="line.450"></a>
-<span class="sourceLineNo">451</span> throw new ParseException(session, "Expected ',' or ']'.");<a name="line.451"></a>
-<span class="sourceLineNo">452</span> if (state == S3)<a name="line.452"></a>
-<span class="sourceLineNo">453</span> throw new ParseException(session, "Unexpected trailing comma in array.");<a name="line.453"></a>
-<span class="sourceLineNo">454</span><a name="line.454"></a>
-<span class="sourceLineNo">455</span> return null; // Unreachable.<a name="line.455"></a>
-<span class="sourceLineNo">456</span> }<a name="line.456"></a>
-<span class="sourceLineNo">457</span><a name="line.457"></a>
-<span class="sourceLineNo">458</span> private Object[] parseArgs(JsonParserSession session, ParserReader r, ClassMeta<?>[] argTypes) throws Exception {<a name="line.458"></a>
+<span class="sourceLineNo">409</span> int argIndex = 0;<a name="line.409"></a>
+<span class="sourceLineNo">410</span><a name="line.410"></a>
+<span class="sourceLineNo">411</span> int state = S0;<a name="line.411"></a>
+<span class="sourceLineNo">412</span> int c = 0;<a name="line.412"></a>
+<span class="sourceLineNo">413</span> while (c != -1) {<a name="line.413"></a>
+<span class="sourceLineNo">414</span> c = r.read();<a name="line.414"></a>
+<span class="sourceLineNo">415</span> if (state == S0) {<a name="line.415"></a>
+<span class="sourceLineNo">416</span> if (c == '[')<a name="line.416"></a>
+<span class="sourceLineNo">417</span> state = S1;<a name="line.417"></a>
+<span class="sourceLineNo">418</span> } else if (state == S1) {<a name="line.418"></a>
+<span class="sourceLineNo">419</span> if (c == ']') {<a name="line.419"></a>
+<span class="sourceLineNo">420</span> return l;<a name="line.420"></a>
+<span class="sourceLineNo">421</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.421"></a>
+<span class="sourceLineNo">422</span> skipCommentsAndSpace(session, r.unread());<a name="line.422"></a>
+<span class="sourceLineNo">423</span> } else if (c != -1) {<a name="line.423"></a>
+<span class="sourceLineNo">424</span> l.add((E)parseAnything(session, type.isArgs() ? type.getArg(argIndex++) : type.getElementType(), r.unread(), l, pMeta));<a name="line.424"></a>
+<span class="sourceLineNo">425</span> state = S2;<a name="line.425"></a>
+<span class="sourceLineNo">426</span> }<a name="line.426"></a>
+<span class="sourceLineNo">427</span> } else if (state == S2) {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> if (c == ',') {<a name="line.428"></a>
+<span class="sourceLineNo">429</span> state = S3;<a name="line.429"></a>
+<span class="sourceLineNo">430</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.430"></a>
+<span class="sourceLineNo">431</span> skipCommentsAndSpace(session, r.unread());<a name="line.431"></a>
+<span class="sourceLineNo">432</span> } else if (c == ']') {<a name="line.432"></a>
+<span class="sourceLineNo">433</span> return l;<a name="line.433"></a>
+<span class="sourceLineNo">434</span> } else {<a name="line.434"></a>
+<span class="sourceLineNo">435</span> break; // Invalid character found.<a name="line.435"></a>
+<span class="sourceLineNo">436</span> }<a name="line.436"></a>
+<span class="sourceLineNo">437</span> } else if (state == S3) {<a name="line.437"></a>
+<span class="sourceLineNo">438</span> if (session.isCommentOrWhitespace(c)) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> skipCommentsAndSpace(session, r.unread());<a name="line.439"></a>
+<span class="sourceLineNo">440</span> } else if (c == ']') {<a name="line.440"></a>
+<span class="sourceLineNo">441</span> break;<a name="line.441"></a>
+<span class="sourceLineNo">442</span> } else if (c != -1) {<a name="line.442"></a>
+<span class="sourceLineNo">443</span> l.add((E)parseAnything(session, type.isArgs() ? type.getArg(argIndex++) : type.getElementType(), r.unread(), l, pMeta));<a name="line.443"></a>
+<span class="sourceLineNo">444</span> state = S2;<a name="line.444"></a>
+<span class="sourceLineNo">445</span> }<a name="line.445"></a>
+<span class="sourceLineNo">446</span> }<a name="line.446"></a>
+<span class="sourceLineNo">447</span> }<a name="line.447"></a>
+<span class="sourceLineNo">448</span> if (state == S0)<a name="line.448"></a>
+<span class="sourceLineNo">449</span> throw new ParseException(session, "Expected '[' at beginning of JSON array.");<a name="line.449"></a>
+<span class="sourceLineNo">450</span> if (state == S1)<a name="line.450"></a>
+<span class="sourceLineNo">451</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.451"></a>
+<span class="sourceLineNo">452</span> if (state == S2)<a name="line.452"></a>
+<span class="sourceLineNo">453</span> throw new ParseException(session, "Expected ',' or ']'.");<a name="line.453"></a>
+<span class="sourceLineNo">454</span> if (state == S3)<a name="line.454"></a>
+<span class="sourceLineNo">455</span> throw new ParseException(session, "Unexpected trailing comma in array.");<a name="line.455"></a>
+<span class="sourceLineNo">456</span><a name="line.456"></a>
+<span class="sourceLineNo">457</span> return null; // Unreachable.<a name="line.457"></a>
+<span class="sourceLineNo">458</span> }<a name="line.458"></a>
<span class="sourceLineNo">459</span><a name="line.459"></a>
-<span class="sourceLineNo">460</span> int S0=0; // Looking for outermost [<a name="line.460"></a>
-<span class="sourceLineNo">461</span> int S1=1; // Looking for starting [ or { or " or ' or LITERAL<a name="line.461"></a>
-<span class="sourceLineNo">462</span> int S2=2; // Looking for , or ]<a name="line.462"></a>
-<span class="sourceLineNo">463</span><a name="line.463"></a>
-<span class="sourceLineNo">464</span> Object[] o = new Object[argTypes.length];<a name="line.464"></a>
-<span class="sourceLineNo">465</span> int i = 0;<a name="line.465"></a>
-<span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span> int state = S0;<a name="line.467"></a>
-<span class="sourceLineNo">468</span> int c = 0;<a name="line.468"></a>
-<span class="sourceLineNo">469</span> while (c != -1) {<a name="line.469"></a>
-<span class="sourceLineNo">470</span> c = r.read();<a name="line.470"></a>
-<span class="sourceLineNo">471</span> if (state == S0) {<a name="line.471"></a>
-<span class="sourceLineNo">472</span> if (c == '[')<a name="line.472"></a>
-<span class="sourceLineNo">473</span> state = S1;<a name="line.473"></a>
-<span class="sourceLineNo">474</span> } else if (state == S1) {<a name="line.474"></a>
-<span class="sourceLineNo">475</span> if (c == ']') {<a name="line.475"></a>
-<span class="sourceLineNo">476</span> return o;<a name="line.476"></a>
-<span class="sourceLineNo">477</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.477"></a>
-<span class="sourceLineNo">478</span> skipCommentsAndSpace(session, r.unread());<a name="line.478"></a>
-<span class="sourceLineNo">479</span> } else {<a name="line.479"></a>
-<span class="sourceLineNo">480</span> o[i] = parseAnything(session, argTypes[i], r.unread(), session.getOuter(), null);<a name="line.480"></a>
-<span class="sourceLineNo">481</span> i++;<a name="line.481"></a>
-<span class="sourceLineNo">482</span> state = S2;<a name="line.482"></a>
-<span class="sourceLineNo">483</span> }<a name="line.483"></a>
-<span class="sourceLineNo">484</span> } else if (state == S2) {<a name="line.484"></a>
-<span class="sourceLineNo">485</span> if (c == ',') {<a name="line.485"></a>
-<span class="sourceLineNo">486</span> state = S1;<a name="line.486"></a>
-<span class="sourceLineNo">487</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.487"></a>
-<span class="sourceLineNo">488</span> skipCommentsAndSpace(session, r.unread());<a name="line.488"></a>
-<span class="sourceLineNo">489</span> } else if (c == ']') {<a name="line.489"></a>
-<span class="sourceLineNo">490</span> return o;<a name="line.490"></a>
-<span class="sourceLineNo">491</span> }<a name="line.491"></a>
-<span class="sourceLineNo">492</span> }<a name="line.492"></a>
-<span class="sourceLineNo">493</span> }<a name="line.493"></a>
-<span class="sourceLineNo">494</span> if (state == S0)<a name="line.494"></a>
-<span class="sourceLineNo">495</span> throw new ParseException(session, "Expected '[' at beginning of JSON array.");<a name="line.495"></a>
-<span class="sourceLineNo">496</span> if (state == S1)<a name="line.496"></a>
-<span class="sourceLineNo">497</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.497"></a>
-<span class="sourceLineNo">498</span> if (state == S2)<a name="line.498"></a>
-<span class="sourceLineNo">499</span> throw new ParseException(session, "Expected ',' or ']'.");<a name="line.499"></a>
-<span class="sourceLineNo">500</span><a name="line.500"></a>
-<span class="sourceLineNo">501</span> return null; // Unreachable.<a name="line.501"></a>
-<span class="sourceLineNo">502</span> }<a name="line.502"></a>
-<span class="sourceLineNo">503</span><a name="line.503"></a>
-<span class="sourceLineNo">504</span> private <T> BeanMap<T> parseIntoBeanMap2(JsonParserSession session, ParserReader r, BeanMap<T> m) throws Exception {<a name="line.504"></a>
-<span class="sourceLineNo">505</span><a name="line.505"></a>
-<span class="sourceLineNo">506</span> int S0=0; // Looking for outer {<a name="line.506"></a>
-<span class="sourceLineNo">507</span> int S1=1; // Looking for attrName start.<a name="line.507"></a>
-<span class="sourceLineNo">508</span> int S3=3; // Found attrName end, looking for :.<a name="line.508"></a>
-<span class="sourceLineNo">509</span> int S4=4; // Found :, looking for valStart: { [ " ' LITERAL.<a name="line.509"></a>
-<span class="sourceLineNo">510</span> int S5=5; // Looking for , or }<a name="line.510"></a>
-<span class="sourceLineNo">511</span><a name="line.511"></a>
-<span class="sourceLineNo">512</span> int state = S0;<a name="line.512"></a>
-<span class="sourceLineNo">513</span> String currAttr = "";<a name="line.513"></a>
-<span class="sourceLineNo">514</span> int c = 0;<a name="line.514"></a>
-<span class="sourceLineNo">515</span> int currAttrLine = -1, currAttrCol = -1;<a name="line.515"></a>
-<span class="sourceLineNo">516</span> while (c != -1) {<a name="line.516"></a>
-<span class="sourceLineNo">517</span> c = r.read();<a name="line.517"></a>
-<span class="sourceLineNo">518</span> if (state == S0) {<a name="line.518"></a>
-<span class="sourceLineNo">519</span> if (c == '{')<a name="line.519"></a>
-<span class="sourceLineNo">520</span> state = S1;<a name="line.520"></a>
-<span class="sourceLineNo">521</span> } else if (state == S1) {<a name="line.521"></a>
-<span class="sourceLineNo">522</span> if (c == '}') {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> return m;<a name="line.523"></a>
-<span class="sourceLineNo">524</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.524"></a>
-<span class="sourceLineNo">525</span> skipCommentsAndSpace(session, r.unread());<a name="line.525"></a>
-<span class="sourceLineNo">526</span> } else {<a name="line.526"></a>
-<span class="sourceLineNo">527</span> r.unread();<a name="line.527"></a>
-<span class="sourceLineNo">528</span> currAttrLine= r.getLine();<a name="line.528"></a>
-<span class="sourceLineNo">529</span> currAttrCol = r.getColumn();<a name="line.529"></a>
-<span class="sourceLineNo">530</span> currAttr = parseFieldName(session, r);<a name="line.530"></a>
-<span class="sourceLineNo">531</span> state = S3;<a name="line.531"></a>
-<span class="sourceLineNo">532</span> }<a name="line.532"></a>
-<span class="sourceLineNo">533</span> } else if (state == S3) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span> if (c == ':')<a name="line.534"></a>
-<span class="sourceLineNo">535</span> state = S4;<a name="line.535"></a>
-<span class="sourceLineNo">536</span> } else if (state == S4) {<a name="line.536"></a>
-<span class="sourceLineNo">537</span> if (session.isCommentOrWhitespace(c)) {<a name="line.537"></a>
-<span class="sourceLineNo">538</span> skipCommentsAndSpace(session, r.unread());<a name="line.538"></a>
-<span class="sourceLineNo">539</span> } else {<a name="line.539"></a>
-<span class="sourceLineNo">540</span> if (! currAttr.equals(session.getBeanTypePropertyName())) {<a name="line.540"></a>
-<span class="sourceLineNo">541</span> BeanPropertyMeta pMeta = m.getPropertyMeta(currAttr);<a name="line.541"></a>
-<span class="sourceLineNo">542</span> session.setCurrentProperty(pMeta);<a name="line.542"></a>
-<span class="sourceLineNo">543</span> if (pMeta == null) {<a name="line.543"></a>
-<span class="sourceLineNo">544</span> onUnknownProperty(session, currAttr, m, currAttrLine, currAttrCol);<a name="line.544"></a>
-<span class="sourceLineNo">545</span> parseAnything(session, object(), r.unread(), m.getBean(false), null); // Read content anyway to ignore it<a name="line.545"></a>
-<span class="sourceLineNo">546</span> } else {<a name="line.546"></a>
-<span class="sourceLineNo">547</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.547"></a>
-<span class="sourceLineNo">548</span> Object value = parseAnything(session, cm, r.unread(), m.getBean(false), pMeta);<a name="line.548"></a>
-<span class="sourceLineNo">549</span> setName(cm, value, currAttr);<a name="line.549"></a>
-<span class="sourceLineNo">550</span> pMeta.set(m, value);<a name="line.550"></a>
-<span class="sourceLineNo">551</span> }<a name="line.551"></a>
-<span class="sourceLineNo">552</span> session.setCurrentProperty(null);<a name="line.552"></a>
-<span class="sourceLineNo">553</span> }<a name="line.553"></a>
-<span class="sourceLineNo">554</span> state = S5;<a name="line.554"></a>
-<span class="sourceLineNo">555</span> }<a name="line.555"></a>
-<span class="sourceLineNo">556</span> } else if (state == S5) {<a name="line.556"></a>
-<span class="sourceLineNo">557</span> if (c == ',')<a name="line.557"></a>
-<span class="sourceLineNo">558</span> state = S1;<a name="line.558"></a>
-<span class="sourceLineNo">559</span> else if (session.isCommentOrWhitespace(c))<a name="line.559"></a>
-<span class="sourceLineNo">560</span> skipCommentsAndSpace(session, r.unread());<a name="line.560"></a>
-<span class="sourceLineNo">561</span> else if (c == '}') {<a name="line.561"></a>
-<span class="sourceLineNo">562</span> return m;<a name="line.562"></a>
-<span class="sourceLineNo">563</span> }<a name="line.563"></a>
-<span class="sourceLineNo">564</span> }<a name="line.564"></a>
-<span class="sourceLineNo">565</span> }<a name="line.565"></a>
-<span class="sourceLineNo">566</span> if (state == S0)<a name="line.566"></a>
-<span class="sourceLineNo">567</span> throw new ParseException(session, "Expected '{' at beginning of JSON object.");<a name="line.567"></a>
-<span class="sourceLineNo">568</span> if (state == S1)<a name="line.568"></a>
-<span class="sourceLineNo">569</span> throw new ParseException(session, "Could not find attribute name on JSON object.");<a name="line.569"></a>
-<span class="sourceLineNo">570</span> if (state == S3)<a name="line.570"></a>
-<span class="sourceLineNo">571</span> throw new ParseException(session, "Could not find ':' following attribute name on JSON object.");<a name="line.571"></a>
-<span class="sourceLineNo">572</span> if (state == S4)<a name="line.572"></a>
-<span class="sourceLineNo">573</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.573"></a>
-<span class="sourceLineNo">574</span> if (state == S5)<a name="line.574"></a>
-<span class="sourceLineNo">575</span> throw new ParseException(session, "Could not find '}' marking end of JSON object.");<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span> return null; // Unreachable.<a name="line.577"></a>
-<span class="sourceLineNo">578</span> }<a name="line.578"></a>
-<span class="sourceLineNo">579</span><a name="line.579"></a>
-<span class="sourceLineNo">580</span> /*<a name="line.580"></a>
-<span class="sourceLineNo">581</span> * Starting from the specified position in the character array, returns the<a name="line.581"></a>
-<span class="sourceLineNo">582</span> * position of the character " or '.<a name="line.582"></a>
-<span class="sourceLineNo">583</span> * If the string consists of a concatenation of strings (e.g. 'AAA' + "BBB"), this method<a name="line.583"></a>
-<span class="sourceLineNo">584</span> * will automatically concatenate the strings and return the result.<a name="line.584"></a>
-<span class="sourceLineNo">585</span> */<a name="line.585"></a>
-<span class="sourceLineNo">586</span> private String parseString(JsonParserSession session, ParserReader r) throws Exception {<a name="line.586"></a>
-<span class="sourceLineNo">587</span> r.mark();<a name="line.587"></a>
-<span class="sourceLineNo">588</span> int qc = r.read(); // The quote character being used (" or ')<a name="line.588"></a>
-<span class="sourceLineNo">589</span> if (qc != '"' && session.isStrict()) {<a name="line.589"></a>
-<span class="sourceLineNo">590</span> String msg = (qc == '\'' ? "Invalid quote character \"{0}\" being used." : "Did not find quote character marking beginning of string. Character=\"{0}\"");<a name="line.590"></a>
-<span class="sourceLineNo">591</span> throw new ParseException(session, msg, (char)qc);<a name="line.591"></a>
-<span class="sourceLineNo">592</span> }<a name="line.592"></a>
-<span class="sourceLineNo">593</span> final boolean isQuoted = (qc == '\'' || qc == '"');<a name="line.593"></a>
-<span class="sourceLineNo">594</span> String s = null;<a name="line.594"></a>
-<span class="sourceLineNo">595</span> boolean isInEscape = false;<a name="line.595"></a>
-<span class="sourceLineNo">596</span> int c = 0;<a name="line.596"></a>
-<span class="sourceLineNo">597</span> while (c != -1) {<a name="line.597"></a>
-<span class="sourceLineNo">598</span> c = r.read();<a name="line.598"></a>
-<span class="sourceLineNo">599</span> // Strict syntax requires that all control characters be escaped.<a name="line.599"></a>
-<span class="sourceLineNo">600</span> if (session.isStrict() && c <= 0x1F)<a name="line.600"></a>
-<span class="sourceLineNo">601</span> throw new ParseException("Unescaped control character encountered: ''0x{0}''", String.format("%04X", c));<a name="line.601"></a>
-<span class="sourceLineNo">602</span> if (isInEscape) {<a name="line.602"></a>
-<span class="sourceLineNo">603</span> switch (c) {<a name="line.603"></a>
-<span class="sourceLineNo">604</span> case 'n': r.replace('\n'); break;<a name="line.604"></a>
-<span class="sourceLineNo">605</span> case 'r': r.replace('\r'); break;<a name="line.605"></a>
-<span class="sourceLineNo">606</span> case 't': r.replace('\t'); break;<a name="line.606"></a>
-<span class="sourceLineNo">607</span> case 'f': r.replace('\f'); break;<a name="line.607"></a>
-<span class="sourceLineNo">608</span> case 'b': r.replace('\b'); break;<a name="line.608"></a>
-<span class="sourceLineNo">609</span> case '\\': r.replace('\\'); break;<a name="line.609"></a>
-<span class="sourceLineNo">610</span> case '/': r.replace('/'); break;<a name="line.610"></a>
-<span class="sourceLineNo">611</span> case '\'': r.replace('\''); break;<a name="line.611"></a>
-<span class="sourceLineNo">612</span> case '"': r.replace('"'); break;<a name="line.612"></a>
-<span class="sourceLineNo">613</span> case 'u': {<a name="line.613"></a>
-<span class="sourceLineNo">614</span> String n = r.read(4);<a name="line.614"></a>
-<span class="sourceLineNo">615</span> try {<a name="line.615"></a>
-<span class="sourceLineNo">616</span> r.replace(Integer.parseInt(n, 16), 6);<a name="line.616"></a>
-<span class="sourceLineNo">617</span> } catch (NumberFormatException e) {<a name="line.617"></a>
-<span class="sourceLineNo">618</span> throw new ParseException(session, "Invalid Unicode escape sequence in string.");<a name="line.618"></a>
-<span class="sourceLineNo">619</span> }<a name="line.619"></a>
-<span class="sourceLineNo">620</span> break;<a name="line.620"></a>
-<span class="sourceLineNo">621</span> }<a name="line.621"></a>
-<span class="sourceLineNo">622</span> default:<a name="line.622"></a>
-<span class="sourceLineNo">623</span> throw new ParseException(session, "Invalid escape sequence in string.");<a name="line.623"></a>
-<span class="sourceLineNo">624</span> }<a name="line.624"></a>
-<span class="sourceLineNo">625</span> isInEscape = false;<a name="line.625"></a>
-<span class="sourceLineNo">626</span> } else {<a name="line.626"></a>
-<span class="sourceLineNo">627</span> if (c == '\\') {<a name="line.627"></a>
-<span class="sourceLineNo">628</span> isInEscape = true;<a name="line.628"></a>
-<span class="sourceLineNo">629</span> r.delete();<a name="line.629"></a>
-<span class="sourceLineNo">630</span> } else if (isQuoted) {<a name="line.630"></a>
-<span class="sourceLineNo">631</span> if (c == qc) {<a name="line.631"></a>
-<span class="sourceLineNo">632</span> s = r.getMarked(1, -1);<a name="line.632"></a>
-<span class="sourceLineNo">633</span> break;<a name="line.633"></a>
-<span class="sourceLineNo">634</span> }<a name="line.634"></a>
-<span class="sourceLineNo">635</span> } else {<a name="line.635"></a>
-<span class="sourceLineNo">636</span> if (c == ',' || c == '}' || session.isWhitespace(c)) {<a name="line.636"></a>
-<span class="sourceLineNo">637</span> s = r.getMarked(0, -1);<a name="line.637"></a>
-<span class="sourceLineNo">638</span> r.unread();<a name="line.638"></a>
-<span class="sourceLineNo">639</span> break;<a name="line.639"></a>
-<span class="sourceLineNo">640</span> } else if (c == -1) {<a name="line.640"></a>
-<span class="sourceLineNo">641</span> s = r.getMarked(0, 0);<a name="line.641"></a>
-<span class="sourceLineNo">642</span> break;<a name="line.642"></a>
-<span class="sourceLineNo">643</span> }<a name="line.643"></a>
-<span class="sourceLineNo">644</span> }<a name="line.644"></a>
-<span class="sourceLineNo">645</span> }<a name="line.645"></a>
-<span class="sourceLineNo">646</span> }<a name="line.646"></a>
-<span class="sourceLineNo">647</span> if (s == null)<a name="line.647"></a>
-<span class="sourceLineNo">648</span> throw new ParseException(session, "Could not find expected end character ''{0}''.", (char)qc);<a name="line.648"></a>
-<span class="sourceLineNo">649</span><a name="line.649"></a>
-<span class="sourceLineNo">650</span> // Look for concatenated string (i.e. whitespace followed by +).<a name="line.650"></a>
-<span class="sourceLineNo">651</span> skipCommentsAndSpace(session, r);<a name="line.651"></a>
-<span class="sourceLineNo">652</span> if (r.peek() == '+') {<a name="line.652"></a>
-<span class="sourceLineNo">653</span> if (session.isStrict())<a name="line.653"></a>
-<span class="sourceLineNo">654</span> throw new ParseException(session, "String concatenation detected.");<a name="line.654"></a>
-<span class="sourceLineNo">655</span> r.read(); // Skip past '+'<a name="line.655"></a>
-<span class="sourceLineNo">656</span> skipCommentsAndSpace(session, r);<a name="line.656"></a>
-<span class="sourceLineNo">657</span> s += parseString(session, r);<a name="line.657"></a>
-<span class="sourceLineNo">658</span> }<a name="line.658"></a>
-<span class="sourceLineNo">659</span> return session.trim(s); // End of input reached.<a name="line.659"></a>
-<span class="sourceLineNo">660</span> }<a name="line.660"></a>
-<span class="sourceLineNo">661</span><a name="line.661"></a>
-<span class="sourceLineNo">662</span> /*<a name="line.662"></a>
-<span class="sourceLineNo">663</span> * Looks for the keywords true, false, or null.<a name="line.663"></a>
-<span class="sourceLineNo">664</span> * Throws an exception if any of these keywords are not found at the specified position.<a name="line.664"></a>
-<span class="sourceLineNo">665</span> */<a name="line.665"></a>
-<span class="sourceLineNo">666</span> private static void parseKeyword(JsonParserSession session, String keyword, ParserReader r) throws Exception {<a name="line.666"></a>
-<span class="sourceLineNo">667</span> try {<a name="line.667"></a>
-<span class="sourceLineNo">668</span> String s = r.read(keyword.length());<a name="line.668"></a>
-<span class="sourceLineNo">669</span> if (s.equals(keyword))<a name="line.669"></a>
-<span class="sourceLineNo">670</span> return;<a name="line.670"></a>
-<span class="sourceLineNo">671</span> throw new ParseException(session, "Unrecognized syntax.");<a name="line.671"></a>
-<span class="sourceLineNo">672</span> } catch (IndexOutOfBoundsException e) {<a name="line.672"></a>
-<span class="sourceLineNo">673</span> throw new ParseException(session, "Unrecognized syntax.");<a name="line.673"></a>
-<span class="sourceLineNo">674</span> }<a name="line.674"></a>
-<span class="sourceLineNo">675</span> }<a name="line.675"></a>
-<span class="sourceLineNo">676</span><a name="line.676"></a>
-<span class="sourceLineNo">677</span> /*<a name="line.677"></a>
-<span class="sourceLineNo">678</span> * Doesn't actually parse anything, but moves the position beyond any whitespace or comments.<a name="line.678"></a>
-<span class="sourceLineNo">679</span> * If positionOnNext is 'true', then the cursor will be set to the point immediately after<a name="line.679"></a>
-<span class="sourceLineNo">680</span> * the comments and whitespace. Otherwise, the cursor will be set to the last position of<a name="line.680"></a>
-<span class="sourceLineNo">681</span> * the comments and whitespace.<a name="line.681"></a>
-<span class="sourceLineNo">682</span> */<a name="line.682"></a>
-<span class="sourceLineNo">683</span> private static void skipCommentsAndSpace(JsonParserSession session, ParserReader r) throws Exception {<a name="line.683"></a>
-<span class="sourceLineNo">684</span> int c = 0;<a name="line.684"></a>
-<span class="sourceLineNo">685</span> while ((c = r.read()) != -1) {<a name="line.685"></a>
-<span class="sourceLineNo">686</span> if (! session.isWhitespace(c)) {<a name="line.686"></a>
-<span class="sourceLineNo">687</span> if (c == '/') {<a name="line.687"></a>
-<span class="sourceLineNo">688</span> if (session.isStrict())<a name="line.688"></a>
-<span class="sourceLineNo">689</span> throw new ParseException(session, "Javascript comment detected.");<a name="line.689"></a>
-<span class="sourceLineNo">690</span> skipComments(session, r);<a name="line.690"></a>
-<span class="sourceLineNo">691</span> } else {<a name="line.691"></a>
-<span class="sourceLineNo">692</span> r.unread();<a name="line.692"></a>
-<span class="sourceLineNo">693</span> return;<a name="line.693"></a>
-<span class="sourceLineNo">694</span> }<a name="line.694"></a>
-<span class="sourceLineNo">695</span> }<a name="line.695"></a>
-<span class="sourceLineNo">696</span> }<a name="line.696"></a>
-<span class="sourceLineNo">697</span> }<a name="line.697"></a>
-<span class="sourceLineNo">698</span><a name="line.698"></a>
-<span class="sourceLineNo">699</span> /*<a name="line.699"></a>
-<span class="sourceLineNo">700</span> * Doesn't actually parse anything, but moves the position beyond the construct "{wrapperAttr:" when<a name="line.700"></a>
-<span class="sourceLineNo">701</span> * the @Json.wrapperAttr() annotation is used on a class.<a name="line.701"></a>
-<span class="sourceLineNo">702</span> */<a name="line.702"></a>
-<span class="sourceLineNo">703</span> private void skipWrapperAttrStart(JsonParserSession session, ParserReader r, String wrapperAttr) throws Exception {<a name="line.703"></a>
+<span class="sourceLineNo">460</span> private <T> BeanMap<T> parseIntoBeanMap2(JsonParserSession session, ParserReader r, BeanMap<T> m) throws Exception {<a name="line.460"></a>
+<span class="sourceLineNo">461</span><a name="line.461"></a>
+<span class="sourceLineNo">462</span> int S0=0; // Looking for outer {<a name="line.462"></a>
+<span class="sourceLineNo">463</span> int S1=1; // Looking for attrName start.<a name="line.463"></a>
+<span class="sourceLineNo">464</span> int S3=3; // Found attrName end, looking for :.<a name="line.464"></a>
+<span class="sourceLineNo">465</span> int S4=4; // Found :, looking for valStart: { [ " ' LITERAL.<a name="line.465"></a>
+<span class="sourceLineNo">466</span> int S5=5; // Looking for , or }<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span> int state = S0;<a name="line.468"></a>
+<span class="sourceLineNo">469</span> String currAttr = "";<a name="line.469"></a>
+<span class="sourceLineNo">470</span> int c = 0;<a name="line.470"></a>
+<span class="sourceLineNo">471</span> int currAttrLine = -1, currAttrCol = -1;<a name="line.471"></a>
+<span class="sourceLineNo">472</span> while (c != -1) {<a name="line.472"></a>
+<span class="sourceLineNo">473</span> c = r.read();<a name="line.473"></a>
+<span class="sourceLineNo">474</span> if (state == S0) {<a name="line.474"></a>
+<span class="sourceLineNo">475</span> if (c == '{')<a name="line.475"></a>
+<span class="sourceLineNo">476</span> state = S1;<a name="line.476"></a>
+<span class="sourceLineNo">477</span> } else if (state == S1) {<a name="line.477"></a>
+<span class="sourceLineNo">478</span> if (c == '}') {<a name="line.478"></a>
+<span class="sourceLineNo">479</span> return m;<a name="line.479"></a>
+<span class="sourceLineNo">480</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.480"></a>
+<span class="sourceLineNo">481</span> skipCommentsAndSpace(session, r.unread());<a name="line.481"></a>
+<span class="sourceLineNo">482</span> } else {<a name="line.482"></a>
+<span class="sourceLineNo">483</span> r.unread();<a name="line.483"></a>
+<span class="sourceLineNo">484</span> currAttrLine= r.getLine();<a name="line.484"></a>
+<span class="sourceLineNo">485</span> currAttrCol = r.getColumn();<a name="line.485"></a>
+<span class="sourceLineNo">486</span> currAttr = parseFieldName(session, r);<a name="line.486"></a>
+<span class="sourceLineNo">487</span> state = S3;<a name="line.487"></a>
+<span class="sourceLineNo">488</span> }<a name="line.488"></a>
+<span class="sourceLineNo">489</span> } else if (state == S3) {<a name="line.489"></a>
+<span class="sourceLineNo">490</span> if (c == ':')<a name="line.490"></a>
+<span class="sourceLineNo">491</span> state = S4;<a name="line.491"></a>
+<span class="sourceLineNo">492</span> } else if (state == S4) {<a name="line.492"></a>
+<span class="sourceLineNo">493</span> if (session.isCommentOrWhitespace(c)) {<a name="line.493"></a>
+<span class="sourceLineNo">494</span> skipCommentsAndSpace(session, r.unread());<a name="line.494"></a>
+<span class="sourceLineNo">495</span> } else {<a name="line.495"></a>
+<span class="sourceLineNo">496</span> if (! currAttr.equals(session.getBeanTypePropertyName())) {<a name="line.496"></a>
+<span class="sourceLineNo">497</span> BeanPropertyMeta pMeta = m.getPropertyMeta(currAttr);<a name="line.497"></a>
+<span class="sourceLineNo">498</span> session.setCurrentProperty(pMeta);<a name="line.498"></a>
+<span class="sourceLineNo">499</span> if (pMeta == null) {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> onUnknownProperty(session, currAttr, m, currAttrLine, currAttrCol);<a name="line.500"></a>
+<span class="sourceLineNo">501</span> parseAnything(session, object(), r.unread(), m.getBean(false), null); // Read content anyway to ignore it<a name="line.501"></a>
+<span class="sourceLineNo">502</span> } else {<a name="line.502"></a>
+<span class="sourceLineNo">503</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.503"></a>
+<span class="sourceLineNo">504</span> Object value = parseAnything(session, cm, r.unread(), m.getBean(false), pMeta);<a name="line.504"></a>
+<span class="sourceLineNo">505</span> setName(cm, value, currAttr);<a name="line.505"></a>
+<span class="sourceLineNo">506</span> pMeta.set(m, value);<a name="line.506"></a>
+<span class="sourceLineNo">507</span> }<a name="line.507"></a>
+<span class="sourceLineNo">508</span> session.setCurrentProperty(null);<a name="line.508"></a>
+<span class="sourceLineNo">509</span> }<a name="line.509"></a>
+<span class="sourceLineNo">510</span> state = S5;<a name="line.510"></a>
+<span class="sourceLineNo">511</span> }<a name="line.511"></a>
+<span class="sourceLineNo">512</span> } else if (state == S5) {<a name="line.512"></a>
+<span class="sourceLineNo">513</span> if (c == ',')<a name="line.513"></a>
+<span class="sourceLineNo">514</span> state = S1;<a name="line.514"></a>
+<span class="sourceLineNo">515</span> else if (session.isCommentOrWhitespace(c))<a name="line.515"></a>
+<span class="sourceLineNo">516</span> skipCommentsAndSpace(session, r.unread());<a name="line.516"></a>
+<span class="sourceLineNo">517</span> else if (c == '}') {<a name="line.517"></a>
+<span class="sourceLineNo">518</span> return m;<a name="line.518"></a>
+<span class="sourceLineNo">519</span> }<a name="line.519"></a>
+<span class="sourceLineNo">520</span> }<a name="line.520"></a>
+<span class="sourceLineNo">521</span> }<a name="line.521"></a>
+<span class="sourceLineNo">522</span> if (state == S0)<a name="line.522"></a>
+<span class="sourceLineNo">523</span> throw new ParseException(session, "Expected '{' at beginning of JSON object.");<a name="line.523"></a>
+<span class="sourceLineNo">524</span> if (state == S1)<a name="line.524"></a>
+<span class="sourceLineNo">525</span> throw new ParseException(session, "Could not find attribute name on JSON object.");<a name="line.525"></a>
+<span class="sourceLineNo">526</span> if (state == S3)<a name="line.526"></a>
+<span class="sourceLineNo">527</span> throw new ParseException(session, "Could not find ':' following attribute name on JSON object.");<a name="line.527"></a>
+<span class="sourceLineNo">528</span> if (state == S4)<a name="line.528"></a>
+<span class="sourceLineNo">529</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.529"></a>
+<span class="sourceLineNo">530</span> if (state == S5)<a name="line.530"></a>
+<span class="sourceLineNo">531</span> throw new ParseException(session, "Could not find '}' marking end of JSON object.");<a name="line.531"></a>
+<span class="sourceLineNo">532</span><a name="line.532"></a>
+<span class="sourceLineNo">533</span> return null; // Unreachable.<a name="line.533"></a>
+<span class="sourceLineNo">534</span> }<a name="line.534"></a>
+<span class="sourceLineNo">535</span><a name="line.535"></a>
+<span class="sourceLineNo">536</span> /*<a name="line.536"></a>
+<span class="sourceLineNo">537</span> * Starting from the specified position in the character array, returns the<a name="line.537"></a>
+<span class="sourceLineNo">538</span> * position of the character " or '.<a name="line.538"></a>
+<span class="sourceLineNo">539</span> * If the string consists of a concatenation of strings (e.g. 'AAA' + "BBB"), this method<a name="line.539"></a>
+<span class="sourceLineNo">540</span> * will automatically concatenate the strings and return the result.<a name="line.540"></a>
+<span class="sourceLineNo">541</span> */<a name="line.541"></a>
+<span class="sourceLineNo">542</span> private String parseString(JsonParserSession session, ParserReader r) throws Exception {<a name="line.542"></a>
+<span class="sourceLineNo">543</span> r.mark();<a name="line.543"></a>
+<span class="sourceLineNo">544</span> int qc = r.read(); // The quote character being used (" or ')<a name="line.544"></a>
+<span class="sourceLineNo">545</span> if (qc != '"' && session.isStrict()) {<a name="line.545"></a>
+<span class="sourceLineNo">546</span> String msg = (qc == '\'' ? "Invalid quote character \"{0}\" being used." : "Did not find quote character marking beginning of string. Character=\"{0}\"");<a name="line.546"></a>
+<span class="sourceLineNo">547</span> throw new ParseException(session, msg, (char)qc);<a name="line.547"></a>
+<span class="sourceLineNo">548</span> }<a name="line.548"></a>
+<span class="sourceLineNo">549</span> final boolean isQuoted = (qc == '\'' || qc == '"');<a name="line.549"></a>
+<span class="sourceLineNo">550</span> String s = null;<a name="line.550"></a>
+<span class="sourceLineNo">551</span> boolean isInEscape = false;<a name="line.551"></a>
+<span class="sourceLineNo">552</span> int c = 0;<a name="line.552"></a>
+<span class="sourceLineNo">553</span> while (c != -1) {<a name="line.553"></a>
+<span class="sourceLineNo">554</span> c = r.read();<a name="line.554"></a>
+<span class="sourceLineNo">555</span> // Strict syntax requires that all control characters be escaped.<a name="line.555"></a>
+<span class="sourceLineNo">556</span> if (session.isStrict() && c <= 0x1F)<a name="line.556"></a>
+<span class="sourceLineNo">557</span> throw new ParseException("Unescaped control character encountered: ''0x{0}''", String.format("%04X", c));<a name="line.557"></a>
+<span class="sourceLineNo">558</span> if (isInEscape) {<a name="line.558"></a>
+<span class="sourceLineNo">559</span> switch (c) {<a name="line.559"></a>
+<span class="sourceLineNo">560</span> case 'n': r.replace('\n'); break;<a name="line.560"></a>
+<span class="sourceLineNo">561</span> case 'r': r.replace('\r'); break;<a name="line.561"></a>
+<span class="sourceLineNo">562</span> case 't': r.replace('\t'); break;<a name="line.562"></a>
+<span class="sourceLineNo">563</span> case 'f': r.replace('\f'); break;<a name="line.563"></a>
+<span class="sourceLineNo">564</span> case 'b': r.replace('\b'); break;<a name="line.564"></a>
+<span class="sourceLineNo">565</span> case '\\': r.replace('\\'); break;<a name="line.565"></a>
+<span class="sourceLineNo">566</span> case '/': r.replace('/'); break;<a name="line.566"></a>
+<span class="sourceLineNo">567</span> case '\'': r.replace('\''); break;<a name="line.567"></a>
+<span class="sourceLineNo">568</span> case '"': r.replace('"'); break;<a name="line.568"></a>
+<span class="sourceLineNo">569</span> case 'u': {<a name="line.569"></a>
+<span class="sourceLineNo">570</span> String n = r.read(4);<a name="line.570"></a>
+<span class="sourceLineNo">571</span> try {<a name="line.571"></a>
+<span class="sourceLineNo">572</span> r.replace(Integer.parseInt(n, 16), 6);<a name="line.572"></a>
+<span class="sourceLineNo">573</span> } catch (NumberFormatException e) {<a name="line.573"></a>
+<span class="sourceLineNo">574</span> throw new ParseException(session, "Invalid Unicode escape sequence in string.");<a name="line.574"></a>
+<span class="sourceLineNo">575</span> }<a name="line.575"></a>
+<span class="sourceLineNo">576</span> break;<a name="line.576"></a>
+<span class="sourceLineNo">577</span> }<a name="line.577"></a>
+<span class="sourceLineNo">578</span> default:<a name="line.578"></a>
+<span class="sourceLineNo">579</span> throw new ParseException(session, "Invalid escape sequence in string.");<a name="line.579"></a>
+<span class="sourceLineNo">580</span> }<a name="line.580"></a>
+<span class="sourceLineNo">581</span> isInEscape = false;<a name="line.581"></a>
+<span class="sourceLineNo">582</span> } else {<a name="line.582"></a>
+<span class="sourceLineNo">583</span> if (c == '\\') {<a name="line.583"></a>
+<span class="sourceLineNo">584</span> isInEscape = true;<a name="line.584"></a>
+<span class="sourceLineNo">585</span> r.delete();<a name="line.585"></a>
+<span class="sourceLineNo">586</span> } else if (isQuoted) {<a name="line.586"></a>
+<span class="sourceLineNo">587</span> if (c == qc) {<a name="line.587"></a>
+<span class="sourceLineNo">588</span> s = r.getMarked(1, -1);<a name="line.588"></a>
+<span class="sourceLineNo">589</span> break;<a name="line.589"></a>
+<span class="sourceLineNo">590</span> }<a name="line.590"></a>
+<span class="sourceLineNo">591</span> } else {<a name="line.591"></a>
+<span class="sourceLineNo">592</span> if (c == ',' || c == '}' || session.isWhitespace(c)) {<a name="line.592"></a>
+<span class="sourceLineNo">593</span> s = r.getMarked(0, -1);<a name="line.593"></a>
+<span class="sourceLineNo">594</span> r.unread();<a name="line.594"></a>
+<span class="sourceLineNo">595</span> break;<a name="line.595"></a>
+<span class="sourceLineNo">596</span> } else if (c == -1) {<a name="line.596"></a>
+<span class="sourceLineNo">597</span> s = r.getMarked(0, 0);<a name="line.597"></a>
+<span class="sourceLineNo">598</span> break;<a name="line.598"></a>
+<span class="sourceLineNo">599</span> }<a name="line.599"></a>
+<span class="sourceLineNo">600</span> }<a name="line.600"></a>
+<span class="sourceLineNo">601</span> }<a name="line.601"></a>
+<span class="sourceLineNo">602</span> }<a name="line.602"></a>
+<span class="sourceLineNo">603</span> if (s == null)<a name="line.603"></a>
+<span class="sourceLineNo">604</span> throw new ParseException(session, "Could not find expected end character ''{0}''.", (char)qc);<a name="line.604"></a>
+<span class="sourceLineNo">605</span><a name="line.605"></a>
+<span class="sourceLineNo">606</span> // Look for concatenated string (i.e. whitespace followed by +).<a name="line.606"></a>
+<span class="sourceLineNo">607</span> skipCommentsAndSpace(session, r);<a name="line.607"></a>
+<span class="sourceLineNo">608</span> if (r.peek() == '+') {<a name="line.608"></a>
+<span class="sourceLineNo">609</span> if (session.isStrict())<a name="line.609"></a>
+<span class="sourceLineNo">610</span> throw new ParseException(session, "String concatenation detected.");<a name="line.610"></a>
+<span class="sourceLineNo">611</span> r.read(); // Skip past '+'<a name="line.611"></a>
+<span class="sourceLineNo">612</span> skipCommentsAndSpace(session, r);<a name="line.612"></a>
+<span class="sourceLineNo">613</span> s += parseString(session, r);<a name="line.613"></a>
+<span class="sourceLineNo">614</span> }<a name="line.614"></a>
+<span class="sourceLineNo">615</span> return session.trim(s); // End of input reached.<a name="line.615"></a>
+<span class="sourceLineNo">616</span> }<a name="line.616"></a>
+<span class="sourceLineNo">617</span><a name="line.617"></a>
+<span class="sourceLineNo">618</span> /*<a name="line.618"></a>
+<span class="sourceLineNo">619</span> * Looks for the keywords true, false, or null.<a name="line.619"></a>
+<span class="sourceLineNo">620</span> * Throws an exception if any of these keywords are not found at the specified position.<a name="line.620"></a>
+<span class="sourceLineNo">621</span> */<a name="line.621"></a>
+<span class="sourceLineNo">622</span> private static void parseKeyword(JsonParserSession session, String keyword, ParserReader r) throws Exception {<a name="line.622"></a>
+<span class="sourceLineNo">623</span> try {<a name="line.623"></a>
+<span class="sourceLineNo">624</span> String s = r.read(keyword.length());<a name="line.624"></a>
+<span class="sourceLineNo">625</span> if (s.equals(keyword))<a name="line.625"></a>
+<span class="sourceLineNo">626</span> return;<a name="line.626"></a>
+<span class="sourceLineNo">627</span> throw new ParseException(session, "Unrecognized syntax.");<a name="line.627"></a>
+<span class="sourceLineNo">628</span> } catch (IndexOutOfBoundsException e) {<a name="line.628"></a>
+<span class="sourceLineNo">629</span> throw new ParseException(session, "Unrecognized syntax.");<a name="line.629"></a>
+<span class="sourceLineNo">630</span> }<a name="line.630"></a>
+<span class="sourceLineNo">631</span> }<a name="line.631"></a>
+<span class="sourceLineNo">632</span><a name="line.632"></a>
+<span class="sourceLineNo">633</span> /*<a name="line.633"></a>
+<span class="sourceLineNo">634</span> * Doesn't actually parse anything, but moves the position beyond any whitespace or comments.<a name="line.634"></a>
+<span class="sourceLineNo">635</span> * If positionOnNext is 'true', then the cursor will be set to the point immediately after<a name="line.635"></a>
+<span class="sourceLineNo">636</span> * the comments and whitespace. Otherwise, the cursor will be set to the last position of<a name="line.636"></a>
+<span class="sourceLineNo">637</span> * the comments and whitespace.<a name="line.637"></a>
+<span class="sourceLineNo">638</span> */<a name="line.638"></a>
+<span class="sourceLineNo">639</span> private static void skipCommentsAndSpace(JsonParserSession session, ParserReader r) throws Exception {<a name="line.639"></a>
+<span class="sourceLineNo">640</span> int c = 0;<a name="line.640"></a>
+<span class="sourceLineNo">641</span> while ((c = r.read()) != -1) {<a name="line.641"></a>
+<span class="sourceLineNo">642</span> if (! session.isWhitespace(c)) {<a name="line.642"></a>
+<span class="sourceLineNo">643</span> if (c == '/') {<a name="line.643"></a>
+<span class="sourceLineNo">644</span> if (session.isStrict())<a name="line.644"></a>
+<span class="sourceLineNo">645</span> throw new ParseException(session, "Javascript comment detected.");<a name="line.645"></a>
+<span class="sourceLineNo">646</span> skipComments(session, r);<a name="line.646"></a>
+<span class="sourceLineNo">647</span> } else {<a name="line.647"></a>
+<span class="sourceLineNo">648</span> r.unread();<a name="line.648"></a>
+<span class="sourceLineNo">649</span> return;<a name="line.649"></a>
+<span class="sourceLineNo">650</span> }<a name="line.650"></a>
+<span class="sourceLineNo">651</span> }<a name="line.651"></a>
+<span class="sourceLineNo">652</span> }<a name="line.652"></a>
+<span class="sourceLineNo">653</span> }<a name="line.653"></a>
+<span class="sourceLineNo">654</span><a name="line.654"></a>
+<span class="sourceLineNo">655</span> /*<a name="line.655"></a>
+<span class="sourceLineNo">656</span> * Doesn't actually parse anything, but moves the position beyond the construct "{wrapperAttr:" when<a name="line.656"></a>
+<span class="sourceLineNo">657</span> * the @Json.wrapperAttr() annotation is used on a class.<a name="line.657"></a>
+<span class="sourceLineNo">658</span> */<a name="line.658"></a>
+<span class="sourceLineNo">659</span> private void skipWrapperAttrStart(JsonParserSession session, ParserReader r, String wrapperAttr) throws Exception {<a name="line.659"></a>
+<span class="sourceLineNo">660</span><a name="line.660"></a>
+<span class="sourceLineNo">661</span> int S0=0; // Looking for outer {<a name="line.661"></a>
+<span class="sourceLineNo">662</span> int S1=1; // Looking for attrName start.<a name="line.662"></a>
+<span class="sourceLineNo">663</span> int S3=3; // Found attrName end, looking for :.<a name="line.663"></a>
+<span class="sourceLineNo">664</span> int S4=4; // Found :, looking for valStart: { [ " ' LITERAL.<a name="line.664"></a>
+<span class="sourceLineNo">665</span><a name="line.665"></a>
+<span class="sourceLineNo">666</span> int state = S0;<a name="line.666"></a>
+<span class="sourceLineNo">667</span> String currAttr = null;<a name="line.667"></a>
+<span class="sourceLineNo">668</span> int c = 0;<a name="line.668"></a>
+<span class="sourceLineNo">669</span> while (c != -1) {<a name="line.669"></a>
+<span class="sourceLineNo">670</span> c = r.read();<a name="line.670"></a>
+<span class="sourceLineNo">671</span> if (state == S0) {<a name="line.671"></a>
+<span class="sourceLineNo">672</span> if (c == '{')<a name="line.672"></a>
+<span class="sourceLineNo">673</span> state = S1;<a name="line.673"></a>
+<span class="sourceLineNo">674</span> } else if (state == S1) {<a name="line.674"></a>
+<span class="sourceLineNo">675</span> if (session.isCommentOrWhitespace(c)) {<a name="line.675"></a>
+<span class="sourceLineNo">676</span> skipCommentsAndSpace(session, r.unread());<a name="line.676"></a>
+<span class="sourceLineNo">677</span> } else {<a name="line.677"></a>
+<span class="sourceLineNo">678</span> currAttr = parseFieldName(session, r.unread());<a name="line.678"></a>
+<span class="sourceLineNo">679</span> if (! currAttr.equals(wrapperAttr))<a name="line.679"></a>
+<span class="sourceLineNo">680</span> throw new ParseException(session, "Expected to find wrapper attribute ''{0}'' but found attribute ''{1}''", wrapperAttr, currAttr);<a name="line.680"></a>
+<span class="sourceLineNo">681</span> state = S3;<a name="line.681"></a>
+<span class="sourceLineNo">682</span> }<a name="line.682"></a>
+<span class="sourceLineNo">683</span> } else if (state == S3) {<a name="line.683"></a>
+<span class="sourceLineNo">684</span> if (c == ':')<a name="line.684"></a>
+<span class="sourceLineNo">685</span> state = S4;<a name="line.685"></a>
+<span class="sourceLineNo">686</span> } else if (state == S4) {<a name="line.686"></a>
+<span class="sourceLineNo">687</span> if (session.isCommentOrWhitespace(c)) {<a name="line.687"></a>
+<span class="sourceLineNo">688</span> skipCommentsAndSpace(session, r.unread());<a name="line.688"></a>
+<span class="sourceLineNo">689</span> } else {<a name="line.689"></a>
+<span class="sourceLineNo">690</span> r.unread();<a name="line.690"></a>
+<span class="sourceLineNo">691</span> return;<a name="line.691"></a>
+<span class="sourceLineNo">692</span> }<a name="line.692"></a>
+<span class="sourceLineNo">693</span> }<a name="line.693"></a>
+<span class="sourceLineNo">694</span> }<a name="line.694"></a>
+<span class="sourceLineNo">695</span> if (state == S0)<a name="line.695"></a>
+<span class="sourceLineNo">696</span> throw new ParseException(session, "Expected '{' at beginning of JSON object.");<a name="line.696"></a>
+<span class="sourceLineNo">697</span> if (state == S1)<a name="line.697"></a>
+<span class="sourceLineNo">698</span> throw new ParseException(session, "Could not find attribute name on JSON object.");<a name="line.698"></a>
+<span class="sourceLineNo">699</span> if (state == S3)<a name="line.699"></a>
+<span class="sourceLineNo">700</span> throw new ParseException(session, "Could not find ':' following attribute name on JSON object.");<a name="line.700"></a>
+<span class="sourceLineNo">701</span> if (state == S4)<a name="line.701"></a>
+<span class="sourceLineNo">702</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.702"></a>
+<span class="sourceLineNo">703</span> }<a name="line.703"></a>
<span class="sourceLineNo">704</span><a name="line.704"></a>
-<span class="sourceLineNo">705</span> int S0=0; // Looking for outer {<a name="line.705"></a>
-<span class="sourceLineNo">706</span> int S1=1; // Looking for attrName start.<a name="line.706"></a>
-<span class="sourceLineNo">707</span> int S3=3; // Found attrName end, looking for :.<a name="line.707"></a>
-<span class="sourceLineNo">708</span> int S4=4; // Found :, looking for valStart: { [ " ' LITERAL.<a name="line.708"></a>
-<span class="sourceLineNo">709</span><a name="line.709"></a>
-<span class="sourceLineNo">710</span> int state = S0;<a name="line.710"></a>
-<span class="sourceLineNo">711</span> String currAttr = null;<a name="line.711"></a>
-<span class="sourceLineNo">712</span> int c = 0;<a name="line.712"></a>
-<span class="sourceLineNo">713</span> while (c != -1) {<a name="line.713"></a>
-<span class="sourceLineNo">714</span> c = r.read();<a name="line.714"></a>
-<span class="sourceLineNo">715</span> if (state == S0) {<a name="line.715"></a>
-<span class="sourceLineNo">716</span> if (c == '{')<a name="line.716"></a>
-<span class="sourceLineNo">717</span> state = S1;<a name="line.717"></a>
-<span class="sourceLineNo">718</span> } else if (state == S1) {<a name="line.718"></a>
-<span class="sourceLineNo">719</span> if (session.isCommentOrWhitespace(c)) {<a name="line.719"></a>
-<span class="sourceLineNo">720</span> skipCommentsAndSpace(session, r.unread());<a name="line.720"></a>
-<span class="sourceLineNo">721</span> } else {<a name="line.721"></a>
-<span class="sourceLineNo">722</span> currAttr = parseFieldName(session, r.unread());<a name="line.722"></a>
-<span class="sourceLineNo">723</span> if (! currAttr.equals(wrapperAttr))<a name="line.723"></a>
-<span class="sourceLineNo">724</span> throw new ParseException(session, "Expected to find wrapper attribute ''{0}'' but found attribute ''{1}''", wrapperAttr, currAttr);<a name="line.724"></a>
-<span class="sourceLineNo">725</span> state = S3;<a name="line.725"></a>
-<span class="sourceLineNo">726</span> }<a name="line.726"></a>
-<span class="sourceLineNo">727</span> } else if (state == S3) {<a name="line.727"></a>
-<span class="sourceLineNo">728</span> if (c == ':')<a name="line.728"></a>
-<span class="sourceLineNo">729</span> state = S4;<a name="line.729"></a>
-<span class="sourceLineNo">730</span> } else if (state == S4) {<a name="line.730"></a>
-<span class="sourceLineNo">731</span> if (session.isCommentOrWhitespace(c)) {<a name="line.731"></a>
-<span class="sourceLineNo">732</span> skipCommentsAndSpace(session, r.unread());<a name="line.732"></a>
-<span class="sourceLineNo">733</span> } else {<a name="line.733"></a>
-<span class="sourceLineNo">734</span> r.unread();<a name="line.734"></a>
-<span class="sourceLineNo">735</span> return;<a name="line.735"></a>
-<span class="sourceLineNo">736</span> }<a name="line.736"></a>
-<span class="sourceLineNo">737</span> }<a name="line.737"></a>
-<span class="sourceLineNo">738</span> }<a name="line.738"></a>
-<span class="sourceLineNo">739</span> if (state == S0)<a name="line.739"></a>
-<span class="sourceLineNo">740</span> throw new ParseException(session, "Expected '{' at beginning of JSON object.");<a name="line.740"></a>
-<span class="sourceLineNo">741</span> if (state == S1)<a name="line.741"></a>
-<span class="sourceLineNo">742</span> throw new ParseException(session, "Could not find attribute name on JSON object.");<a name="line.742"></a>
-<span class="sourceLineNo">743</span> if (state == S3)<a name="line.743"></a>
-<span class="sourceLineNo">744</span> throw new ParseException(session, "Could not find ':' following attribute name on JSON object.");<a name="line.744"></a>
-<span class="sourceLineNo">745</span> if (state == S4)<a name="line.745"></a>
-<span class="sourceLineNo">746</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.746"></a>
+<span class="sourceLineNo">705</span> /*<a name="line.705"></a>
+<span class="sourceLineNo">706</span> * Doesn't actually parse anything, but moves the position beyond the construct "}" when<a name="line.706"></a>
+<span class="sourceLineNo">707</span> * the @Json.wrapperAttr() annotation is used on a class.<a name="line.707"></a>
+<span class="sourceLineNo">708</span> */<a name="line.708"></a>
+<span class="sourceLineNo">709</span> private static void skipWrapperAttrEnd(JsonParserSession session, ParserReader r) throws ParseException, IOException {<a name="line.709"></a>
+<span class="sourceLineNo">710</span> int c = 0;<a name="line.710"></a>
+<span class="sourceLineNo">711</span> while ((c = r.read()) != -1) {<a name="line.711"></a>
+<span class="sourceLineNo">712</span> if (! session.isWhitespace(c)) {<a name="line.712"></a>
+<span class="sourceLineNo">713</span> if (c == '/') {<a name="line.713"></a>
+<span class="sourceLineNo">714</span> if (session.isStrict())<a name="line.714"></a>
+<span class="sourceLineNo">715</span> throw new ParseException(session, "Javascript comment detected.");<a name="line.715"></a>
+<span class="sourceLineNo">716</span> skipComments(session, r);<a name="line.716"></a>
+<span class="sourceLineNo">717</span> } else if (c == '}') {<a name="line.717"></a>
+<span class="sourceLineNo">718</span> return;<a name="line.718"></a>
+<span class="sourceLineNo">719</span> } else {<a name="line.719"></a>
+<span class="sourceLineNo">720</span> throw new ParseException(session, "Could not find '}' at the end of JSON wrapper object.");<a name="line.720"></a>
+<span class="sourceLineNo">721</span> }<a name="line.721"></a>
+<span class="sourceLineNo">722</span> }<a name="line.722"></a>
+<span class="sourceLineNo">723</span> }<a name="line.723"></a>
+<span class="sourceLineNo">724</span> }<a name="line.724"></a>
+<span class="sourceLineNo">725</span><a name="line.725"></a>
+<span class="sourceLineNo">726</span> /*<a name="line.726"></a>
+<span class="sourceLineNo">727</span> * Doesn't actually parse anything, but when positioned at the beginning of comment,<a name="line.727"></a>
+<span class="sourceLineNo">728</span> * it will move the pointer to the last character in the comment.<a name="line.728"></a>
+<span class="sourceLineNo">729</span> */<a name="line.729"></a>
+<span class="sourceLineNo">730</span> private static void skipComments(JsonParserSession session, ParserReader r) throws ParseException, IOException {<a name="line.730"></a>
+<span class="sourceLineNo">731</span> int c = r.read();<a name="line.731"></a>
+<span class="sourceLineNo">732</span> // "/* */" style comments<a name="line.732"></a>
+<span class="sourceLineNo">733</span> if (c == '*') {<a name="line.733"></a>
+<span class="sourceLineNo">734</span> while (c != -1)<a name="line.734"></a>
+<span class="sourceLineNo">735</span> if ((c = r.read()) == '*')<a name="line.735"></a>
+<span class="sourceLineNo">736</span> if ((c = r.read()) == '/')<a name="line.736"></a>
+<span class="sourceLineNo">737</span> return;<a name="line.737"></a>
+<span class="sourceLineNo">738</span> // "//" style comments<a name="line.738"></a>
+<span class="sourceLineNo">739</span> } else if (c == '/') {<a name="line.739"></a>
+<span class="sourceLineNo">740</span> while (c != -1) {<a name="line.740"></a>
+<span class="sourceLineNo">741</span> c = r.read();<a name="line.741"></a>
+<span class="sourceLineNo">742</span> if (c == -1 || c == '\n')<a name="line.742"></a>
+<span class="sourceLineNo">743</span> return;<a name="line.743"></a>
+<span class="sourceLineNo">744</span> }<a name="line.744"></a>
+<span class="sourceLineNo">745</span> }<a name="line.745"></a>
+<span class="sourceLineNo">746</span> throw new ParseException(session, "Open ended comment.");<a name="line.746"></a>
<span class="sourceLineNo">747</span> }<a name="line.747"></a>
<span class="sourceLineNo">748</span><a name="line.748"></a>
<span class="sourceLineNo">749</span> /*<a name="line.749"></a>
-<span class="sourceLineNo">750</span> * Doesn't actually parse anything, but moves the position beyond the construct "}" when<a name="line.750"></a>
-<span class="sourceLineNo">751</span> * the @Json.wrapperAttr() annotation is used on a class.<a name="line.751"></a>
+<span class="sourceLineNo">750</span> * Call this method after you've finished a parsing a string to make sure that if there's any<a name="line.750"></a>
+<span class="sourceLineNo">751</span> * remainder in the input, that it consists only of whitespace and comments.<a name="line.751"></a>
<span class="sourceLineNo">752</span> */<a name="line.752"></a>
-<span class="sourceLineNo">753</span> private static void skipWrapperAttrEnd(JsonParserSession session, ParserReader r) throws ParseException, IOException {<a name="line.753"></a>
-<span class="sourceLineNo">754</span> int c = 0;<a name="line.754"></a>
-<span class="sourceLineNo">755</span> while ((c = r.read()) != -1) {<a name="line.755"></a>
-<span class="sourceLineNo">756</span> if (! session.isWhitespace(c)) {<a name="line.756"></a>
-<span class="sourceLineNo">757</span> if (c == '/') {<a name="line.757"></a>
-<span class="sourceLineNo">758</span> if (session.isStrict())<a name="line.758"></a>
-<span class="sourceLineNo">759</span> throw new ParseException(session, "Javascript comment detected.");<a name="line.759"></a>
-<span class="sourceLineNo">760</span> skipComments(session, r);<a name="line.760"></a>
-<span class="sourceLineNo">761</span> } else if (c == '}') {<a name="line.761"></a>
-<span class="sourceLineNo">762</span> return;<a name="line.762"></a>
-<span class="sourceLineNo">763</span> } else {<a name="line.763"></a>
-<span class="sourceLineNo">764</span> throw new ParseException(session, "Could not find '}' at the end of JSON wrapper object.");<a name="line.764"></a>
-<span class="sourceLineNo">765</span> }<a name="line.765"></a>
-<span class="sourceLineNo">766</span> }<a name="line.766"></a>
-<span class="sourceLineNo">767</span> }<a name="line.767"></a>
+<span class="sourceLineNo">753</span> private static void validateEnd(JsonParserSession session, ParserReader r) throws Exception {<a name="line.753"></a>
+<span class="sourceLineNo">754</span> skipCommentsAndSpace(session, r);<a name="line.754"></a>
+<span class="sourceLineNo">755</span> int c = r.read();<a name="line.755"></a>
+<span class="sourceLineNo">756</span> if (c != -1 && c != ';') // var x = {...}; expressions can end with a semicolon.<a name="line.756"></a>
+<span class="sourceLineNo">757</span> throw new ParseException(session, "Remainder after parse: ''{0}''.", (char)c);<a name="line.757"></a>
+<span class="sourceLineNo">758</span> }<a name="line.758"></a>
+<span class="sourceLineNo">759</span><a name="line.759"></a>
+<span class="sourceLineNo">760</span><a name="line.760"></a>
+<span class="sourceLineNo">761</span> //--------------------------------------------------------------------------------<a name="line.761"></a>
+<span class="sourceLineNo">762</span> // Entry point methods<a name="line.762"></a>
+<span class="sourceLineNo">763</span> //--------------------------------------------------------------------------------<a name="line.763"></a>
+<span class="sourceLineNo">764</span><a name="line.764"></a>
+<span class="sourceLineNo">765</span> @Override /* Parser */<a name="line.765"></a>
+<span class="sourceLineNo">766</span> public JsonParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.766"></a>
+<span class="sourceLineNo">767</span> return new JsonParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);<a name="line.767"></a>
<span class="sourceLineNo">768</span> }<a name="line.768"></a>
<span class="sourceLineNo">769</span><a name="line.769"></a>
-<span class="sourceLineNo">770</span> /*<a name="line.770"></a>
-<span class="sourceLineNo">771</span> * Doesn't actually parse anything, but when positioned at the beginning of comment,<a name="line.771"></a>
-<span class="sourceLineNo">772</span> * it will move the pointer to the last character in the comment.<a name="line.772"></a>
-<span class="sourceLineNo">773</span> */<a name="line.773"></a>
-<span class="sourceLineNo">774</span> private static void skipComments(JsonParserSession session, ParserReader r) throws ParseException, IOException {<a name="line.774"></a>
-<span class="sourceLineNo">775</span> int c = r.read();<a name="line.775"></a>
-<span class="sourceLineNo">776</span> // "/* */" style comments<a name="line.776"></a>
-<span class="sourceLineNo">777</span> if (c == '*') {<a name="line.777"></a>
-<span class="sourceLineNo">778</span> while (c != -1)<a name="line.778"></a>
-<span class="sourceLineNo">779</span> if ((c = r.read()) == '*')<a name="line.779"></a>
-<span class="sourceLineNo">780</span> if ((c = r.read()) == '/')<a name="line.780"></a>
-<span class="sourceLineNo">781</span> return;<a name="line.781"></a>
-<span class="sourceLineNo">782</span> // "//" style comments<a name="line.782"></a>
-<span class="sourceLineNo">783</span> } else if (c == '/') {<a name="line.783"></a>
-<span class="sourceLineNo">784</span> while (c != -1) {<a name="line.784"></a>
-<span class="sourceLineNo">785</span> c = r.read();<a name="line.785"></a>
-<span class="sourceLineNo">786</span> if (c == -1 || c == '\n')<a name="line.786"></a>
-<span class="sourceLineNo">787</span> return;<a name="line.787"></a>
-<span class="sourceLineNo">788</span> }<a name="line.788"></a>
-<span class="sourceLineNo">789</span> }<a name="line.789"></a>
-<span class="sourceLineNo">790</span> throw new ParseException(session, "Open ended comment.");<a name="line.790"></a>
-<span class="sourceLineNo">791</span> }<a name="line.791"></a>
-<span class="sourceLineNo">792</span><a name="line.792"></a>
-<span class="sourceLineNo">793</span> /*<a name="line.793"></a>
-<span class="sourceLineNo">794</span> * Call this method after you've finished a parsing a string to make sure that if there's any<a name="line.794"></a>
-<span class="sourceLineNo">795</span> * remainder in the input, that it consists only of whitespace and comments.<a name="line.795"></a>
-<span class="sourceLineNo">796</span> */<a name="line.796"></a>
-<span class="sourceLineNo">797</span> private static void validateEnd(JsonParserSession session, ParserReader r) throws Exception {<a name="line.797"></a>
-<span class="sourceLineNo">798</span> skipCommentsAndSpace(session, r);<a name="line.798"></a>
-<span class="sourceLineNo">799</span> int c = r.read();<a name="line.799"></a>
-<span class="sourceLineNo">800</span> if (c != -1 && c != ';') // var x = {...}; expressions can end with a semicolon.<a name="line.800"></a>
-<span class="sourceLineNo">801</span> throw new ParseException(session, "Remainder after parse: ''{0}''.", (char)c);<a name="line.801"></a>
-<span class="sourceLineNo">802</span> }<a name="line.802"></a>
-<span class="sourceLineNo">803</span><a name="line.803"></a>
-<span class="sourceLineNo">804</span><a name="line.804"></a>
-<span class="sourceLineNo">805</span> //--------------------------------------------------------------------------------<a name="line.805"></a>
-<span class="sourceLineNo">806</span> // Entry point methods<a name="line.806"></a>
-<span class="sourceLineNo">807</span> //--------------------------------------------------------------------------------<a name="line.807"></a>
-<span class="sourceLineNo">808</span><a name="line.808"></a>
-<span class="sourceLineNo">809</span> @Override /* Parser */<a name="line.809"></a>
-<span class="sourceLineNo">810</span> public JsonParserSession createSession(Object input, ObjectMap op, Method javaMethod, Object outer, Locale locale, TimeZone timeZone, MediaType mediaType) {<a name="line.810"></a>
-<span class="sourceLineNo">811</span> return new JsonParserSession(ctx, op, input, javaMethod, outer, locale, timeZone, mediaType);<a name="line.811"></a>
-<span class="sourceLineNo">812</span> }<a name="line.812"></a>
-<span class="sourceLineNo">813</span><a name="line.813"></a>
-<span class="sourceLineNo">814</span> @Override /* Parser */<a name="line.814"></a>
-<span class="sourceLineNo">815</span> protected <T> T doParse(ParserSession session, ClassMeta<T> type) throws Exception {<a name="line.815"></a>
-<span class="sourceLineNo">816</span> JsonParserSession s = (JsonParserSession)session;<a name="line.816"></a>
-<span class="sourceLineNo">817</span> ParserReader r = s.getReader();<a name="line.817"></a>
-<span class="sourceLineNo">818</span> if (r == null)<a name="line.818"></a>
-<span class="sourceLineNo">819</span> return null;<a name="line.819"></a>
-<span class="sourceLineNo">820</span> T o = parseAnything(s, type, r, s.getOuter(), null);<a name="line.820"></a>
-<span class="sourceLineNo">821</span> validateEnd(s, r);<a name="line.821"></a>
-<span class="sourceLineNo">822</span> return o;<a name="line.822"></a>
-<span class="sourceLineNo">823</span> }<a name="line.823"></a>
-<span class="sourceLineNo">824</span><a name="line.824"></a>
-<span class="sourceLineNo">825</span> @Override /* ReaderParser */<a name="line.825"></a>
-<span class="sourceLineNo">826</span> protected <K,V> Map<K,V> doParseIntoMap(ParserSession session, Map<K,V> m, Type keyType, Type valueType) throws Exception {<a name="line.826"></a>
-<span class="sourceLineNo">827</span> JsonParserSession s = (JsonParserSession)session;<a name="line.827"></a>
-<span class="sourceLineNo">828</span> ParserReader r = s.getReader();<a name="line.828"></a>
-<span class="sourceLineNo">829</span> m = parseIntoMap2(s, r, m, (ClassMeta<K>)s.getClassMeta(keyType), (ClassMeta<V>)s.getClassMeta(valueType), null);<a name="line.829"></a>
-<span class="sourceLineNo">830</span> validateEnd(s, r);<a name="line.830"></a>
-<span class="sourceLineNo">831</span> return m;<a name="line.831"></a>
-<span class="sourceLineNo">832</span> }<a name="line.832"></a>
-<span class="sourceLineNo">833</span><a name="line.833"></a>
-<span class="sourceLineNo">834</span> @Override /* ReaderParser */<a name="line.834"></a>
-<span class="sourceLineNo">835</span> protected <E> Collection<E> doParseIntoCollection(ParserSession session, Collection<E> c, Type elementType) throws Exception {<a name="line.835"></a>
-<span class="sourceLineNo">836</span> JsonParserSession s = (JsonParserSession)session;<a name="line.836"></a>
-<span class="sourceLineNo">837</span> ParserReader r = s.getReader();<a name="line.837"></a>
-<span class="sourceLineNo">838</span> c = parseIntoCollection2(s, r, c, (ClassMeta<E>)s.getClassMeta(elementType), null);<a name="line.838"></a>
-<span class="sourceLineNo">839</span> validateEnd(s, r);<a name="line.839"></a>
-<span class="sourceLineNo">840</span> return c;<a name="line.840"></a>
-<span class="sourceLineNo">841</span> }<a name="line.841"></a>
-<span class="sourceLineNo">842</span><a name="line.842"></a>
-<span class="sourceLineNo">843</span> @Override /* ReaderParser */<a name="line.843"></a>
-<span class="sourceLineNo">844</span> protected Object[] doParseArgs(ParserSession session, ClassMeta<?>[] argTypes) throws Exception {<a name="line.844"></a>
-<span class="sourceLineNo">845</span> JsonParserSession s = (JsonParserSession)session;<a name="line.845"></a>
-<span class="sourceLineNo">846</span> ParserReader r = s.getReader();<a name="line.846"></a>
-<span class="sourceLineNo">847</span> Object[] a = parseArgs(s, r, argTypes);<a name="line.847"></a>
-<span class="sourceLineNo">848</span> validateEnd(s, r);<a name="line.848"></a>
-<span class="sourceLineNo">849</span> return a;<a name="line.849"></a>
-<span class="sourceLineNo">850</span> }<a name="line.850"></a>
-<span class="sourceLineNo">851</span>}<a name="line.851"></a>
+<span class="sourceLineNo">770</span> @Override /* Parser */<a name="line.770"></a>
+<span class="sourceLineNo">771</span> protected <T> T doParse(ParserSession session, ClassMeta<T> type) throws Exception {<a name="line.771"></a>
+<span class="sourceLineNo">772</span> JsonParserSession s = (JsonParserSession)session;<a name="line.772"></a>
+<span class="sourceLineNo">773</span> ParserReader r = s.getReader();<a name="line.773"></a>
+<span class="sourceLineNo">774</span> if (r == null)<a name="line.774"></a>
+<span class="sourceLineNo">775</span> return null;<a name="line.775"></a>
+<span class="sourceLineNo">776</span> T o = parseAnything(s, type, r, s.getOuter(), null);<a name="line.776"></a>
+<span class="sourceLineNo">777</span> validateEnd(s, r);<a name="line.777"></a>
+<span class="sourceLineNo">778</span> return o;<a name="line.778"></a>
+<span class="sourceLineNo">779</span> }<a name="line.779"></a>
+<span class="sourceLineNo">780</span><a name="line.780"></a>
+<span class="sourceLineNo">781</span> @Override /* ReaderParser */<a name="line.781"></a>
+<span class="sourceLineNo">782</span> protected <K,V> Map<K,V> doParseIntoMap(ParserSession session, Map<K,V> m, Type keyType, Type valueType) throws Exception {<a name="line.782"></a>
+<span class="sourceLineNo">783</span> JsonParserSession s = (JsonParserSession)session;<a name="line.783"></a>
+<span class="sourceLineNo">784</span> ParserReader r = s.getReader();<a name="line.784"></a>
+<span class="sourceLineNo">785</span> m = parseIntoMap2(s, r, m, (ClassMeta<K>)s.getClassMeta(keyType), (ClassMeta<V>)s.getClassMeta(valueType), null);<a name="line.785"></a>
+<span class="sourceLineNo">786</span> validateEnd(s, r);<a name="line.786"></a>
+<span class="sourceLineNo">787</span> return m;<a name="line.787"></a>
+<span class="sourceLineNo">788</span> }<a name="line.788"></a>
+<span class="sourceLineNo">789</span><a name="line.789"></a>
+<span class="sourceLineNo">790</span> @Override /* ReaderParser */<a name="line.790"></a>
+<span class="sourceLineNo">791</span> protected <E> Collection<E> doParseIntoCollection(ParserSession session, Collection<E> c, Type elementType) throws Exception {<a name="line.791"></a>
+<span class="sourceLineNo">792</span> JsonParserSession s = (JsonParserSession)session;<a name="line.792"></a>
+<span class="sourceLineNo">793</span> ParserReader r = s.getReader();<a name="line.793"></a>
+<span class="sourceLineNo">794</span> c = parseIntoCollection2(s, r, c, s.getClassMeta(elementType), null);<a name="line.794"></a>
+<span class="sourceLineNo">795</span> validateEnd(s, r);<a name="line.795"></a>
+<span class="sourceLineNo">796</span> return c;<a name="line.796"></a>
+<span class="sourceLineNo">797</span> }<a name="line.797"></a>
+<span class="sourceLineNo">798</span>}<a name="line.798"></a>