http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/02c10736/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 efd6a9e..30d44bb 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 @@ -105,745 +105,806 @@ <span class="sourceLineNo">097</span> public static final JsonParser DEFAULT = new JsonParser().lock();<a name="line.97"></a> <span class="sourceLineNo">098</span><a name="line.98"></a> <span class="sourceLineNo">099</span> /** Default parser, all default settings.*/<a name="line.99"></a> -<span class="sourceLineNo">100</span> public static final JsonParser DEFAULT_STRICT = new JsonParser().setProperty(JSON_strictMode, true).lock();<a name="line.100"></a> +<span class="sourceLineNo">100</span> public static final JsonParser DEFAULT_STRICT = new JsonParser().setProperty(PARSER_strict, true).lock();<a name="line.100"></a> <span class="sourceLineNo">101</span><a name="line.101"></a> -<span class="sourceLineNo">102</span> private <T> T parseAnything(JsonParserSession session, ClassMeta<T> eType, ParserReader r, Object outer, BeanPropertyMeta pMeta) throws Exception {<a name="line.102"></a> +<span class="sourceLineNo">102</span> private static final AsciiSet decChars = new AsciiSet("0123456789");<a name="line.102"></a> <span class="sourceLineNo">103</span><a name="line.103"></a> -<span class="sourceLineNo">104</span> BeanContext bc = session.getBeanContext();<a name="line.104"></a> -<span class="sourceLineNo">105</span> if (eType == null)<a name="line.105"></a> -<span class="sourceLineNo">106</span> eType = (ClassMeta<T>)object();<a name="line.106"></a> -<span class="sourceLineNo">107</span> PojoSwap<T,Object> transform = (PojoSwap<T,Object>)eType.getPojoSwap();<a name="line.107"></a> -<span class="sourceLineNo">108</span> ClassMeta<?> sType = eType.getSerializedClassMeta();<a name="line.108"></a> -<span class="sourceLineNo">109</span> session.setCurrentClass(sType);<a name="line.109"></a> -<span class="sourceLineNo">110</span> String wrapperAttr = sType.getExtendedMeta(JsonClassMeta.class).getWrapperAttr();<a name="line.110"></a> -<span class="sourceLineNo">111</span> BeanDictionary bd = pMeta == null ? bc.getBeanDictionary() : pMeta.getBeanDictionary();<a name="line.111"></a> -<span class="sourceLineNo">112</span><a name="line.112"></a> -<span class="sourceLineNo">113</span> Object o = null;<a name="line.113"></a> +<span class="sourceLineNo">104</span> private <T> T parseAnything(JsonParserSession session, ClassMeta<T> eType, ParserReader r, Object outer, BeanPropertyMeta pMeta) throws Exception {<a name="line.104"></a> +<span class="sourceLineNo">105</span><a name="line.105"></a> +<span class="sourceLineNo">106</span> BeanContext bc = session.getBeanContext();<a name="line.106"></a> +<span class="sourceLineNo">107</span> if (eType == null)<a name="line.107"></a> +<span class="sourceLineNo">108</span> eType = (ClassMeta<T>)object();<a name="line.108"></a> +<span class="sourceLineNo">109</span> PojoSwap<T,Object> transform = (PojoSwap<T,Object>)eType.getPojoSwap();<a name="line.109"></a> +<span class="sourceLineNo">110</span> ClassMeta<?> sType = eType.getSerializedClassMeta();<a name="line.110"></a> +<span class="sourceLineNo">111</span> session.setCurrentClass(sType);<a name="line.111"></a> +<span class="sourceLineNo">112</span> String wrapperAttr = sType.getExtendedMeta(JsonClassMeta.class).getWrapperAttr();<a name="line.112"></a> +<span class="sourceLineNo">113</span> BeanDictionary bd = pMeta == null ? bc.getBeanDictionary() : pMeta.getBeanDictionary();<a name="line.113"></a> <span class="sourceLineNo">114</span><a name="line.114"></a> -<span class="sourceLineNo">115</span> skipCommentsAndSpace(session, r);<a name="line.115"></a> -<span class="sourceLineNo">116</span> if (wrapperAttr != null)<a name="line.116"></a> -<span class="sourceLineNo">117</span> skipWrapperAttrStart(session, r, wrapperAttr);<a name="line.117"></a> -<span class="sourceLineNo">118</span> int c = r.peek();<a name="line.118"></a> -<span class="sourceLineNo">119</span> if (c == -1) {<a name="line.119"></a> -<span class="sourceLineNo">120</span> // Let o be null.<a name="line.120"></a> -<span class="sourceLineNo">121</span> } else if ((c == ',' || c == '}' || c == ']')) {<a name="line.121"></a> -<span class="sourceLineNo">122</span> if (session.isStrictMode())<a name="line.122"></a> -<span class="sourceLineNo">123</span> throw new ParseException(session, "Missing value detected.");<a name="line.123"></a> -<span class="sourceLineNo">124</span> // Handle bug in Cognos 10.2.1 that can product non-existent values.<a name="line.124"></a> -<span class="sourceLineNo">125</span> // Let o be null;<a name="line.125"></a> -<span class="sourceLineNo">126</span> } else if (c == 'n') {<a name="line.126"></a> -<span class="sourceLineNo">127</span> parseKeyword(session, "null", r);<a name="line.127"></a> -<span class="sourceLineNo">128</span> } else if (sType.isObject()) {<a name="line.128"></a> -<span class="sourceLineNo">129</span> if (c == '{') {<a name="line.129"></a> -<span class="sourceLineNo">130</span> ObjectMap m2 = new ObjectMap(bc);<a name="line.130"></a> -<span class="sourceLineNo">131</span> parseIntoMap2(session, r, m2, string(), object(), pMeta);<a name="line.131"></a> -<span class="sourceLineNo">132</span> o = bd.cast(m2);<a name="line.132"></a> -<span class="sourceLineNo">133</span> } else if (c == '[')<a name="line.133"></a> -<span class="sourceLineNo">134</span> o = parseIntoCollection2(session, r, new ObjectList(bc), object(), pMeta);<a name="line.134"></a> -<span class="sourceLineNo">135</span> else if (c == '\'' || c == '"') {<a name="line.135"></a> -<span class="sourceLineNo">136</span> o = parseString(session, r);<a name="line.136"></a> -<span class="sourceLineNo">137</span> if (sType.isChar())<a name="line.137"></a> -<span class="sourceLineNo">138</span> o = o.toString().charAt(0);<a name="line.138"></a> -<span class="sourceLineNo">139</span> }<a name="line.139"></a> -<span class="sourceLineNo">140</span> else if (c >= '0' && c <= '9' || c == '-')<a name="line.140"></a> -<span class="sourceLineNo">141</span> o = parseNumber(session, r, null);<a name="line.141"></a> -<span class="sourceLineNo">142</span> else if (c == 't') {<a name="line.142"></a> -<span class="sourceLineNo">143</span> parseKeyword(session, "true", r);<a name="line.143"></a> -<span class="sourceLineNo">144</span> o = Boolean.TRUE;<a name="line.144"></a> -<span class="sourceLineNo">145</span> } else {<a name="line.145"></a> -<span class="sourceLineNo">146</span> parseKeyword(session, "false", r);<a name="line.146"></a> -<span class="sourceLineNo">147</span> o = Boolean.FALSE;<a name="line.147"></a> -<span class="sourceLineNo">148</span> }<a name="line.148"></a> -<span class="sourceLineNo">149</span> } else if (sType.isBoolean()) {<a name="line.149"></a> -<span class="sourceLineNo">150</span> o = parseBoolean(session, r);<a name="line.150"></a> -<span class="sourceLineNo">151</span> } else if (sType.isCharSequence()) {<a name="line.151"></a> -<span class="sourceLineNo">152</span> o = parseString(session, r);<a name="line.152"></a> -<span class="sourceLineNo">153</span> } else if (sType.isChar()) {<a name="line.153"></a> -<span class="sourceLineNo">154</span> o = parseString(session, r).charAt(0);<a name="line.154"></a> -<span class="sourceLineNo">155</span> } else if (sType.isNumber()) {<a name="line.155"></a> -<span class="sourceLineNo">156</span> o = parseNumber(session, r, (Class<? extends Number>)sType.getInnerClass());<a name="line.156"></a> -<span class="sourceLineNo">157</span> } else if (sType.isMap()) {<a name="line.157"></a> -<span class="sourceLineNo">158</span> Map m = (sType.canCreateNewInstance(outer) ? (Map)sType.newInstance(outer) : new ObjectMap(bc));<a name="line.158"></a> -<span class="sourceLineNo">159</span> o = parseIntoMap2(session, r, m, sType.getKeyType(), sType.getValueType(), pMeta);<a name="line.159"></a> -<span class="sourceLineNo">160</span> } else if (sType.isCollection()) {<a name="line.160"></a> -<span class="sourceLineNo">161</span> if (c == '{') {<a name="line.161"></a> -<span class="sourceLineNo">162</span> ObjectMap m = new ObjectMap(bc);<a name="line.162"></a> -<span class="sourceLineNo">163</span> parseIntoMap2(session, r, m, string(), object(), pMeta);<a name="line.163"></a> -<span class="sourceLineNo">164</span> o = bd.cast(m);<a name="line.164"></a> -<span class="sourceLineNo">165</span> } else {<a name="line.165"></a> -<span class="sourceLineNo">166</span> Collection l = (sType.canCreateNewInstance(outer) ? (Collection)sType.newInstance() : new ObjectList(bc));<a name="line.166"></a> -<span class="sourceLineNo">167</span> o = parseIntoCollection2(session, r, l, sType.getElementType(), pMeta);<a name="line.167"></a> -<span class="sourceLineNo">168</span> }<a name="line.168"></a> -<span class="sourceLineNo">169</span> } else if (sType.canCreateNewInstanceFromObjectMap(outer)) {<a name="line.169"></a> -<span class="sourceLineNo">170</span> ObjectMap m = new ObjectMap(bc);<a name="line.170"></a> -<span class="sourceLineNo">171</span> parseIntoMap2(session, r, m, string(), object(), pMeta);<a name="line.171"></a> -<span class="sourceLineNo">172</span> o = sType.newInstanceFromObjectMap(outer, m);<a name="line.172"></a> -<span class="sourceLineNo">173</span> } else if (sType.canCreateNewBean(outer)) {<a name="line.173"></a> -<span class="sourceLineNo">174</span> BeanMap m = bc.newBeanMap(outer, sType.getInnerClass());<a name="line.174"></a> -<span class="sourceLineNo">175</span> o = parseIntoBeanMap2(session, r, m).getBean();<a name="line.175"></a> -<span class="sourceLineNo">176</span> } else if (sType.canCreateNewInstanceFromString(outer) && (c == '\'' || c == '"')) {<a name="line.176"></a> -<span class="sourceLineNo">177</span> o = sType.newInstanceFromString(outer, parseString(session, r));<a name="line.177"></a> -<span class="sourceLineNo">178</span> } else if (sType.canCreateNewInstanceFromNumber(outer) && StringUtils.isFirstNumberChar((char)c)) {<a name="line.178"></a> -<span class="sourceLineNo">179</span> o = sType.newInstanceFromNumber(outer, parseNumber(session, r, sType.getNewInstanceFromNumberClass()));<a name="line.179"></a> -<span class="sourceLineNo">180</span> } else if (sType.isArray()) {<a name="line.180"></a> -<span class="sourceLineNo">181</span> if (c == '{') {<a name="line.181"></a> -<span class="sourceLineNo">182</span> ObjectMap m = new ObjectMap(bc);<a name="line.182"></a> -<span class="sourceLineNo">183</span> parseIntoMap2(session, r, m, string(), object(), pMeta);<a name="line.183"></a> -<span class="sourceLineNo">184</span> o = bd.cast(m);<a name="line.184"></a> -<span class="sourceLineNo">185</span> } else {<a name="line.185"></a> -<span class="sourceLineNo">186</span> ArrayList l = (ArrayList)parseIntoCollection2(session, r, new ArrayList(), sType.getElementType(), pMeta);<a name="line.186"></a> -<span class="sourceLineNo">187</span> o = bc.toArray(sType, l);<a name="line.187"></a> -<span class="sourceLineNo">188</span> }<a name="line.188"></a> -<span class="sourceLineNo">189</span> } else if (c == '{') {<a name="line.189"></a> -<span class="sourceLineNo">190</span> Map m = new ObjectMap(bc);<a name="line.190"></a> -<span class="sourceLineNo">191</span> parseIntoMap2(session, r, m, sType.getKeyType(), sType.getValueType(), pMeta);<a name="line.191"></a> -<span class="sourceLineNo">192</span> if (m.containsKey(bc.getBeanTypePropertyName()))<a name="line.192"></a> -<span class="sourceLineNo">193</span> o = bd.cast((ObjectMap)m);<a name="line.193"></a> -<span class="sourceLineNo">194</span> else<a name="line.194"></a> -<span class="sourceLineNo">195</span> throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.195"></a> -<span class="sourceLineNo">196</span> } else if (sType.canCreateNewInstanceFromString(outer) && ! session.isStrictMode()) {<a name="line.196"></a> -<span class="sourceLineNo">197</span> o = sType.newInstanceFromString(outer, parseString(session, r));<a name="line.197"></a> -<span class="sourceLineNo">198</span> } else {<a name="line.198"></a> -<span class="sourceLineNo">199</span> throw new ParseException(session, "Unrecognized syntax for class type ''{0}'', starting character ''{1}''", sType, (char)c);<a name="line.199"></a> -<span class="sourceLineNo">200</span> }<a name="line.200"></a> -<span class="sourceLineNo">201</span><a name="line.201"></a> -<span class="sourceLineNo">202</span> if (wrapperAttr != null)<a name="line.202"></a> -<span class="sourceLineNo">203</span> skipWrapperAttrEnd(session, r);<a name="line.203"></a> +<span class="sourceLineNo">115</span> Object o = null;<a name="line.115"></a> +<span class="sourceLineNo">116</span><a name="line.116"></a> +<span class="sourceLineNo">117</span> skipCommentsAndSpace(session, r);<a name="line.117"></a> +<span class="sourceLineNo">118</span> if (wrapperAttr != null)<a name="line.118"></a> +<span class="sourceLineNo">119</span> skipWrapperAttrStart(session, r, wrapperAttr);<a name="line.119"></a> +<span class="sourceLineNo">120</span> int c = r.peek();<a name="line.120"></a> +<span class="sourceLineNo">121</span> if (c == -1) {<a name="line.121"></a> +<span class="sourceLineNo">122</span> if (session.isStrict())<a name="line.122"></a> +<span class="sourceLineNo">123</span> throw new ParseException(session, "Empty input.");<a name="line.123"></a> +<span class="sourceLineNo">124</span> // Let o be null.<a name="line.124"></a> +<span class="sourceLineNo">125</span> } else if ((c == ',' || c == '}' || c == ']')) {<a name="line.125"></a> +<span class="sourceLineNo">126</span> if (session.isStrict())<a name="line.126"></a> +<span class="sourceLineNo">127</span> throw new ParseException(session, "Missing value detected.");<a name="line.127"></a> +<span class="sourceLineNo">128</span> // Handle bug in Cognos 10.2.1 that can product non-existent values.<a name="line.128"></a> +<span class="sourceLineNo">129</span> // Let o be null;<a name="line.129"></a> +<span class="sourceLineNo">130</span> } else if (c == 'n') {<a name="line.130"></a> +<span class="sourceLineNo">131</span> parseKeyword(session, "null", r);<a name="line.131"></a> +<span class="sourceLineNo">132</span> } else if (sType.isObject()) {<a name="line.132"></a> +<span class="sourceLineNo">133</span> if (c == '{') {<a name="line.133"></a> +<span class="sourceLineNo">134</span> ObjectMap m2 = new ObjectMap(bc);<a name="line.134"></a> +<span class="sourceLineNo">135</span> parseIntoMap2(session, r, m2, string(), object(), pMeta);<a name="line.135"></a> +<span class="sourceLineNo">136</span> o = bd.cast(m2);<a name="line.136"></a> +<span class="sourceLineNo">137</span> } else if (c == '[') {<a name="line.137"></a> +<span class="sourceLineNo">138</span> o = parseIntoCollection2(session, r, new ObjectList(bc), object(), pMeta);<a name="line.138"></a> +<span class="sourceLineNo">139</span> } else if (c == '\'' || c == '"') {<a name="line.139"></a> +<span class="sourceLineNo">140</span> o = parseString(session, r);<a name="line.140"></a> +<span class="sourceLineNo">141</span> if (sType.isChar())<a name="line.141"></a> +<span class="sourceLineNo">142</span> o = o.toString().charAt(0);<a name="line.142"></a> +<span class="sourceLineNo">143</span> } else if (c >= '0' && c <= '9' || c == '-' || c == '.') {<a name="line.143"></a> +<span class="sourceLineNo">144</span> o = parseNumber(session, r, null);<a name="line.144"></a> +<span class="sourceLineNo">145</span> } else if (c == 't') {<a name="line.145"></a> +<span class="sourceLineNo">146</span> parseKeyword(session, "true", r);<a name="line.146"></a> +<span class="sourceLineNo">147</span> o = Boolean.TRUE;<a name="line.147"></a> +<span class="sourceLineNo">148</span> } else {<a name="line.148"></a> +<span class="sourceLineNo">149</span> parseKeyword(session, "false", r);<a name="line.149"></a> +<span class="sourceLineNo">150</span> o = Boolean.FALSE;<a name="line.150"></a> +<span class="sourceLineNo">151</span> }<a name="line.151"></a> +<span class="sourceLineNo">152</span> } else if (sType.isBoolean()) {<a name="line.152"></a> +<span class="sourceLineNo">153</span> o = parseBoolean(session, r);<a name="line.153"></a> +<span class="sourceLineNo">154</span> } else if (sType.isCharSequence()) {<a name="line.154"></a> +<span class="sourceLineNo">155</span> o = parseString(session, r);<a name="line.155"></a> +<span class="sourceLineNo">156</span> } else if (sType.isChar()) {<a name="line.156"></a> +<span class="sourceLineNo">157</span> o = parseString(session, r).charAt(0);<a name="line.157"></a> +<span class="sourceLineNo">158</span> } else if (sType.isNumber()) {<a name="line.158"></a> +<span class="sourceLineNo">159</span> o = parseNumber(session, r, (Class<? extends Number>)sType.getInnerClass());<a name="line.159"></a> +<span class="sourceLineNo">160</span> } else if (sType.isMap()) {<a name="line.160"></a> +<span class="sourceLineNo">161</span> Map m = (sType.canCreateNewInstance(outer) ? (Map)sType.newInstance(outer) : new ObjectMap(bc));<a name="line.161"></a> +<span class="sourceLineNo">162</span> o = parseIntoMap2(session, r, m, sType.getKeyType(), sType.getValueType(), pMeta);<a name="line.162"></a> +<span class="sourceLineNo">163</span> } else if (sType.isCollection()) {<a name="line.163"></a> +<span class="sourceLineNo">164</span> if (c == '{') {<a name="line.164"></a> +<span class="sourceLineNo">165</span> ObjectMap m = new ObjectMap(bc);<a name="line.165"></a> +<span class="sourceLineNo">166</span> parseIntoMap2(session, r, m, string(), object(), pMeta);<a name="line.166"></a> +<span class="sourceLineNo">167</span> o = bd.cast(m);<a name="line.167"></a> +<span class="sourceLineNo">168</span> } else {<a name="line.168"></a> +<span class="sourceLineNo">169</span> Collection l = (sType.canCreateNewInstance(outer) ? (Collection)sType.newInstance() : new ObjectList(bc));<a name="line.169"></a> +<span class="sourceLineNo">170</span> o = parseIntoCollection2(session, r, l, sType.getElementType(), pMeta);<a name="line.170"></a> +<span class="sourceLineNo">171</span> }<a name="line.171"></a> +<span class="sourceLineNo">172</span> } else if (sType.canCreateNewInstanceFromObjectMap(outer)) {<a name="line.172"></a> +<span class="sourceLineNo">173</span> ObjectMap m = new ObjectMap(bc);<a name="line.173"></a> +<span class="sourceLineNo">174</span> parseIntoMap2(session, r, m, string(), object(), pMeta);<a name="line.174"></a> +<span class="sourceLineNo">175</span> o = sType.newInstanceFromObjectMap(outer, m);<a name="line.175"></a> +<span class="sourceLineNo">176</span> } else if (sType.canCreateNewBean(outer)) {<a name="line.176"></a> +<span class="sourceLineNo">177</span> BeanMap m = bc.newBeanMap(outer, sType.getInnerClass());<a name="line.177"></a> +<span class="sourceLineNo">178</span> o = parseIntoBeanMap2(session, r, m).getBean();<a name="line.178"></a> +<span class="sourceLineNo">179</span> } else if (sType.canCreateNewInstanceFromString(outer) && (c == '\'' || c == '"')) {<a name="line.179"></a> +<span class="sourceLineNo">180</span> o = sType.newInstanceFromString(outer, parseString(session, r));<a name="line.180"></a> +<span class="sourceLineNo">181</span> } else if (sType.canCreateNewInstanceFromNumber(outer) && StringUtils.isFirstNumberChar((char)c)) {<a name="line.181"></a> +<span class="sourceLineNo">182</span> o = sType.newInstanceFromNumber(outer, parseNumber(session, r, sType.getNewInstanceFromNumberClass()));<a name="line.182"></a> +<span class="sourceLineNo">183</span> } else if (sType.isArray()) {<a name="line.183"></a> +<span class="sourceLineNo">184</span> if (c == '{') {<a name="line.184"></a> +<span class="sourceLineNo">185</span> ObjectMap m = new ObjectMap(bc);<a name="line.185"></a> +<span class="sourceLineNo">186</span> parseIntoMap2(session, r, m, string(), object(), pMeta);<a name="line.186"></a> +<span class="sourceLineNo">187</span> o = bd.cast(m);<a name="line.187"></a> +<span class="sourceLineNo">188</span> } else {<a name="line.188"></a> +<span class="sourceLineNo">189</span> ArrayList l = (ArrayList)parseIntoCollection2(session, r, new ArrayList(), sType.getElementType(), pMeta);<a name="line.189"></a> +<span class="sourceLineNo">190</span> o = bc.toArray(sType, l);<a name="line.190"></a> +<span class="sourceLineNo">191</span> }<a name="line.191"></a> +<span class="sourceLineNo">192</span> } else if (c == '{') {<a name="line.192"></a> +<span class="sourceLineNo">193</span> Map m = new ObjectMap(bc);<a name="line.193"></a> +<span class="sourceLineNo">194</span> parseIntoMap2(session, r, m, sType.getKeyType(), sType.getValueType(), pMeta);<a name="line.194"></a> +<span class="sourceLineNo">195</span> if (m.containsKey(bc.getBeanTypePropertyName()))<a name="line.195"></a> +<span class="sourceLineNo">196</span> o = bd.cast((ObjectMap)m);<a name="line.196"></a> +<span class="sourceLineNo">197</span> else<a name="line.197"></a> +<span class="sourceLineNo">198</span> throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.198"></a> +<span class="sourceLineNo">199</span> } else if (sType.canCreateNewInstanceFromString(outer) && ! session.isStrict()) {<a name="line.199"></a> +<span class="sourceLineNo">200</span> o = sType.newInstanceFromString(outer, parseString(session, r));<a name="line.200"></a> +<span class="sourceLineNo">201</span> } else {<a name="line.201"></a> +<span class="sourceLineNo">202</span> throw new ParseException(session, "Unrecognized syntax for class type ''{0}'', starting character ''{1}''", sType, (char)c);<a name="line.202"></a> +<span class="sourceLineNo">203</span> }<a name="line.203"></a> <span class="sourceLineNo">204</span><a name="line.204"></a> -<span class="sourceLineNo">205</span> if (transform != null && o != null)<a name="line.205"></a> -<span class="sourceLineNo">206</span> o = transform.unswap(o, eType, bc);<a name="line.206"></a> +<span class="sourceLineNo">205</span> if (wrapperAttr != null)<a name="line.205"></a> +<span class="sourceLineNo">206</span> skipWrapperAttrEnd(session, r);<a name="line.206"></a> <span class="sourceLineNo">207</span><a name="line.207"></a> -<span class="sourceLineNo">208</span> if (outer != null)<a name="line.208"></a> -<span class="sourceLineNo">209</span> setParent(eType, o, outer);<a name="line.209"></a> +<span class="sourceLineNo">208</span> if (transform != null && o != null)<a name="line.208"></a> +<span class="sourceLineNo">209</span> o = transform.unswap(o, eType, bc);<a name="line.209"></a> <span class="sourceLineNo">210</span><a name="line.210"></a> -<span class="sourceLineNo">211</span> return (T)o;<a name="line.211"></a> -<span class="sourceLineNo">212</span> }<a name="line.212"></a> +<span class="sourceLineNo">211</span> if (outer != null)<a name="line.211"></a> +<span class="sourceLineNo">212</span> setParent(eType, o, outer);<a name="line.212"></a> <span class="sourceLineNo">213</span><a name="line.213"></a> -<span class="sourceLineNo">214</span> private Number parseNumber(JsonParserSession session, ParserReader r, Class<? extends Number> type) throws Exception {<a name="line.214"></a> -<span class="sourceLineNo">215</span> int c = r.peek();<a name="line.215"></a> -<span class="sourceLineNo">216</span> if (c == '\'' || c == '"')<a name="line.216"></a> -<span class="sourceLineNo">217</span> return parseNumber(session, parseString(session, r), type);<a name="line.217"></a> -<span class="sourceLineNo">218</span> return parseNumber(session, StringUtils.parseNumberString(r), type);<a name="line.218"></a> -<span class="sourceLineNo">219</span> }<a name="line.219"></a> -<span class="sourceLineNo">220</span><a name="line.220"></a> -<span class="sourceLineNo">221</span> private Number parseNumber(JsonParserSession session, String s, Class<? extends Number> type) throws Exception {<a name="line.221"></a> -<span class="sourceLineNo">222</span> if (session.isStrictMode()) {<a name="line.222"></a> -<span class="sourceLineNo">223</span> // Need to weed out octal and hexadecimal formats: 0123,-0123,0x123,-0x123.<a name="line.223"></a> -<span class="sourceLineNo">224</span> // Don't weed out 0 or -0.<a name="line.224"></a> -<span class="sourceLineNo">225</span> // All other number formats are supported in JSON.<a name="line.225"></a> -<span class="sourceLineNo">226</span> boolean isNegative = false;<a name="line.226"></a> -<span class="sourceLineNo">227</span> char c = (s.length() == 0 ? 'x' : s.charAt(0));<a name="line.227"></a> -<span class="sourceLineNo">228</span> if (c == '-') {<a name="line.228"></a> -<span class="sourceLineNo">229</span> isNegative = true;<a name="line.229"></a> -<span class="sourceLineNo">230</span> c = (s.length() == 1 ? 'x' : s.charAt(1));<a name="line.230"></a> -<span class="sourceLineNo">231</span> }<a name="line.231"></a> -<span class="sourceLineNo">232</span> if (c == 'x' || (c == '0' && s.length() > (isNegative ? 2 : 1)))<a name="line.232"></a> -<span class="sourceLineNo">233</span> throw new NumberFormatException("Invalid JSON number '"+s+"'");<a name="line.233"></a> -<span class="sourceLineNo">234</span> }<a name="line.234"></a> -<span class="sourceLineNo">235</span> return StringUtils.parseNumber(s, type);<a name="line.235"></a> -<span class="sourceLineNo">236</span> }<a name="line.236"></a> -<span class="sourceLineNo">237</span><a name="line.237"></a> -<span class="sourceLineNo">238</span> private Boolean parseBoolean(JsonParserSession session, ParserReader r) throws Exception {<a name="line.238"></a> -<span class="sourceLineNo">239</span> int c = r.peek();<a name="line.239"></a> -<span class="sourceLineNo">240</span> if (c == '\'' || c == '"')<a name="line.240"></a> -<span class="sourceLineNo">241</span> return Boolean.valueOf(parseString(session, r));<a name="line.241"></a> -<span class="sourceLineNo">242</span> if (c == 't') {<a name="line.242"></a> -<span class="sourceLineNo">243</span> parseKeyword(session, "true", r);<a name="line.243"></a> -<span class="sourceLineNo">244</span> return Boolean.TRUE;<a name="line.244"></a> -<span class="sourceLineNo">245</span> }<a name="line.245"></a> -<span class="sourceLineNo">246</span> parseKeyword(session, "false", r);<a name="line.246"></a> -<span class="sourceLineNo">247</span> return Boolean.FALSE;<a name="line.247"></a> -<span class="sourceLineNo">248</span> }<a name="line.248"></a> -<span class="sourceLineNo">249</span><a name="line.249"></a> -<span class="sourceLineNo">250</span><a name="line.250"></a> -<span class="sourceLineNo">251</span> private <K,V> Map<K,V> parseIntoMap2(JsonParserSession session, ParserReader r, Map<K,V> m, ClassMeta<K> keyType, ClassMeta<V> valueType, BeanPropertyMeta pMeta) throws Exception {<a name="line.251"></a> -<span class="sourceLineNo">252</span><a name="line.252"></a> -<span class="sourceLineNo">253</span> if (keyType == null)<a name="line.253"></a> -<span class="sourceLineNo">254</span> keyType = (ClassMeta<K>)string();<a name="line.254"></a> -<span class="sourceLineNo">255</span><a name="line.255"></a> -<span class="sourceLineNo">256</span> int S0=0; // Looking for outer {<a name="line.256"></a> -<span class="sourceLineNo">257</span> int S1=1; // Looking for attrName start.<a name="line.257"></a> -<span class="sourceLineNo">258</span> int S3=3; // Found attrName end, looking for :.<a name="line.258"></a> -<span class="sourceLineNo">259</span> int S4=4; // Found :, looking for valStart: { [ " ' LITERAL.<a name="line.259"></a> -<span class="sourceLineNo">260</span> int S5=5; // Looking for , or }<a name="line.260"></a> -<span class="sourceLineNo">261</span><a name="line.261"></a> -<span class="sourceLineNo">262</span> int state = S0;<a name="line.262"></a> -<span class="sourceLineNo">263</span> String currAttr = null;<a name="line.263"></a> -<span class="sourceLineNo">264</span> int c = 0;<a name="line.264"></a> -<span class="sourceLineNo">265</span> while (c != -1) {<a name="line.265"></a> -<span class="sourceLineNo">266</span> c = r.read();<a name="line.266"></a> -<span class="sourceLineNo">267</span> if (state == S0) {<a name="line.267"></a> -<span class="sourceLineNo">268</span> if (c == '{')<a name="line.268"></a> -<span class="sourceLineNo">269</span> state = S1;<a name="line.269"></a> -<span class="sourceLineNo">270</span> } else if (state == S1) {<a name="line.270"></a> -<span class="sourceLineNo">271</span> if (c == '}') {<a name="line.271"></a> -<span class="sourceLineNo">272</span> return m;<a name="line.272"></a> -<span class="sourceLineNo">273</span> } else if (c == '/') {<a name="line.273"></a> -<span class="sourceLineNo">274</span> skipCommentsAndSpace(session, r.unread());<a name="line.274"></a> -<span class="sourceLineNo">275</span> } else if (! Character.isWhitespace(c)) {<a name="line.275"></a> -<span class="sourceLineNo">276</span> currAttr = parseFieldName(session, r.unread());<a name="line.276"></a> -<span class="sourceLineNo">277</span> state = S3;<a name="line.277"></a> -<span class="sourceLineNo">278</span> }<a name="line.278"></a> -<span class="sourceLineNo">279</span> } else if (state == S3) {<a name="line.279"></a> -<span class="sourceLineNo">280</span> if (c == ':')<a name="line.280"></a> -<span class="sourceLineNo">281</span> state = S4;<a name="line.281"></a> -<span class="sourceLineNo">282</span> } else if (state == S4) {<a name="line.282"></a> -<span class="sourceLineNo">283</span> if (c == '/') {<a name="line.283"></a> -<span class="sourceLineNo">284</span> skipCommentsAndSpace(session, r.unread());<a name="line.284"></a> -<span class="sourceLineNo">285</span> } else if (! Character.isWhitespace(c)) {<a name="line.285"></a> -<span class="sourceLineNo">286</span> K key = convertAttrToType(session, m, currAttr, keyType);<a name="line.286"></a> -<span class="sourceLineNo">287</span> V value = parseAnything(session, valueType, r.unread(), m, pMeta);<a name="line.287"></a> -<span class="sourceLineNo">288</span> setName(valueType, value, key);<a name="line.288"></a> -<span class="sourceLineNo">289</span> m.put(key, value);<a name="line.289"></a> -<span class="sourceLineNo">290</span> state = S5;<a name="line.290"></a> -<span class="sourceLineNo">291</span> }<a name="line.291"></a> -<span class="sourceLineNo">292</span> } else if (state == S5) {<a name="line.292"></a> -<span class="sourceLineNo">293</span> if (c == ',')<a name="line.293"></a> -<span class="sourceLineNo">294</span> state = S1;<a name="line.294"></a> -<span class="sourceLineNo">295</span> else if (c == '/')<a name="line.295"></a> -<span class="sourceLineNo">296</span> skipCommentsAndSpace(session, r.unread());<a name="line.296"></a> -<span class="sourceLineNo">297</span> else if (c == '}') {<a name="line.297"></a> -<span class="sourceLineNo">298</span> return m;<a name="line.298"></a> -<span class="sourceLineNo">299</span> }<a name="line.299"></a> -<span class="sourceLineNo">300</span> }<a name="line.300"></a> -<span class="sourceLineNo">301</span> }<a name="line.301"></a> -<span class="sourceLineNo">302</span> if (state == S0)<a name="line.302"></a> -<span class="sourceLineNo">303</span> throw new ParseException(session, "Expected '{' at beginning of JSON object.");<a name="line.303"></a> -<span class="sourceLineNo">304</span> if (state == S1)<a name="line.304"></a> -<span class="sourceLineNo">305</span> throw new ParseException(session, "Could not find attribute name on JSON object.");<a name="line.305"></a> -<span class="sourceLineNo">306</span> if (state == S3)<a name="line.306"></a> -<span class="sourceLineNo">307</span> throw new ParseException(session, "Could not find ':' following attribute name on JSON object.");<a name="line.307"></a> -<span class="sourceLineNo">308</span> if (state == S4)<a name="line.308"></a> -<span class="sourceLineNo">309</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.309"></a> -<span class="sourceLineNo">310</span> if (state == S5)<a name="line.310"></a> -<span class="sourceLineNo">311</span> throw new ParseException(session, "Could not find '}' marking end of JSON object.");<a name="line.311"></a> -<span class="sourceLineNo">312</span><a name="line.312"></a> -<span class="sourceLineNo">313</span> return null; // Unreachable.<a name="line.313"></a> -<span class="sourceLineNo">314</span> }<a name="line.314"></a> -<span class="sourceLineNo">315</span><a name="line.315"></a> -<span class="sourceLineNo">316</span> /*<a name="line.316"></a> -<span class="sourceLineNo">317</span> * Parse a JSON attribute from the character array at the specified position, then<a name="line.317"></a> -<span class="sourceLineNo">318</span> * set the position marker to the last character in the field name.<a name="line.318"></a> -<span class="sourceLineNo">319</span> */<a name="line.319"></a> -<span class="sourceLineNo">320</span> private String parseFieldName(JsonParserSession session, ParserReader r) throws Exception {<a name="line.320"></a> -<span class="sourceLineNo">321</span> int c = r.peek();<a name="line.321"></a> -<span class="sourceLineNo">322</span> if (c == '\'' || c == '"')<a name="line.322"></a> -<span class="sourceLineNo">323</span> return parseString(session, r);<a name="line.323"></a> -<span class="sourceLineNo">324</span> if (session.isStrictMode())<a name="line.324"></a> -<span class="sourceLineNo">325</span> throw new ParseException(session, "Unquoted attribute detected.");<a name="line.325"></a> -<span class="sourceLineNo">326</span> r.mark();<a name="line.326"></a> -<span class="sourceLineNo">327</span> // Look for whitespace.<a name="line.327"></a> -<span class="sourceLineNo">328</span> while (c != -1) {<a name="line.328"></a> -<span class="sourceLineNo">329</span> c = r.read();<a name="line.329"></a> -<span class="sourceLineNo">330</span> if (c == ':' || Character.isWhitespace(c) || c == '/') {<a name="line.330"></a> -<span class="sourceLineNo">331</span> r.unread();<a name="line.331"></a> -<span class="sourceLineNo">332</span> String s = r.getMarked().intern();<a name="line.332"></a> -<span class="sourceLineNo">333</span> return s.equals("null") ? null : s;<a name="line.333"></a> -<span class="sourceLineNo">334</span> }<a name="line.334"></a> -<span class="sourceLineNo">335</span> }<a name="line.335"></a> -<span class="sourceLineNo">336</span> throw new ParseException(session, "Could not find the end of the field name.");<a name="line.336"></a> -<span class="sourceLineNo">337</span> }<a name="line.337"></a> -<span class="sourceLineNo">338</span><a name="line.338"></a> -<span class="sourceLineNo">339</span> private <E> Collection<E> parseIntoCollection2(JsonParserSession session, ParserReader r, Collection<E> l, ClassMeta<E> elementType, BeanPropertyMeta pMeta) throws Exception {<a name="line.339"></a> -<span class="sourceLineNo">340</span><a name="line.340"></a> -<span class="sourceLineNo">341</span> int S0=0; // Looking for outermost [<a name="line.341"></a> -<span class="sourceLineNo">342</span> int S1=1; // Looking for starting [ or { or " or ' or LITERAL<a name="line.342"></a> -<span class="sourceLineNo">343</span> int S2=2; // Looking for , or ]<a name="line.343"></a> -<span class="sourceLineNo">344</span><a name="line.344"></a> -<span class="sourceLineNo">345</span> int state = S0;<a name="line.345"></a> -<span class="sourceLineNo">346</span> int c = 0;<a name="line.346"></a> -<span class="sourceLineNo">347</span> while (c != -1) {<a name="line.347"></a> -<span class="sourceLineNo">348</span> c = r.read();<a name="line.348"></a> -<span class="sourceLineNo">349</span> if (state == S0) {<a name="line.349"></a> -<span class="sourceLineNo">350</span> if (c == '[')<a name="line.350"></a> -<span class="sourceLineNo">351</span> state = S1;<a name="line.351"></a> -<span class="sourceLineNo">352</span> } else if (state == S1) {<a name="line.352"></a> -<span class="sourceLineNo">353</span> if (c == ']') {<a name="line.353"></a> -<span class="sourceLineNo">354</span> return l;<a name="line.354"></a> -<span class="sourceLineNo">355</span> } else if (c == '/') {<a name="line.355"></a> -<span class="sourceLineNo">356</span> skipCommentsAndSpace(session, r.unread());<a name="line.356"></a> -<span class="sourceLineNo">357</span> } else if (! Character.isWhitespace(c)) {<a name="line.357"></a> -<span class="sourceLineNo">358</span> l.add(parseAnything(session, elementType, r.unread(), l, pMeta));<a name="line.358"></a> -<span class="sourceLineNo">359</span> state = S2;<a name="line.359"></a> -<span class="sourceLineNo">360</span> }<a name="line.360"></a> -<span class="sourceLineNo">361</span> } else if (state == S2) {<a name="line.361"></a> -<span class="sourceLineNo">362</span> if (c == ',') {<a name="line.362"></a> -<span class="sourceLineNo">363</span> state = S1;<a name="line.363"></a> -<span class="sourceLineNo">364</span> } else if (c == '/') {<a name="line.364"></a> -<span class="sourceLineNo">365</span> skipCommentsAndSpace(session, r.unread());<a name="line.365"></a> -<span class="sourceLineNo">366</span> } else if (c == ']') {<a name="line.366"></a> -<span class="sourceLineNo">367</span> return l;<a name="line.367"></a> -<span class="sourceLineNo">368</span> }<a name="line.368"></a> -<span class="sourceLineNo">369</span> }<a name="line.369"></a> -<span class="sourceLineNo">370</span> }<a name="line.370"></a> -<span class="sourceLineNo">371</span> if (state == S0)<a name="line.371"></a> -<span class="sourceLineNo">372</span> throw new ParseException(session, "Expected '[' at beginning of JSON array.");<a name="line.372"></a> -<span class="sourceLineNo">373</span> if (state == S1)<a name="line.373"></a> -<span class="sourceLineNo">374</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.374"></a> -<span class="sourceLineNo">375</span> if (state == S2)<a name="line.375"></a> -<span class="sourceLineNo">376</span> throw new ParseException(session, "Expected ',' or ']'.");<a name="line.376"></a> -<span class="sourceLineNo">377</span><a name="line.377"></a> -<span class="sourceLineNo">378</span> return null; // Unreachable.<a name="line.378"></a> -<span class="sourceLineNo">379</span> }<a name="line.379"></a> +<span class="sourceLineNo">214</span> return (T)o;<a name="line.214"></a> +<span class="sourceLineNo">215</span> }<a name="line.215"></a> +<span class="sourceLineNo">216</span><a name="line.216"></a> +<span class="sourceLineNo">217</span> private Number parseNumber(JsonParserSession session, ParserReader r, Class<? extends Number> type) throws Exception {<a name="line.217"></a> +<span class="sourceLineNo">218</span> int c = r.peek();<a name="line.218"></a> +<span class="sourceLineNo">219</span> if (c == '\'' || c == '"')<a name="line.219"></a> +<span class="sourceLineNo">220</span> return parseNumber(session, parseString(session, r), type);<a name="line.220"></a> +<span class="sourceLineNo">221</span> return parseNumber(session, StringUtils.parseNumberString(r), type);<a name="line.221"></a> +<span class="sourceLineNo">222</span> }<a name="line.222"></a> +<span class="sourceLineNo">223</span><a name="line.223"></a> +<span class="sourceLineNo">224</span> private Number parseNumber(JsonParserSession session, String s, Class<? extends Number> type) throws Exception {<a name="line.224"></a> +<span class="sourceLineNo">225</span><a name="line.225"></a> +<span class="sourceLineNo">226</span> // JSON has slightly different number rules from Java.<a name="line.226"></a> +<span class="sourceLineNo">227</span> // Strict mode enforces these different rules, lax does not.<a name="line.227"></a> +<span class="sourceLineNo">228</span> if (session.isStrict()) {<a name="line.228"></a> +<span class="sourceLineNo">229</span><a name="line.229"></a> +<span class="sourceLineNo">230</span> // Lax allows blank strings to represent 0.<a name="line.230"></a> +<span class="sourceLineNo">231</span> // Strict does not allow blank strings.<a name="line.231"></a> +<span class="sourceLineNo">232</span> if (s.length() == 0)<a name="line.232"></a> +<span class="sourceLineNo">233</span> throw new ParseException(session, "Invalid JSON number: '"+s+"'");<a name="line.233"></a> +<span class="sourceLineNo">234</span><a name="line.234"></a> +<span class="sourceLineNo">235</span> // Need to weed out octal and hexadecimal formats: 0123,-0123,0x123,-0x123.<a name="line.235"></a> +<span class="sourceLineNo">236</span> // Don't weed out 0 or -0.<a name="line.236"></a> +<span class="sourceLineNo">237</span> boolean isNegative = false;<a name="line.237"></a> +<span class="sourceLineNo">238</span> char c = (s.length() == 0 ? 'x' : s.charAt(0));<a name="line.238"></a> +<span class="sourceLineNo">239</span> if (c == '-') {<a name="line.239"></a> +<span class="sourceLineNo">240</span> isNegative = true;<a name="line.240"></a> +<span class="sourceLineNo">241</span> c = (s.length() == 1 ? 'x' : s.charAt(1));<a name="line.241"></a> +<span class="sourceLineNo">242</span> }<a name="line.242"></a> +<span class="sourceLineNo">243</span><a name="line.243"></a> +<span class="sourceLineNo">244</span> // JSON doesn't allow '.123' and '-.123'.<a name="line.244"></a> +<span class="sourceLineNo">245</span> if (c == '.')<a name="line.245"></a> +<span class="sourceLineNo">246</span> throw new ParseException(session, "Invalid JSON number: '"+s+"'");<a name="line.246"></a> +<span class="sourceLineNo">247</span><a name="line.247"></a> +<span class="sourceLineNo">248</span> // '01' is not a valid number, but '0.1', '0e1', '0e+1' are valid.<a name="line.248"></a> +<span class="sourceLineNo">249</span> if (c == '0' && s.length() > (isNegative ? 2 : 1)) {<a name="line.249"></a> +<span class="sourceLineNo">250</span> char c2 = s.charAt((isNegative ? 2 : 1));<a name="line.250"></a> +<span class="sourceLineNo">251</span> if (c2 != '.' && c2 != 'e' && c2 != 'E')<a name="line.251"></a> +<span class="sourceLineNo">252</span> throw new ParseException(session, "Invalid JSON number: '"+s+"'");<a name="line.252"></a> +<span class="sourceLineNo">253</span> }<a name="line.253"></a> +<span class="sourceLineNo">254</span><a name="line.254"></a> +<span class="sourceLineNo">255</span> // JSON doesn't allow '1.' or '0.e1'.<a name="line.255"></a> +<span class="sourceLineNo">256</span> int i = s.indexOf('.');<a name="line.256"></a> +<span class="sourceLineNo">257</span> if (i != -1 && (s.length() == (i+1) || ! decChars.contains(s.charAt(i+1))))<a name="line.257"></a> +<span class="sourceLineNo">258</span> throw new ParseException(session, "Invalid JSON number: '"+s+"'");<a name="line.258"></a> +<span class="sourceLineNo">259</span><a name="line.259"></a> +<span class="sourceLineNo">260</span> }<a name="line.260"></a> +<span class="sourceLineNo">261</span> return StringUtils.parseNumber(s, type);<a name="line.261"></a> +<span class="sourceLineNo">262</span> }<a name="line.262"></a> +<span class="sourceLineNo">263</span><a name="line.263"></a> +<span class="sourceLineNo">264</span> private Boolean parseBoolean(JsonParserSession session, ParserReader r) throws Exception {<a name="line.264"></a> +<span class="sourceLineNo">265</span> int c = r.peek();<a name="line.265"></a> +<span class="sourceLineNo">266</span> if (c == '\'' || c == '"')<a name="line.266"></a> +<span class="sourceLineNo">267</span> return Boolean.valueOf(parseString(session, r));<a name="line.267"></a> +<span class="sourceLineNo">268</span> if (c == 't') {<a name="line.268"></a> +<span class="sourceLineNo">269</span> parseKeyword(session, "true", r);<a name="line.269"></a> +<span class="sourceLineNo">270</span> return Boolean.TRUE;<a name="line.270"></a> +<span class="sourceLineNo">271</span> }<a name="line.271"></a> +<span class="sourceLineNo">272</span> parseKeyword(session, "false", r);<a name="line.272"></a> +<span class="sourceLineNo">273</span> return Boolean.FALSE;<a name="line.273"></a> +<span class="sourceLineNo">274</span> }<a name="line.274"></a> +<span class="sourceLineNo">275</span><a name="line.275"></a> +<span class="sourceLineNo">276</span><a name="line.276"></a> +<span class="sourceLineNo">277</span> private <K,V> Map<K,V> parseIntoMap2(JsonParserSession session, ParserReader r, Map<K,V> m, ClassMeta<K> keyType, ClassMeta<V> valueType, BeanPropertyMeta pMeta) throws Exception {<a name="line.277"></a> +<span class="sourceLineNo">278</span><a name="line.278"></a> +<span class="sourceLineNo">279</span> if (keyType == null)<a name="line.279"></a> +<span class="sourceLineNo">280</span> keyType = (ClassMeta<K>)string();<a name="line.280"></a> +<span class="sourceLineNo">281</span><a name="line.281"></a> +<span class="sourceLineNo">282</span> int S0=0; // Looking for outer {<a name="line.282"></a> +<span class="sourceLineNo">283</span> int S1=1; // Looking for attrName start.<a name="line.283"></a> +<span class="sourceLineNo">284</span> int S3=3; // Found attrName end, looking for :.<a name="line.284"></a> +<span class="sourceLineNo">285</span> int S4=4; // Found :, looking for valStart: { [ " ' LITERAL.<a name="line.285"></a> +<span class="sourceLineNo">286</span> int S5=5; // Looking for , or }<a name="line.286"></a> +<span class="sourceLineNo">287</span> int S6=6; // Found , looking for attr start.<a name="line.287"></a> +<span class="sourceLineNo">288</span><a name="line.288"></a> +<span class="sourceLineNo">289</span> int state = S0;<a name="line.289"></a> +<span class="sourceLineNo">290</span> String currAttr = null;<a name="line.290"></a> +<span class="sourceLineNo">291</span> int c = 0;<a name="line.291"></a> +<span class="sourceLineNo">292</span> while (c != -1) {<a name="line.292"></a> +<span class="sourceLineNo">293</span> c = r.read();<a name="line.293"></a> +<span class="sourceLineNo">294</span> if (state == S0) {<a name="line.294"></a> +<span class="sourceLineNo">295</span> if (c == '{')<a name="line.295"></a> +<span class="sourceLineNo">296</span> state = S1;<a name="line.296"></a> +<span class="sourceLineNo">297</span> } else if (state == S1) {<a name="line.297"></a> +<span class="sourceLineNo">298</span> if (c == '}') {<a name="line.298"></a> +<span class="sourceLineNo">299</span> return m;<a name="line.299"></a> +<span class="sourceLineNo">300</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.300"></a> +<span class="sourceLineNo">301</span> skipCommentsAndSpace(session, r.unread());<a name="line.301"></a> +<span class="sourceLineNo">302</span> } else {<a name="line.302"></a> +<span class="sourceLineNo">303</span> currAttr = parseFieldName(session, r.unread());<a name="line.303"></a> +<span class="sourceLineNo">304</span> state = S3;<a name="line.304"></a> +<span class="sourceLineNo">305</span> }<a name="line.305"></a> +<span class="sourceLineNo">306</span> } else if (state == S3) {<a name="line.306"></a> +<span class="sourceLineNo">307</span> if (c == ':')<a name="line.307"></a> +<span class="sourceLineNo">308</span> state = S4;<a name="line.308"></a> +<span class="sourceLineNo">309</span> } else if (state == S4) {<a name="line.309"></a> +<span class="sourceLineNo">310</span> if (session.isCommentOrWhitespace(c)) {<a name="line.310"></a> +<span class="sourceLineNo">311</span> skipCommentsAndSpace(session, r.unread());<a name="line.311"></a> +<span class="sourceLineNo">312</span> } else {<a name="line.312"></a> +<span class="sourceLineNo">313</span> K key = convertAttrToType(session, m, currAttr, keyType);<a name="line.313"></a> +<span class="sourceLineNo">314</span> V value = parseAnything(session, valueType, r.unread(), m, pMeta);<a name="line.314"></a> +<span class="sourceLineNo">315</span> setName(valueType, value, key);<a name="line.315"></a> +<span class="sourceLineNo">316</span> m.put(key, value);<a name="line.316"></a> +<span class="sourceLineNo">317</span> state = S5;<a name="line.317"></a> +<span class="sourceLineNo">318</span> }<a name="line.318"></a> +<span class="sourceLineNo">319</span> } else if (state == S5) {<a name="line.319"></a> +<span class="sourceLineNo">320</span> if (c == ',')<a name="line.320"></a> +<span class="sourceLineNo">321</span> state = S6;<a name="line.321"></a> +<span class="sourceLineNo">322</span> else if (session.isCommentOrWhitespace(c))<a name="line.322"></a> +<span class="sourceLineNo">323</span> skipCommentsAndSpace(session, r.unread());<a name="line.323"></a> +<span class="sourceLineNo">324</span> else if (c == '}') {<a name="line.324"></a> +<span class="sourceLineNo">325</span> return m;<a name="line.325"></a> +<span class="sourceLineNo">326</span> } else {<a name="line.326"></a> +<span class="sourceLineNo">327</span> break;<a name="line.327"></a> +<span class="sourceLineNo">328</span> }<a name="line.328"></a> +<span class="sourceLineNo">329</span> } else if (state == S6) {<a name="line.329"></a> +<span class="sourceLineNo">330</span> if (c == '}') {<a name="line.330"></a> +<span class="sourceLineNo">331</span> break;<a name="line.331"></a> +<span class="sourceLineNo">332</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.332"></a> +<span class="sourceLineNo">333</span> skipCommentsAndSpace(session, r.unread());<a name="line.333"></a> +<span class="sourceLineNo">334</span> } else {<a name="line.334"></a> +<span class="sourceLineNo">335</span> currAttr = parseFieldName(session, r.unread());<a name="line.335"></a> +<span class="sourceLineNo">336</span> state = S3;<a name="line.336"></a> +<span class="sourceLineNo">337</span> }<a name="line.337"></a> +<span class="sourceLineNo">338</span> }<a name="line.338"></a> +<span class="sourceLineNo">339</span> }<a name="line.339"></a> +<span class="sourceLineNo">340</span> if (state == S0)<a name="line.340"></a> +<span class="sourceLineNo">341</span> throw new ParseException(session, "Expected '{' at beginning of JSON object.");<a name="line.341"></a> +<span class="sourceLineNo">342</span> if (state == S1)<a name="line.342"></a> +<span class="sourceLineNo">343</span> throw new ParseException(session, "Could not find attribute name on JSON object.");<a name="line.343"></a> +<span class="sourceLineNo">344</span> if (state == S3)<a name="line.344"></a> +<span class="sourceLineNo">345</span> throw new ParseException(session, "Could not find ':' following attribute name on JSON object.");<a name="line.345"></a> +<span class="sourceLineNo">346</span> if (state == S4)<a name="line.346"></a> +<span class="sourceLineNo">347</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.347"></a> +<span class="sourceLineNo">348</span> if (state == S5)<a name="line.348"></a> +<span class="sourceLineNo">349</span> throw new ParseException(session, "Could not find '}' marking end of JSON object.");<a name="line.349"></a> +<span class="sourceLineNo">350</span> if (state == S6)<a name="line.350"></a> +<span class="sourceLineNo">351</span> throw new ParseException(session, "Unexpected '}' found in JSON object.");<a name="line.351"></a> +<span class="sourceLineNo">352</span><a name="line.352"></a> +<span class="sourceLineNo">353</span> return null; // Unreachable.<a name="line.353"></a> +<span class="sourceLineNo">354</span> }<a name="line.354"></a> +<span class="sourceLineNo">355</span><a name="line.355"></a> +<span class="sourceLineNo">356</span> /*<a name="line.356"></a> +<span class="sourceLineNo">357</span> * Parse a JSON attribute from the character array at the specified position, then<a name="line.357"></a> +<span class="sourceLineNo">358</span> * set the position marker to the last character in the field name.<a name="line.358"></a> +<span class="sourceLineNo">359</span> */<a name="line.359"></a> +<span class="sourceLineNo">360</span> private String parseFieldName(JsonParserSession session, ParserReader r) throws Exception {<a name="line.360"></a> +<span class="sourceLineNo">361</span> int c = r.peek();<a name="line.361"></a> +<span class="sourceLineNo">362</span> if (c == '\'' || c == '"')<a name="line.362"></a> +<span class="sourceLineNo">363</span> return parseString(session, r);<a name="line.363"></a> +<span class="sourceLineNo">364</span> if (session.isStrict())<a name="line.364"></a> +<span class="sourceLineNo">365</span> throw new ParseException(session, "Unquoted attribute detected.");<a name="line.365"></a> +<span class="sourceLineNo">366</span> r.mark();<a name="line.366"></a> +<span class="sourceLineNo">367</span> // Look for whitespace.<a name="line.367"></a> +<span class="sourceLineNo">368</span> while (c != -1) {<a name="line.368"></a> +<span class="sourceLineNo">369</span> c = r.read();<a name="line.369"></a> +<span class="sourceLineNo">370</span> if (c == ':' || session.isWhitespace(c) || c == '/') {<a name="line.370"></a> +<span class="sourceLineNo">371</span> r.unread();<a name="line.371"></a> +<span class="sourceLineNo">372</span> String s = r.getMarked().intern();<a name="line.372"></a> +<span class="sourceLineNo">373</span> return s.equals("null") ? null : s;<a name="line.373"></a> +<span class="sourceLineNo">374</span> }<a name="line.374"></a> +<span class="sourceLineNo">375</span> }<a name="line.375"></a> +<span class="sourceLineNo">376</span> throw new ParseException(session, "Could not find the end of the field name.");<a name="line.376"></a> +<span class="sourceLineNo">377</span> }<a name="line.377"></a> +<span class="sourceLineNo">378</span><a name="line.378"></a> +<span class="sourceLineNo">379</span> private <E> Collection<E> parseIntoCollection2(JsonParserSession session, ParserReader r, Collection<E> l, ClassMeta<E> elementType, BeanPropertyMeta pMeta) throws Exception {<a name="line.379"></a> <span class="sourceLineNo">380</span><a name="line.380"></a> -<span class="sourceLineNo">381</span> private Object[] parseArgs(JsonParserSession session, ParserReader r, ClassMeta<?>[] argTypes) throws Exception {<a name="line.381"></a> -<span class="sourceLineNo">382</span><a name="line.382"></a> -<span class="sourceLineNo">383</span> int S0=0; // Looking for outermost [<a name="line.383"></a> -<span class="sourceLineNo">384</span> int S1=1; // Looking for starting [ or { or " or ' or LITERAL<a name="line.384"></a> -<span class="sourceLineNo">385</span> int S2=2; // Looking for , or ]<a name="line.385"></a> -<span class="sourceLineNo">386</span><a name="line.386"></a> -<span class="sourceLineNo">387</span> Object[] o = new Object[argTypes.length];<a name="line.387"></a> -<span class="sourceLineNo">388</span> int i = 0;<a name="line.388"></a> -<span class="sourceLineNo">389</span><a name="line.389"></a> -<span class="sourceLineNo">390</span> int state = S0;<a name="line.390"></a> -<span class="sourceLineNo">391</span> int c = 0;<a name="line.391"></a> -<span class="sourceLineNo">392</span> while (c != -1) {<a name="line.392"></a> -<span class="sourceLineNo">393</span> c = r.read();<a name="line.393"></a> -<span class="sourceLineNo">394</span> if (state == S0) {<a name="line.394"></a> -<span class="sourceLineNo">395</span> if (c == '[')<a name="line.395"></a> -<span class="sourceLineNo">396</span> state = S1;<a name="line.396"></a> -<span class="sourceLineNo">397</span> } else if (state == S1) {<a name="line.397"></a> -<span class="sourceLineNo">398</span> if (c == ']') {<a name="line.398"></a> -<span class="sourceLineNo">399</span> return o;<a name="line.399"></a> -<span class="sourceLineNo">400</span> } else if (c == '/') {<a name="line.400"></a> -<span class="sourceLineNo">401</span> skipCommentsAndSpace(session, r.unread());<a name="line.401"></a> -<span class="sourceLineNo">402</span> } else if (! Character.isWhitespace(c)) {<a name="line.402"></a> -<span class="sourceLineNo">403</span> o[i] = parseAnything(session, argTypes[i], r.unread(), session.getOuter(), null);<a name="line.403"></a> -<span class="sourceLineNo">404</span> i++;<a name="line.404"></a> -<span class="sourceLineNo">405</span> state = S2;<a name="line.405"></a> -<span class="sourceLineNo">406</span> }<a name="line.406"></a> -<span class="sourceLineNo">407</span> } else if (state == S2) {<a name="line.407"></a> -<span class="sourceLineNo">408</span> if (c == ',') {<a name="line.408"></a> -<span class="sourceLineNo">409</span> state = S1;<a name="line.409"></a> -<span class="sourceLineNo">410</span> } else if (c == '/') {<a name="line.410"></a> -<span class="sourceLineNo">411</span> skipCommentsAndSpace(session, r.unread());<a name="line.411"></a> -<span class="sourceLineNo">412</span> } else if (c == ']') {<a name="line.412"></a> -<span class="sourceLineNo">413</span> return o;<a name="line.413"></a> -<span class="sourceLineNo">414</span> }<a name="line.414"></a> -<span class="sourceLineNo">415</span> }<a name="line.415"></a> -<span class="sourceLineNo">416</span> }<a name="line.416"></a> -<span class="sourceLineNo">417</span> if (state == S0)<a name="line.417"></a> -<span class="sourceLineNo">418</span> throw new ParseException(session, "Expected '[' at beginning of JSON array.");<a name="line.418"></a> -<span class="sourceLineNo">419</span> if (state == S1)<a name="line.419"></a> -<span class="sourceLineNo">420</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.420"></a> -<span class="sourceLineNo">421</span> if (state == S2)<a name="line.421"></a> -<span class="sourceLineNo">422</span> throw new ParseException(session, "Expected ',' or ']'.");<a name="line.422"></a> -<span class="sourceLineNo">423</span><a name="line.423"></a> -<span class="sourceLineNo">424</span> return null; // Unreachable.<a name="line.424"></a> -<span class="sourceLineNo">425</span> }<a name="line.425"></a> -<span class="sourceLineNo">426</span><a name="line.426"></a> -<span class="sourceLineNo">427</span> private <T> BeanMap<T> parseIntoBeanMap2(JsonParserSession session, ParserReader r, BeanMap<T> m) throws Exception {<a name="line.427"></a> -<span class="sourceLineNo">428</span><a name="line.428"></a> -<span class="sourceLineNo">429</span> BeanContext bc = session.getBeanContext();<a name="line.429"></a> -<span class="sourceLineNo">430</span><a name="line.430"></a> -<span class="sourceLineNo">431</span> int S0=0; // Looking for outer {<a name="line.431"></a> -<span class="sourceLineNo">432</span> int S1=1; // Looking for attrName start.<a name="line.432"></a> -<span class="sourceLineNo">433</span> int S3=3; // Found attrName end, looking for :.<a name="line.433"></a> -<span class="sourceLineNo">434</span> int S4=4; // Found :, looking for valStart: { [ " ' LITERAL.<a name="line.434"></a> -<span class="sourceLineNo">435</span> int S5=5; // Looking for , or }<a name="line.435"></a> +<span class="sourceLineNo">381</span> int S0=0; // Looking for outermost [<a name="line.381"></a> +<span class="sourceLineNo">382</span> int S1=1; // Looking for starting [ or { or " or ' or LITERAL or ]<a name="line.382"></a> +<span class="sourceLineNo">383</span> int S2=2; // Looking for , or ]<a name="line.383"></a> +<span class="sourceLineNo">384</span> int S3=3; // Looking for starting [ or { or " or ' or LITERAL<a name="line.384"></a> +<span class="sourceLineNo">385</span><a name="line.385"></a> +<span class="sourceLineNo">386</span> int state = S0;<a name="line.386"></a> +<span class="sourceLineNo">387</span> int c = 0;<a name="line.387"></a> +<span class="sourceLineNo">388</span> while (c != -1) {<a name="line.388"></a> +<span class="sourceLineNo">389</span> c = r.read();<a name="line.389"></a> +<span class="sourceLineNo">390</span> if (state == S0) {<a name="line.390"></a> +<span class="sourceLineNo">391</span> if (c == '[')<a name="line.391"></a> +<span class="sourceLineNo">392</span> state = S1;<a name="line.392"></a> +<span class="sourceLineNo">393</span> } else if (state == S1) {<a name="line.393"></a> +<span class="sourceLineNo">394</span> if (c == ']') {<a name="line.394"></a> +<span class="sourceLineNo">395</span> return l;<a name="line.395"></a> +<span class="sourceLineNo">396</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.396"></a> +<span class="sourceLineNo">397</span> skipCommentsAndSpace(session, r.unread());<a name="line.397"></a> +<span class="sourceLineNo">398</span> } else if (c != -1) {<a name="line.398"></a> +<span class="sourceLineNo">399</span> l.add(parseAnything(session, elementType, r.unread(), l, pMeta));<a name="line.399"></a> +<span class="sourceLineNo">400</span> state = S2;<a name="line.400"></a> +<span class="sourceLineNo">401</span> }<a name="line.401"></a> +<span class="sourceLineNo">402</span> } else if (state == S2) {<a name="line.402"></a> +<span class="sourceLineNo">403</span> if (c == ',') {<a name="line.403"></a> +<span class="sourceLineNo">404</span> state = S3;<a name="line.404"></a> +<span class="sourceLineNo">405</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.405"></a> +<span class="sourceLineNo">406</span> skipCommentsAndSpace(session, r.unread());<a name="line.406"></a> +<span class="sourceLineNo">407</span> } else if (c == ']') {<a name="line.407"></a> +<span class="sourceLineNo">408</span> return l;<a name="line.408"></a> +<span class="sourceLineNo">409</span> } else {<a name="line.409"></a> +<span class="sourceLineNo">410</span> break; // Invalid character found.<a name="line.410"></a> +<span class="sourceLineNo">411</span> }<a name="line.411"></a> +<span class="sourceLineNo">412</span> } else if (state == S3) {<a name="line.412"></a> +<span class="sourceLineNo">413</span> if (session.isCommentOrWhitespace(c)) {<a name="line.413"></a> +<span class="sourceLineNo">414</span> skipCommentsAndSpace(session, r.unread());<a name="line.414"></a> +<span class="sourceLineNo">415</span> } else if (c == ']') {<a name="line.415"></a> +<span class="sourceLineNo">416</span> break;<a name="line.416"></a> +<span class="sourceLineNo">417</span> } else if (c != -1) {<a name="line.417"></a> +<span class="sourceLineNo">418</span> l.add(parseAnything(session, elementType, r.unread(), l, pMeta));<a name="line.418"></a> +<span class="sourceLineNo">419</span> state = S2;<a name="line.419"></a> +<span class="sourceLineNo">420</span> }<a name="line.420"></a> +<span class="sourceLineNo">421</span> }<a name="line.421"></a> +<span class="sourceLineNo">422</span> }<a name="line.422"></a> +<span class="sourceLineNo">423</span> if (state == S0)<a name="line.423"></a> +<span class="sourceLineNo">424</span> throw new ParseException(session, "Expected '[' at beginning of JSON array.");<a name="line.424"></a> +<span class="sourceLineNo">425</span> if (state == S1)<a name="line.425"></a> +<span class="sourceLineNo">426</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.426"></a> +<span class="sourceLineNo">427</span> if (state == S2)<a name="line.427"></a> +<span class="sourceLineNo">428</span> throw new ParseException(session, "Expected ',' or ']'.");<a name="line.428"></a> +<span class="sourceLineNo">429</span> if (state == S3)<a name="line.429"></a> +<span class="sourceLineNo">430</span> throw new ParseException(session, "Unexpected trailing comma in array.");<a name="line.430"></a> +<span class="sourceLineNo">431</span><a name="line.431"></a> +<span class="sourceLineNo">432</span> return null; // Unreachable.<a name="line.432"></a> +<span class="sourceLineNo">433</span> }<a name="line.433"></a> +<span class="sourceLineNo">434</span><a name="line.434"></a> +<span class="sourceLineNo">435</span> private Object[] parseArgs(JsonParserSession session, ParserReader r, ClassMeta<?>[] argTypes) throws Exception {<a name="line.435"></a> <span class="sourceLineNo">436</span><a name="line.436"></a> -<span class="sourceLineNo">437</span> int state = S0;<a name="line.437"></a> -<span class="sourceLineNo">438</span> String currAttr = "";<a name="line.438"></a> -<span class="sourceLineNo">439</span> int c = 0;<a name="line.439"></a> -<span class="sourceLineNo">440</span> int currAttrLine = -1, currAttrCol = -1;<a name="line.440"></a> -<span class="sourceLineNo">441</span> while (c != -1) {<a name="line.441"></a> -<span class="sourceLineNo">442</span> c = r.read();<a name="line.442"></a> -<span class="sourceLineNo">443</span> if (state == S0) {<a name="line.443"></a> -<span class="sourceLineNo">444</span> if (c == '{')<a name="line.444"></a> -<span class="sourceLineNo">445</span> state = S1;<a name="line.445"></a> -<span class="sourceLineNo">446</span> } else if (state == S1) {<a name="line.446"></a> -<span class="sourceLineNo">447</span> if (c == '}') {<a name="line.447"></a> -<span class="sourceLineNo">448</span> return m;<a name="line.448"></a> -<span class="sourceLineNo">449</span> } else if (c == '/') {<a name="line.449"></a> -<span class="sourceLineNo">450</span> skipCommentsAndSpace(session, r.unread());<a name="line.450"></a> -<span class="sourceLineNo">451</span> } else if (! Character.isWhitespace(c)) {<a name="line.451"></a> -<span class="sourceLineNo">452</span> r.unread();<a name="line.452"></a> -<span class="sourceLineNo">453</span> currAttrLine= r.getLine();<a name="line.453"></a> -<span class="sourceLineNo">454</span> currAttrCol = r.getColumn();<a name="line.454"></a> -<span class="sourceLineNo">455</span> currAttr = parseFieldName(session, r);<a name="line.455"></a> -<span class="sourceLineNo">456</span> state = S3;<a name="line.456"></a> -<span class="sourceLineNo">457</span> }<a name="line.457"></a> -<span class="sourceLineNo">458</span> } else if (state == S3) {<a name="line.458"></a> -<span class="sourceLineNo">459</span> if (c == ':')<a name="line.459"></a> -<span class="sourceLineNo">460</span> state = S4;<a name="line.460"></a> -<span class="sourceLineNo">461</span> } else if (state == S4) {<a name="line.461"></a> -<span class="sourceLineNo">462</span> if (c == '/') {<a name="line.462"></a> -<span class="sourceLineNo">463</span> skipCommentsAndSpace(session, r.unread());<a name="line.463"></a> -<span class="sourceLineNo">464</span> } else if (! Character.isWhitespace(c)) {<a name="line.464"></a> -<span class="sourceLineNo">465</span> if (! currAttr.equals(bc.getBeanTypePropertyName())) {<a name="line.465"></a> -<span class="sourceLineNo">466</span> BeanPropertyMeta pMeta = m.getPropertyMeta(currAttr);<a name="line.466"></a> -<span class="sourceLineNo">467</span> session.setCurrentProperty(pMeta);<a name="line.467"></a> -<span class="sourceLineNo">468</span> if (pMeta == null) {<a name="line.468"></a> -<span class="sourceLineNo">469</span> if (m.getMeta().isSubTyped()) {<a name="line.469"></a> -<span class="sourceLineNo">470</span> Object value = parseAnything(session, object(), r.unread(), m.getBean(false), null);<a name="line.470"></a> -<span class="sourceLineNo">471</span> m.put(currAttr, value);<a name="line.471"></a> -<span class="sourceLineNo">472</span> } else {<a name="line.472"></a> -<span class="sourceLineNo">473</span> onUnknownProperty(session, currAttr, m, currAttrLine, currAttrCol);<a name="line.473"></a> -<span class="sourceLineNo">474</span> parseAnything(session, object(), r.unread(), m.getBean(false), null); // Read content anyway to ignore it<a name="line.474"></a> -<span class="sourceLineNo">475</span> }<a name="line.475"></a> -<span class="sourceLineNo">476</span> } else {<a name="line.476"></a> -<span class="sourceLineNo">477</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.477"></a> -<span class="sourceLineNo">478</span> Object value = parseAnything(session, cm, r.unread(), m.getBean(false), pMeta);<a name="line.478"></a> -<span class="sourceLineNo">479</span> setName(cm, value, currAttr);<a name="line.479"></a> -<span class="sourceLineNo">480</span> pMeta.set(m, value);<a name="line.480"></a> -<span class="sourceLineNo">481</span> }<a name="line.481"></a> -<span class="sourceLineNo">482</span> session.setCurrentProperty(null);<a name="line.482"></a> -<span class="sourceLineNo">483</span> }<a name="line.483"></a> -<span class="sourceLineNo">484</span> state = S5;<a name="line.484"></a> -<span class="sourceLineNo">485</span> }<a name="line.485"></a> -<span class="sourceLineNo">486</span> } else if (state == S5) {<a name="line.486"></a> -<span class="sourceLineNo">487</span> if (c == ',')<a name="line.487"></a> -<span class="sourceLineNo">488</span> state = S1;<a name="line.488"></a> -<span class="sourceLineNo">489</span> else if (c == '/')<a name="line.489"></a> -<span class="sourceLineNo">490</span> skipCommentsAndSpace(session, r.unread());<a name="line.490"></a> -<span class="sourceLineNo">491</span> else if (c == '}') {<a name="line.491"></a> -<span class="sourceLineNo">492</span> return m;<a name="line.492"></a> -<span class="sourceLineNo">493</span> }<a name="line.493"></a> -<span class="sourceLineNo">494</span> }<a name="line.494"></a> -<span class="sourceLineNo">495</span> }<a name="line.495"></a> -<span class="sourceLineNo">496</span> if (state == S0)<a name="line.496"></a> -<span class="sourceLineNo">497</span> throw new ParseException(session, "Expected '{' at beginning of JSON object.");<a name="line.497"></a> -<span class="sourceLineNo">498</span> if (state == S1)<a name="line.498"></a> -<span class="sourceLineNo">499</span> throw new ParseException(session, "Could not find attribute name on JSON object.");<a name="line.499"></a> -<span class="sourceLineNo">500</span> if (state == S3)<a name="line.500"></a> -<span class="sourceLineNo">501</span> throw new ParseException(session, "Could not find ':' following attribute name on JSON object.");<a name="line.501"></a> -<span class="sourceLineNo">502</span> if (state == S4)<a name="line.502"></a> -<span class="sourceLineNo">503</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.503"></a> -<span class="sourceLineNo">504</span> if (state == S5)<a name="line.504"></a> -<span class="sourceLineNo">505</span> throw new ParseException(session, "Could not find '}' marking end of JSON object.");<a name="line.505"></a> -<span class="sourceLineNo">506</span><a name="line.506"></a> -<span class="sourceLineNo">507</span> return null; // Unreachable.<a name="line.507"></a> -<span class="sourceLineNo">508</span> }<a name="line.508"></a> -<span class="sourceLineNo">509</span><a name="line.509"></a> -<span class="sourceLineNo">510</span> /*<a name="line.510"></a> -<span class="sourceLineNo">511</span> * Starting from the specified position in the character array, returns the<a name="line.511"></a> -<span class="sourceLineNo">512</span> * position of the character " or '.<a name="line.512"></a> -<span class="sourceLineNo">513</span> * If the string consists of a concatenation of strings (e.g. 'AAA' + "BBB"), this method<a name="line.513"></a> -<span class="sourceLineNo">514</span> * will automatically concatenate the strings and return the result.<a name="line.514"></a> -<span class="sourceLineNo">515</span> */<a name="line.515"></a> -<span class="sourceLineNo">516</span> private String parseString(JsonParserSession session, ParserReader r) throws Exception {<a name="line.516"></a> -<span class="sourceLineNo">517</span> r.mark();<a name="line.517"></a> -<span class="sourceLineNo">518</span> int qc = r.read(); // The quote character being used (" or ')<a name="line.518"></a> -<span class="sourceLineNo">519</span> if (qc != '"' && session.isStrictMode()) {<a name="line.519"></a> -<span class="sourceLineNo">520</span> String msg = (qc == '\'' ? "Invalid quote character \"{0}\" being used." : "Did not find quote character marking beginning of string. Character=\"{0}\"");<a name="line.520"></a> -<span class="sourceLineNo">521</span> throw new ParseException(session, msg, (char)qc);<a name="line.521"></a> -<span class="sourceLineNo">522</span> }<a name="line.522"></a> -<span class="sourceLineNo">523</span> final boolean isQuoted = (qc == '\'' || qc == '"');<a name="line.523"></a> -<span class="sourceLineNo">524</span> String s = null;<a name="line.524"></a> -<span class="sourceLineNo">525</span> boolean isInEscape = false;<a name="line.525"></a> -<span class="sourceLineNo">526</span> int c = 0;<a name="line.526"></a> -<span class="sourceLineNo">527</span> while (c != -1) {<a name="line.527"></a> -<span class="sourceLineNo">528</span> c = r.read();<a name="line.528"></a> -<span class="sourceLineNo">529</span> if (isInEscape) {<a name="line.529"></a> -<span class="sourceLineNo">530</span> switch (c) {<a name="line.530"></a> -<span class="sourceLineNo">531</span> case 'n': r.replace('\n'); break;<a name="line.531"></a> -<span class="sourceLineNo">532</span> case 'r': r.replace('\r'); break;<a name="line.532"></a> -<span class="sourceLineNo">533</span> case 't': r.replace('\t'); break;<a name="line.533"></a> -<span class="sourceLineNo">534</span> case 'f': r.replace('\f'); break;<a name="line.534"></a> -<span class="sourceLineNo">535</span> case 'b': r.replace('\b'); break;<a name="line.535"></a> -<span class="sourceLineNo">536</span> case '\\': r.replace('\\'); break;<a name="line.536"></a> -<span class="sourceLineNo">537</span> case '/': r.replace('/'); break;<a name="line.537"></a> -<span class="sourceLineNo">538</span> case '\'': r.replace('\''); break;<a name="line.538"></a> -<span class="sourceLineNo">539</span> case '"': r.replace('"'); break;<a name="line.539"></a> -<span class="sourceLineNo">540</span> case 'u': {<a name="line.540"></a> -<span class="sourceLineNo">541</span> String n = r.read(4);<a name="line.541"></a> -<span class="sourceLineNo">542</span> r.replace(Integer.parseInt(n, 16), 6);<a name="line.542"></a> -<span class="sourceLineNo">543</span> break;<a name="line.543"></a> -<span class="sourceLineNo">544</span> }<a name="line.544"></a> -<span class="sourceLineNo">545</span> default:<a name="line.545"></a> -<span class="sourceLineNo">546</span> throw new ParseException(session, "Invalid escape sequence in string.");<a name="line.546"></a> +<span class="sourceLineNo">437</span> int S0=0; // Looking for outermost [<a name="line.437"></a> +<span class="sourceLineNo">438</span> int S1=1; // Looking for starting [ or { or " or ' or LITERAL<a name="line.438"></a> +<span class="sourceLineNo">439</span> int S2=2; // Looking for , or ]<a name="line.439"></a> +<span class="sourceLineNo">440</span><a name="line.440"></a> +<span class="sourceLineNo">441</span> Object[] o = new Object[argTypes.length];<a name="line.441"></a> +<span class="sourceLineNo">442</span> int i = 0;<a name="line.442"></a> +<span class="sourceLineNo">443</span><a name="line.443"></a> +<span class="sourceLineNo">444</span> int state = S0;<a name="line.444"></a> +<span class="sourceLineNo">445</span> int c = 0;<a name="line.445"></a> +<span class="sourceLineNo">446</span> while (c != -1) {<a name="line.446"></a> +<span class="sourceLineNo">447</span> c = r.read();<a name="line.447"></a> +<span class="sourceLineNo">448</span> if (state == S0) {<a name="line.448"></a> +<span class="sourceLineNo">449</span> if (c == '[')<a name="line.449"></a> +<span class="sourceLineNo">450</span> state = S1;<a name="line.450"></a> +<span class="sourceLineNo">451</span> } else if (state == S1) {<a name="line.451"></a> +<span class="sourceLineNo">452</span> if (c == ']') {<a name="line.452"></a> +<span class="sourceLineNo">453</span> return o;<a name="line.453"></a> +<span class="sourceLineNo">454</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.454"></a> +<span class="sourceLineNo">455</span> skipCommentsAndSpace(session, r.unread());<a name="line.455"></a> +<span class="sourceLineNo">456</span> } else {<a name="line.456"></a> +<span class="sourceLineNo">457</span> o[i] = parseAnything(session, argTypes[i], r.unread(), session.getOuter(), null);<a name="line.457"></a> +<span class="sourceLineNo">458</span> i++;<a name="line.458"></a> +<span class="sourceLineNo">459</span> state = S2;<a name="line.459"></a> +<span class="sourceLineNo">460</span> }<a name="line.460"></a> +<span class="sourceLineNo">461</span> } else if (state == S2) {<a name="line.461"></a> +<span class="sourceLineNo">462</span> if (c == ',') {<a name="line.462"></a> +<span class="sourceLineNo">463</span> state = S1;<a name="line.463"></a> +<span class="sourceLineNo">464</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.464"></a> +<span class="sourceLineNo">465</span> skipCommentsAndSpace(session, r.unread());<a name="line.465"></a> +<span class="sourceLineNo">466</span> } else if (c == ']') {<a name="line.466"></a> +<span class="sourceLineNo">467</span> return o;<a name="line.467"></a> +<span class="sourceLineNo">468</span> }<a name="line.468"></a> +<span class="sourceLineNo">469</span> }<a name="line.469"></a> +<span class="sourceLineNo">470</span> }<a name="line.470"></a> +<span class="sourceLineNo">471</span> if (state == S0)<a name="line.471"></a> +<span class="sourceLineNo">472</span> throw new ParseException(session, "Expected '[' at beginning of JSON array.");<a name="line.472"></a> +<span class="sourceLineNo">473</span> if (state == S1)<a name="line.473"></a> +<span class="sourceLineNo">474</span> throw new ParseException(session, "Expected one of the following characters: {,[,',\",LITERAL.");<a name="line.474"></a> +<span class="sourceLineNo">475</span> if (state == S2)<a name="line.475"></a> +<span class="sourceLineNo">476</span> throw new ParseException(session, "Expected ',' or ']'.");<a name="line.476"></a> +<span class="sourceLineNo">477</span><a name="line.477"></a> +<span class="sourceLineNo">478</span> return null; // Unreachable.<a name="line.478"></a> +<span class="sourceLineNo">479</span> }<a name="line.479"></a> +<span class="sourceLineNo">480</span><a name="line.480"></a> +<span class="sourceLineNo">481</span> private <T> BeanMap<T> parseIntoBeanMap2(JsonParserSession session, ParserReader r, BeanMap<T> m) throws Exception {<a name="line.481"></a> +<span class="sourceLineNo">482</span><a name="line.482"></a> +<span class="sourceLineNo">483</span> BeanContext bc = session.getBeanContext();<a name="line.483"></a> +<span class="sourceLineNo">484</span><a name="line.484"></a> +<span class="sourceLineNo">485</span> int S0=0; // Looking for outer {<a name="line.485"></a> +<span class="sourceLineNo">486</span> int S1=1; // Looking for attrName start.<a name="line.486"></a> +<span class="sourceLineNo">487</span> int S3=3; // Found attrName end, looking for :.<a name="line.487"></a> +<span class="sourceLineNo">488</span> int S4=4; // Found :, looking for valStart: { [ " ' LITERAL.<a name="line.488"></a> +<span class="sourceLineNo">489</span> int S5=5; // Looking for , or }<a name="line.489"></a> +<span class="sourceLineNo">490</span><a name="line.490"></a> +<span class="sourceLineNo">491</span> int state = S0;<a name="line.491"></a> +<span class="sourceLineNo">492</span> String currAttr = "";<a name="line.492"></a> +<span class="sourceLineNo">493</span> int c = 0;<a name="line.493"></a> +<span class="sourceLineNo">494</span> int currAttrLine = -1, currAttrCol = -1;<a name="line.494"></a> +<span class="sourceLineNo">495</span> while (c != -1) {<a name="line.495"></a> +<span class="sourceLineNo">496</span> c = r.read();<a name="line.496"></a> +<span class="sourceLineNo">497</span> if (state == S0) {<a name="line.497"></a> +<span class="sourceLineNo">498</span> if (c == '{')<a name="line.498"></a> +<span class="sourceLineNo">499</span> state = S1;<a name="line.499"></a> +<span class="sourceLineNo">500</span> } else if (state == S1) {<a name="line.500"></a> +<span class="sourceLineNo">501</span> if (c == '}') {<a name="line.501"></a> +<span class="sourceLineNo">502</span> return m;<a name="line.502"></a> +<span class="sourceLineNo">503</span> } else if (session.isCommentOrWhitespace(c)) {<a name="line.503"></a> +<span class="sourceLineNo">504</span> skipCommentsAndSpace(session, r.unread());<a name="line.504"></a> +<span class="sourceLineNo">505</span> } else {<a name="line.505"></a> +<span class="sourceLineNo">506</span> r.unread();<a name="line.506"></a> +<span class="sourceLineNo">507</span> currAttrLine= r.getLine();<a name="line.507"></a> +<span class="sourceLineNo">508</span> currAttrCol = r.getColumn();<a name="line.508"></a> +<span class="sourceLineNo">509</span> currAttr = parseFieldName(session, r);<a name="line.509"></a> +<span class="sourceLineNo">510</span> state = S3;<a name="line.510"></a> +<span class="sourceLineNo">511</span> }<a name="line.511"></a> +<span class="sourceLineNo">512</span> } else if (state == S3) {<a name="line.512"></a> +<span class="sourceLineNo">513</span> if (c == ':')<a name="line.513"></a> +<span class="sourceLineNo">514</span> state = S4;<a name="line.514"></a> +<span class="sourceLineNo">515</span> } else if (state == S4) {<a name="line.515"></a> +<span class="sourceLineNo">516</span> if (session.isCommentOrWhitespace(c)) {<a name="line.516"></a> +<span class="sourceLineNo">517</span> skipCommentsAndSpace(session, r.unread());<a name="line.517"></a> +<span class="sourceLineNo">518</span> } else {<a name="line.518"></a> +<span class="sourceLineNo">519</span> if (! currAttr.equals(bc.getBeanTypePropertyName())) {<a name="line.519"></a> +<span class="sourceLineNo">520</span> BeanPropertyMeta pMeta = m.getPropertyMeta(currAttr);<a name="line.520"></a> +<span class="sourceLineNo">521</span> session.setCurrentProperty(pMeta);<a name="line.521"></a> +<span class="sourceLineNo">522</span> if (pMeta == null) {<a name="line.522"></a> +<span class="sourceLineNo">523</span> if (m.getMeta().isSubTyped()) {<a name="line.523"></a> +<span class="sourceLineNo">524</span> Object value = parseAnything(session, object(), r.unread(), m.getBean(false), null);<a name="line.524"></a> +<span class="sourceLineNo">525</span>
<TRUNCATED>
