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/03/27 01:21:14 UTC
[04/37] incubator-juneau-website git commit: Update javadocs
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/236aea45/content/site/apidocs/src-html/org/apache/juneau/uon/UonParser.Decoding.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/uon/UonParser.Decoding.html b/content/site/apidocs/src-html/org/apache/juneau/uon/UonParser.Decoding.html
index 23de9ed..4bf8325 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/uon/UonParser.Decoding.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/uon/UonParser.Decoding.html
@@ -133,679 +133,685 @@
<span class="sourceLineNo">125</span> else if (sType.isPrimitive())<a name="line.125"></a>
<span class="sourceLineNo">126</span> o = sType.getPrimitiveDefault();<a name="line.126"></a>
<span class="sourceLineNo">127</span> // Otherwise, leave null.<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 m = new ObjectMap(session);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> parseIntoMap(session, r, m, string(), object(), pMeta);<a name="line.131"></a>
-<span class="sourceLineNo">132</span> o = session.cast(m, pMeta, eType);<a name="line.132"></a>
-<span class="sourceLineNo">133</span> } else if (c == '@') {<a name="line.133"></a>
-<span class="sourceLineNo">134</span> Collection l = new ObjectList(session);<a name="line.134"></a>
-<span class="sourceLineNo">135</span> o = parseIntoCollection(session, r, l, sType.getElementType(), isUrlParamValue, pMeta);<a name="line.135"></a>
-<span class="sourceLineNo">136</span> } else {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> String s = parseString(session, r, isUrlParamValue);<a name="line.137"></a>
-<span class="sourceLineNo">138</span> if (c != '\'') {<a name="line.138"></a>
-<span class="sourceLineNo">139</span> if ("true".equals(s) || "false".equals(s))<a name="line.139"></a>
-<span class="sourceLineNo">140</span> o = Boolean.valueOf(s);<a name="line.140"></a>
-<span class="sourceLineNo">141</span> else if (StringUtils.isNumeric(s))<a name="line.141"></a>
-<span class="sourceLineNo">142</span> o = StringUtils.parseNumber(s, Number.class);<a name="line.142"></a>
-<span class="sourceLineNo">143</span> else<a name="line.143"></a>
-<span class="sourceLineNo">144</span> o = s;<a name="line.144"></a>
-<span class="sourceLineNo">145</span> } else {<a name="line.145"></a>
-<span class="sourceLineNo">146</span> o = s;<a name="line.146"></a>
-<span class="sourceLineNo">147</span> }<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, isUrlParamValue);<a name="line.152"></a>
-<span class="sourceLineNo">153</span> } else if (sType.isChar()) {<a name="line.153"></a>
-<span class="sourceLineNo">154</span> String s = parseString(session, r, isUrlParamValue);<a name="line.154"></a>
-<span class="sourceLineNo">155</span> o = s == null ? null : s.charAt(0);<a name="line.155"></a>
-<span class="sourceLineNo">156</span> } else if (sType.isNumber()) {<a name="line.156"></a>
-<span class="sourceLineNo">157</span> o = parseNumber(session, r, (Class<? extends Number>)sType.getInnerClass());<a name="line.157"></a>
-<span class="sourceLineNo">158</span> } else if (sType.isMap()) {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> Map m = (sType.canCreateNewInstance(outer) ? (Map)sType.newInstance(outer) : new ObjectMap(session));<a name="line.159"></a>
-<span class="sourceLineNo">160</span> o = parseIntoMap(session, r, m, sType.getKeyType(), sType.getValueType(), pMeta);<a name="line.160"></a>
-<span class="sourceLineNo">161</span> } else if (sType.isCollection()) {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> if (c == '(') {<a name="line.162"></a>
-<span class="sourceLineNo">163</span> ObjectMap m = new ObjectMap(session);<a name="line.163"></a>
-<span class="sourceLineNo">164</span> parseIntoMap(session, r, m, string(), object(), pMeta);<a name="line.164"></a>
-<span class="sourceLineNo">165</span> // Handle case where it's a collection, but serialized as a map with a _type or _value key.<a name="line.165"></a>
-<span class="sourceLineNo">166</span> if (m.containsKey(session.getBeanTypePropertyName()))<a name="line.166"></a>
-<span class="sourceLineNo">167</span> o = session.cast(m, pMeta, eType);<a name="line.167"></a>
-<span class="sourceLineNo">168</span> // Handle case where it's a collection, but only a single value was specified.<a name="line.168"></a>
-<span class="sourceLineNo">169</span> else {<a name="line.169"></a>
-<span class="sourceLineNo">170</span> Collection l = (sType.canCreateNewInstance(outer) ? (Collection)sType.newInstance(outer) : new ObjectList(session));<a name="line.170"></a>
-<span class="sourceLineNo">171</span> l.add(m.cast(sType.getElementType()));<a name="line.171"></a>
-<span class="sourceLineNo">172</span> o = l;<a name="line.172"></a>
-<span class="sourceLineNo">173</span> }<a name="line.173"></a>
-<span class="sourceLineNo">174</span> } else {<a name="line.174"></a>
-<span class="sourceLineNo">175</span> Collection l = (sType.canCreateNewInstance(outer) ? (Collection)sType.newInstance(outer) : new ObjectList(session));<a name="line.175"></a>
-<span class="sourceLineNo">176</span> o = parseIntoCollection(session, r, l, sType.getElementType(), isUrlParamValue, pMeta);<a name="line.176"></a>
-<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span> } else if (sType.canCreateNewBean(outer)) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> BeanMap m = session.newBeanMap(outer, sType.getInnerClass());<a name="line.179"></a>
-<span class="sourceLineNo">180</span> m = parseIntoBeanMap(session, r, m);<a name="line.180"></a>
-<span class="sourceLineNo">181</span> o = m == null ? null : m.getBean();<a name="line.181"></a>
-<span class="sourceLineNo">182</span> } else if (sType.canCreateNewInstanceFromString(outer)) {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> String s = parseString(session, r, isUrlParamValue);<a name="line.183"></a>
-<span class="sourceLineNo">184</span> if (s != null)<a name="line.184"></a>
-<span class="sourceLineNo">185</span> o = sType.newInstanceFromString(outer, s);<a name="line.185"></a>
-<span class="sourceLineNo">186</span> } else if (sType.canCreateNewInstanceFromNumber(outer)) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span> o = sType.newInstanceFromNumber(session, outer, parseNumber(session, r, sType.getNewInstanceFromNumberClass()));<a name="line.187"></a>
-<span class="sourceLineNo">188</span> } else if (sType.isArray()) {<a name="line.188"></a>
-<span class="sourceLineNo">189</span> if (c == '(') {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> ObjectMap m = new ObjectMap(session);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> parseIntoMap(session, r, m, string(), object(), pMeta);<a name="line.191"></a>
-<span class="sourceLineNo">192</span> // Handle case where it's an array, but serialized as a map with a _type or _value key.<a name="line.192"></a>
-<span class="sourceLineNo">193</span> if (m.containsKey(session.getBeanTypePropertyName()))<a name="line.193"></a>
-<span class="sourceLineNo">194</span> o = session.cast(m, pMeta, eType);<a name="line.194"></a>
-<span class="sourceLineNo">195</span> // Handle case where it's an array, but only a single value was specified.<a name="line.195"></a>
-<span class="sourceLineNo">196</span> else {<a name="line.196"></a>
-<span class="sourceLineNo">197</span> ArrayList l = new ArrayList(1);<a name="line.197"></a>
-<span class="sourceLineNo">198</span> l.add(m.cast(sType.getElementType()));<a name="line.198"></a>
-<span class="sourceLineNo">199</span> o = session.toArray(sType, l);<a name="line.199"></a>
-<span class="sourceLineNo">200</span> }<a name="line.200"></a>
-<span class="sourceLineNo">201</span> } else {<a name="line.201"></a>
-<span class="sourceLineNo">202</span> ArrayList l = (ArrayList)parseIntoCollection(session, r, new ArrayList(), sType.getElementType(), isUrlParamValue, pMeta);<a name="line.202"></a>
-<span class="sourceLineNo">203</span> o = session.toArray(sType, l);<a name="line.203"></a>
-<span class="sourceLineNo">204</span> }<a name="line.204"></a>
-<span class="sourceLineNo">205</span> } else if (c == '(') {<a name="line.205"></a>
-<span class="sourceLineNo">206</span> // It could be a non-bean with _type attribute.<a name="line.206"></a>
-<span class="sourceLineNo">207</span> ObjectMap m = new ObjectMap(session);<a name="line.207"></a>
-<span class="sourceLineNo">208</span> parseIntoMap(session, r, m, string(), object(), pMeta);<a name="line.208"></a>
-<span class="sourceLineNo">209</span> if (m.containsKey(session.getBeanTypePropertyName()))<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> throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.212"></a>
-<span class="sourceLineNo">213</span> } else {<a name="line.213"></a>
-<span class="sourceLineNo">214</span> throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<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> if (transform != null && o != null)<a name="line.217"></a>
-<span class="sourceLineNo">218</span> o = transform.unswap(session, o, eType);<a name="line.218"></a>
-<span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span> if (outer != null)<a name="line.220"></a>
-<span class="sourceLineNo">221</span> setParent(eType, o, outer);<a name="line.221"></a>
+<span class="sourceLineNo">128</span> } else if (sType.isVoid()) {<a name="line.128"></a>
+<span class="sourceLineNo">129</span> String s = parseString(session, r, isUrlParamValue);<a name="line.129"></a>
+<span class="sourceLineNo">130</span> if (s != null)<a name="line.130"></a>
+<span class="sourceLineNo">131</span> throw new ParseException(session, "Expected ''null'' for void value, but was ''{0}''.", s);<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 m = new ObjectMap(session);<a name="line.134"></a>
+<span class="sourceLineNo">135</span> parseIntoMap(session, r, m, string(), object(), pMeta);<a name="line.135"></a>
+<span class="sourceLineNo">136</span> o = session.cast(m, pMeta, eType);<a name="line.136"></a>
+<span class="sourceLineNo">137</span> } else if (c == '@') {<a name="line.137"></a>
+<span class="sourceLineNo">138</span> Collection l = new ObjectList(session);<a name="line.138"></a>
+<span class="sourceLineNo">139</span> o = parseIntoCollection(session, r, l, sType.getElementType(), isUrlParamValue, pMeta);<a name="line.139"></a>
+<span class="sourceLineNo">140</span> } else {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> String s = parseString(session, r, isUrlParamValue);<a name="line.141"></a>
+<span class="sourceLineNo">142</span> if (c != '\'') {<a name="line.142"></a>
+<span class="sourceLineNo">143</span> if ("true".equals(s) || "false".equals(s))<a name="line.143"></a>
+<span class="sourceLineNo">144</span> o = Boolean.valueOf(s);<a name="line.144"></a>
+<span class="sourceLineNo">145</span> else if (! "null".equals(s)) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> if (StringUtils.isNumeric(s))<a name="line.146"></a>
+<span class="sourceLineNo">147</span> o = StringUtils.parseNumber(s, Number.class);<a name="line.147"></a>
+<span class="sourceLineNo">148</span> else<a name="line.148"></a>
+<span class="sourceLineNo">149</span> o = s;<a name="line.149"></a>
+<span class="sourceLineNo">150</span> }<a name="line.150"></a>
+<span class="sourceLineNo">151</span> } else {<a name="line.151"></a>
+<span class="sourceLineNo">152</span> o = s;<a name="line.152"></a>
+<span class="sourceLineNo">153</span> }<a name="line.153"></a>
+<span class="sourceLineNo">154</span> }<a name="line.154"></a>
+<span class="sourceLineNo">155</span> } else if (sType.isBoolean()) {<a name="line.155"></a>
+<span class="sourceLineNo">156</span> o = parseBoolean(session, r);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> } else if (sType.isCharSequence()) {<a name="line.157"></a>
+<span class="sourceLineNo">158</span> o = parseString(session, r, isUrlParamValue);<a name="line.158"></a>
+<span class="sourceLineNo">159</span> } else if (sType.isChar()) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span> String s = parseString(session, r, isUrlParamValue);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> o = s == null ? null : s.charAt(0);<a name="line.161"></a>
+<span class="sourceLineNo">162</span> } else if (sType.isNumber()) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> o = parseNumber(session, r, (Class<? extends Number>)sType.getInnerClass());<a name="line.163"></a>
+<span class="sourceLineNo">164</span> } else if (sType.isMap()) {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> Map m = (sType.canCreateNewInstance(outer) ? (Map)sType.newInstance(outer) : new ObjectMap(session));<a name="line.165"></a>
+<span class="sourceLineNo">166</span> o = parseIntoMap(session, r, m, sType.getKeyType(), sType.getValueType(), pMeta);<a name="line.166"></a>
+<span class="sourceLineNo">167</span> } else if (sType.isCollection()) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> if (c == '(') {<a name="line.168"></a>
+<span class="sourceLineNo">169</span> ObjectMap m = new ObjectMap(session);<a name="line.169"></a>
+<span class="sourceLineNo">170</span> parseIntoMap(session, r, m, string(), object(), pMeta);<a name="line.170"></a>
+<span class="sourceLineNo">171</span> // Handle case where it's a collection, but serialized as a map with a _type or _value key.<a name="line.171"></a>
+<span class="sourceLineNo">172</span> if (m.containsKey(session.getBeanTypePropertyName()))<a name="line.172"></a>
+<span class="sourceLineNo">173</span> o = session.cast(m, pMeta, eType);<a name="line.173"></a>
+<span class="sourceLineNo">174</span> // Handle case where it's a collection, but only a single value was specified.<a name="line.174"></a>
+<span class="sourceLineNo">175</span> else {<a name="line.175"></a>
+<span class="sourceLineNo">176</span> Collection l = (sType.canCreateNewInstance(outer) ? (Collection)sType.newInstance(outer) : new ObjectList(session));<a name="line.176"></a>
+<span class="sourceLineNo">177</span> l.add(m.cast(sType.getElementType()));<a name="line.177"></a>
+<span class="sourceLineNo">178</span> o = l;<a name="line.178"></a>
+<span class="sourceLineNo">179</span> }<a name="line.179"></a>
+<span class="sourceLineNo">180</span> } else {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> Collection l = (sType.canCreateNewInstance(outer) ? (Collection)sType.newInstance(outer) : new ObjectList(session));<a name="line.181"></a>
+<span class="sourceLineNo">182</span> o = parseIntoCollection(session, r, l, sType.getElementType(), isUrlParamValue, pMeta);<a name="line.182"></a>
+<span class="sourceLineNo">183</span> }<a name="line.183"></a>
+<span class="sourceLineNo">184</span> } else if (sType.canCreateNewBean(outer)) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> BeanMap m = session.newBeanMap(outer, sType.getInnerClass());<a name="line.185"></a>
+<span class="sourceLineNo">186</span> m = parseIntoBeanMap(session, r, m);<a name="line.186"></a>
+<span class="sourceLineNo">187</span> o = m == null ? null : m.getBean();<a name="line.187"></a>
+<span class="sourceLineNo">188</span> } else if (sType.canCreateNewInstanceFromString(outer)) {<a name="line.188"></a>
+<span class="sourceLineNo">189</span> String s = parseString(session, r, isUrlParamValue);<a name="line.189"></a>
+<span class="sourceLineNo">190</span> if (s != null)<a name="line.190"></a>
+<span class="sourceLineNo">191</span> o = sType.newInstanceFromString(outer, s);<a name="line.191"></a>
+<span class="sourceLineNo">192</span> } else if (sType.canCreateNewInstanceFromNumber(outer)) {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> o = sType.newInstanceFromNumber(session, outer, parseNumber(session, r, sType.getNewInstanceFromNumberClass()));<a name="line.193"></a>
+<span class="sourceLineNo">194</span> } else if (sType.isArray()) {<a name="line.194"></a>
+<span class="sourceLineNo">195</span> if (c == '(') {<a name="line.195"></a>
+<span class="sourceLineNo">196</span> ObjectMap m = new ObjectMap(session);<a name="line.196"></a>
+<span class="sourceLineNo">197</span> parseIntoMap(session, r, m, string(), object(), pMeta);<a name="line.197"></a>
+<span class="sourceLineNo">198</span> // Handle case where it's an array, but serialized as a map with a _type or _value key.<a name="line.198"></a>
+<span class="sourceLineNo">199</span> if (m.containsKey(session.getBeanTypePropertyName()))<a name="line.199"></a>
+<span class="sourceLineNo">200</span> o = session.cast(m, pMeta, eType);<a name="line.200"></a>
+<span class="sourceLineNo">201</span> // Handle case where it's an array, but only a single value was specified.<a name="line.201"></a>
+<span class="sourceLineNo">202</span> else {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> ArrayList l = new ArrayList(1);<a name="line.203"></a>
+<span class="sourceLineNo">204</span> l.add(m.cast(sType.getElementType()));<a name="line.204"></a>
+<span class="sourceLineNo">205</span> o = session.toArray(sType, l);<a name="line.205"></a>
+<span class="sourceLineNo">206</span> }<a name="line.206"></a>
+<span class="sourceLineNo">207</span> } else {<a name="line.207"></a>
+<span class="sourceLineNo">208</span> ArrayList l = (ArrayList)parseIntoCollection(session, r, new ArrayList(), sType.getElementType(), isUrlParamValue, pMeta);<a name="line.208"></a>
+<span class="sourceLineNo">209</span> o = session.toArray(sType, l);<a name="line.209"></a>
+<span class="sourceLineNo">210</span> }<a name="line.210"></a>
+<span class="sourceLineNo">211</span> } else if (c == '(') {<a name="line.211"></a>
+<span class="sourceLineNo">212</span> // It could be a non-bean with _type attribute.<a name="line.212"></a>
+<span class="sourceLineNo">213</span> ObjectMap m = new ObjectMap(session);<a name="line.213"></a>
+<span class="sourceLineNo">214</span> parseIntoMap(session, r, m, string(), object(), pMeta);<a name="line.214"></a>
+<span class="sourceLineNo">215</span> if (m.containsKey(session.getBeanTypePropertyName()))<a name="line.215"></a>
+<span class="sourceLineNo">216</span> o = session.cast(m, pMeta, eType);<a name="line.216"></a>
+<span class="sourceLineNo">217</span> else<a name="line.217"></a>
+<span class="sourceLineNo">218</span> throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.218"></a>
+<span class="sourceLineNo">219</span> } else {<a name="line.219"></a>
+<span class="sourceLineNo">220</span> throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());<a name="line.220"></a>
+<span class="sourceLineNo">221</span> }<a name="line.221"></a>
<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span> return (T)o;<a name="line.223"></a>
-<span class="sourceLineNo">224</span> }<a name="line.224"></a>
+<span class="sourceLineNo">223</span> if (transform != null && o != null)<a name="line.223"></a>
+<span class="sourceLineNo">224</span> o = transform.unswap(session, o, eType);<a name="line.224"></a>
<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span> private <K,V> Map<K,V> parseIntoMap(UonParserSession session, ParserReader r, Map<K,V> m, ClassMeta<K> keyType, ClassMeta<V> valueType, BeanPropertyMeta pMeta) throws Exception {<a name="line.226"></a>
-<span class="sourceLineNo">227</span><a name="line.227"></a>
-<span class="sourceLineNo">228</span> if (keyType == null)<a name="line.228"></a>
-<span class="sourceLineNo">229</span> keyType = (ClassMeta<K>)string();<a name="line.229"></a>
-<span class="sourceLineNo">230</span><a name="line.230"></a>
-<span class="sourceLineNo">231</span> int c = r.read();<a name="line.231"></a>
-<span class="sourceLineNo">232</span> if (c == -1 || c == AMP)<a name="line.232"></a>
-<span class="sourceLineNo">233</span> return null;<a name="line.233"></a>
-<span class="sourceLineNo">234</span> if (c == 'n')<a name="line.234"></a>
-<span class="sourceLineNo">235</span> return (Map<K,V>)parseNull(session, r);<a name="line.235"></a>
-<span class="sourceLineNo">236</span> if (c != '(')<a name="line.236"></a>
-<span class="sourceLineNo">237</span> throw new ParseException(session, "Expected '(' at beginning of object.");<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span> final int S1=1; // Looking for attrName start.<a name="line.239"></a>
-<span class="sourceLineNo">240</span> final int S2=2; // Found attrName end, looking for =.<a name="line.240"></a>
-<span class="sourceLineNo">241</span> final int S3=3; // Found =, looking for valStart.<a name="line.241"></a>
-<span class="sourceLineNo">242</span> final int S4=4; // Looking for , or )<a name="line.242"></a>
-<span class="sourceLineNo">243</span> boolean isInEscape = false;<a name="line.243"></a>
+<span class="sourceLineNo">226</span> if (outer != null)<a name="line.226"></a>
+<span class="sourceLineNo">227</span> setParent(eType, o, outer);<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span> return (T)o;<a name="line.229"></a>
+<span class="sourceLineNo">230</span> }<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span> private <K,V> Map<K,V> parseIntoMap(UonParserSession session, ParserReader r, Map<K,V> m, ClassMeta<K> keyType, ClassMeta<V> valueType, BeanPropertyMeta pMeta) throws Exception {<a name="line.232"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span> if (keyType == null)<a name="line.234"></a>
+<span class="sourceLineNo">235</span> keyType = (ClassMeta<K>)string();<a name="line.235"></a>
+<span class="sourceLineNo">236</span><a name="line.236"></a>
+<span class="sourceLineNo">237</span> int c = r.read();<a name="line.237"></a>
+<span class="sourceLineNo">238</span> if (c == -1 || c == AMP)<a name="line.238"></a>
+<span class="sourceLineNo">239</span> return null;<a name="line.239"></a>
+<span class="sourceLineNo">240</span> if (c == 'n')<a name="line.240"></a>
+<span class="sourceLineNo">241</span> return (Map<K,V>)parseNull(session, r);<a name="line.241"></a>
+<span class="sourceLineNo">242</span> if (c != '(')<a name="line.242"></a>
+<span class="sourceLineNo">243</span> throw new ParseException(session, "Expected '(' at beginning of object.");<a name="line.243"></a>
<span class="sourceLineNo">244</span><a name="line.244"></a>
-<span class="sourceLineNo">245</span> int state = S1;<a name="line.245"></a>
-<span class="sourceLineNo">246</span> K currAttr = null;<a name="line.246"></a>
-<span class="sourceLineNo">247</span> while (c != -1 && c != AMP) {<a name="line.247"></a>
-<span class="sourceLineNo">248</span> c = r.read();<a name="line.248"></a>
-<span class="sourceLineNo">249</span> if (! isInEscape) {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> if (state == S1) {<a name="line.250"></a>
-<span class="sourceLineNo">251</span> if (c == ')')<a name="line.251"></a>
-<span class="sourceLineNo">252</span> return m;<a name="line.252"></a>
-<span class="sourceLineNo">253</span> if (Character.isWhitespace(c))<a name="line.253"></a>
-<span class="sourceLineNo">254</span> skipSpace(r);<a name="line.254"></a>
-<span class="sourceLineNo">255</span> else {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> r.unread();<a name="line.256"></a>
-<span class="sourceLineNo">257</span> Object attr = parseAttr(session, r, session.isDecodeChars());<a name="line.257"></a>
-<span class="sourceLineNo">258</span> currAttr = attr == null ? null : convertAttrToType(session, m, session.trim(attr.toString()), keyType);<a name="line.258"></a>
-<span class="sourceLineNo">259</span> state = S2;<a name="line.259"></a>
-<span class="sourceLineNo">260</span> c = 0; // Avoid isInEscape if c was '\'<a name="line.260"></a>
-<span class="sourceLineNo">261</span> }<a name="line.261"></a>
-<span class="sourceLineNo">262</span> } else if (state == S2) {<a name="line.262"></a>
-<span class="sourceLineNo">263</span> if (c == EQ || c == '=')<a name="line.263"></a>
-<span class="sourceLineNo">264</span> state = S3;<a name="line.264"></a>
-<span class="sourceLineNo">265</span> else if (c == -1 || c == ',' || c == ')' || c == AMP) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> if (currAttr == null) {<a name="line.266"></a>
-<span class="sourceLineNo">267</span> // Value was '%00'<a name="line.267"></a>
-<span class="sourceLineNo">268</span> r.unread();<a name="line.268"></a>
-<span class="sourceLineNo">269</span> return null;<a name="line.269"></a>
-<span class="sourceLineNo">270</span> }<a name="line.270"></a>
-<span class="sourceLineNo">271</span> m.put(currAttr, null);<a name="line.271"></a>
-<span class="sourceLineNo">272</span> if (c == ')' || c == -1 || c == AMP)<a name="line.272"></a>
-<span class="sourceLineNo">273</span> return m;<a name="line.273"></a>
-<span class="sourceLineNo">274</span> state = S1;<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span> } else if (state == S3) {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> if (c == -1 || c == ',' || c == ')' || c == AMP) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> V value = convertAttrToType(session, m, "", valueType);<a name="line.278"></a>
-<span class="sourceLineNo">279</span> m.put(currAttr, value);<a name="line.279"></a>
-<span class="sourceLineNo">280</span> if (c == -1 || c == ')' || c == AMP)<a name="line.280"></a>
-<span class="sourceLineNo">281</span> return m;<a name="line.281"></a>
-<span class="sourceLineNo">282</span> state = S1;<a name="line.282"></a>
-<span class="sourceLineNo">283</span> } else {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> V value = parseAnything(session, valueType, r.unread(), m, false, pMeta);<a name="line.284"></a>
-<span class="sourceLineNo">285</span> setName(valueType, value, currAttr);<a name="line.285"></a>
-<span class="sourceLineNo">286</span> m.put(currAttr, value);<a name="line.286"></a>
-<span class="sourceLineNo">287</span> state = S4;<a name="line.287"></a>
-<span class="sourceLineNo">288</span> c = 0; // Avoid isInEscape if c was '\'<a name="line.288"></a>
-<span class="sourceLineNo">289</span> }<a name="line.289"></a>
-<span class="sourceLineNo">290</span> } else if (state == S4) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span> if (c == ',')<a name="line.291"></a>
-<span class="sourceLineNo">292</span> state = S1;<a name="line.292"></a>
-<span class="sourceLineNo">293</span> else if (c == ')' || c == -1 || c == AMP) {<a name="line.293"></a>
-<span class="sourceLineNo">294</span> return m;<a name="line.294"></a>
+<span class="sourceLineNo">245</span> final int S1=1; // Looking for attrName start.<a name="line.245"></a>
+<span class="sourceLineNo">246</span> final int S2=2; // Found attrName end, looking for =.<a name="line.246"></a>
+<span class="sourceLineNo">247</span> final int S3=3; // Found =, looking for valStart.<a name="line.247"></a>
+<span class="sourceLineNo">248</span> final int S4=4; // Looking for , or )<a name="line.248"></a>
+<span class="sourceLineNo">249</span> boolean isInEscape = false;<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span> int state = S1;<a name="line.251"></a>
+<span class="sourceLineNo">252</span> K currAttr = null;<a name="line.252"></a>
+<span class="sourceLineNo">253</span> while (c != -1 && c != AMP) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> c = r.read();<a name="line.254"></a>
+<span class="sourceLineNo">255</span> if (! isInEscape) {<a name="line.255"></a>
+<span class="sourceLineNo">256</span> if (state == S1) {<a name="line.256"></a>
+<span class="sourceLineNo">257</span> if (c == ')')<a name="line.257"></a>
+<span class="sourceLineNo">258</span> return m;<a name="line.258"></a>
+<span class="sourceLineNo">259</span> if (Character.isWhitespace(c))<a name="line.259"></a>
+<span class="sourceLineNo">260</span> skipSpace(r);<a name="line.260"></a>
+<span class="sourceLineNo">261</span> else {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> r.unread();<a name="line.262"></a>
+<span class="sourceLineNo">263</span> Object attr = parseAttr(session, r, session.isDecodeChars());<a name="line.263"></a>
+<span class="sourceLineNo">264</span> currAttr = attr == null ? null : convertAttrToType(session, m, session.trim(attr.toString()), keyType);<a name="line.264"></a>
+<span class="sourceLineNo">265</span> state = S2;<a name="line.265"></a>
+<span class="sourceLineNo">266</span> c = 0; // Avoid isInEscape if c was '\'<a name="line.266"></a>
+<span class="sourceLineNo">267</span> }<a name="line.267"></a>
+<span class="sourceLineNo">268</span> } else if (state == S2) {<a name="line.268"></a>
+<span class="sourceLineNo">269</span> if (c == EQ || c == '=')<a name="line.269"></a>
+<span class="sourceLineNo">270</span> state = S3;<a name="line.270"></a>
+<span class="sourceLineNo">271</span> else if (c == -1 || c == ',' || c == ')' || c == AMP) {<a name="line.271"></a>
+<span class="sourceLineNo">272</span> if (currAttr == null) {<a name="line.272"></a>
+<span class="sourceLineNo">273</span> // Value was '%00'<a name="line.273"></a>
+<span class="sourceLineNo">274</span> r.unread();<a name="line.274"></a>
+<span class="sourceLineNo">275</span> return null;<a name="line.275"></a>
+<span class="sourceLineNo">276</span> }<a name="line.276"></a>
+<span class="sourceLineNo">277</span> m.put(currAttr, null);<a name="line.277"></a>
+<span class="sourceLineNo">278</span> if (c == ')' || c == -1 || c == AMP)<a name="line.278"></a>
+<span class="sourceLineNo">279</span> return m;<a name="line.279"></a>
+<span class="sourceLineNo">280</span> state = S1;<a name="line.280"></a>
+<span class="sourceLineNo">281</span> }<a name="line.281"></a>
+<span class="sourceLineNo">282</span> } else if (state == S3) {<a name="line.282"></a>
+<span class="sourceLineNo">283</span> if (c == -1 || c == ',' || c == ')' || c == AMP) {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> V value = convertAttrToType(session, m, "", valueType);<a name="line.284"></a>
+<span class="sourceLineNo">285</span> m.put(currAttr, value);<a name="line.285"></a>
+<span class="sourceLineNo">286</span> if (c == -1 || c == ')' || c == AMP)<a name="line.286"></a>
+<span class="sourceLineNo">287</span> return m;<a name="line.287"></a>
+<span class="sourceLineNo">288</span> state = S1;<a name="line.288"></a>
+<span class="sourceLineNo">289</span> } else {<a name="line.289"></a>
+<span class="sourceLineNo">290</span> V value = parseAnything(session, valueType, r.unread(), m, false, pMeta);<a name="line.290"></a>
+<span class="sourceLineNo">291</span> setName(valueType, value, currAttr);<a name="line.291"></a>
+<span class="sourceLineNo">292</span> m.put(currAttr, value);<a name="line.292"></a>
+<span class="sourceLineNo">293</span> state = S4;<a name="line.293"></a>
+<span class="sourceLineNo">294</span> c = 0; // Avoid isInEscape if c was '\'<a name="line.294"></a>
<span class="sourceLineNo">295</span> }<a name="line.295"></a>
-<span class="sourceLineNo">296</span> }<a name="line.296"></a>
-<span class="sourceLineNo">297</span> }<a name="line.297"></a>
-<span class="sourceLineNo">298</span> isInEscape = isInEscape(c, r, isInEscape);<a name="line.298"></a>
-<span class="sourceLineNo">299</span> }<a name="line.299"></a>
-<span class="sourceLineNo">300</span> if (state == S1)<a name="line.300"></a>
-<span class="sourceLineNo">301</span> throw new ParseException(session, "Could not find attribute name on object.");<a name="line.301"></a>
-<span class="sourceLineNo">302</span> if (state == S2)<a name="line.302"></a>
-<span class="sourceLineNo">303</span> throw new ParseException(session, "Could not find '=' following attribute name on object.");<a name="line.303"></a>
-<span class="sourceLineNo">304</span> if (state == S3)<a name="line.304"></a>
-<span class="sourceLineNo">305</span> throw new ParseException(session, "Dangling '=' found in object entry");<a name="line.305"></a>
-<span class="sourceLineNo">306</span> if (state == S4)<a name="line.306"></a>
-<span class="sourceLineNo">307</span> throw new ParseException(session, "Could not find ')' marking end of object.");<a name="line.307"></a>
-<span class="sourceLineNo">308</span><a name="line.308"></a>
-<span class="sourceLineNo">309</span> return null; // Unreachable.<a name="line.309"></a>
-<span class="sourceLineNo">310</span> }<a name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span> private <E> Collection<E> parseIntoCollection(UonParserSession session, ParserReader r, Collection<E> l, ClassMeta<E> elementType, boolean isUrlParamValue, BeanPropertyMeta pMeta) throws Exception {<a name="line.312"></a>
-<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span> int c = r.readSkipWs();<a name="line.314"></a>
-<span class="sourceLineNo">315</span> if (c == -1 || c == AMP)<a name="line.315"></a>
-<span class="sourceLineNo">316</span> return null;<a name="line.316"></a>
-<span class="sourceLineNo">317</span> if (c == 'n')<a name="line.317"></a>
-<span class="sourceLineNo">318</span> return (Collection<E>)parseNull(session, r);<a name="line.318"></a>
+<span class="sourceLineNo">296</span> } else if (state == S4) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> if (c == ',')<a name="line.297"></a>
+<span class="sourceLineNo">298</span> state = S1;<a name="line.298"></a>
+<span class="sourceLineNo">299</span> else if (c == ')' || c == -1 || c == AMP) {<a name="line.299"></a>
+<span class="sourceLineNo">300</span> return m;<a name="line.300"></a>
+<span class="sourceLineNo">301</span> }<a name="line.301"></a>
+<span class="sourceLineNo">302</span> }<a name="line.302"></a>
+<span class="sourceLineNo">303</span> }<a name="line.303"></a>
+<span class="sourceLineNo">304</span> isInEscape = isInEscape(c, r, isInEscape);<a name="line.304"></a>
+<span class="sourceLineNo">305</span> }<a name="line.305"></a>
+<span class="sourceLineNo">306</span> if (state == S1)<a name="line.306"></a>
+<span class="sourceLineNo">307</span> throw new ParseException(session, "Could not find attribute name on object.");<a name="line.307"></a>
+<span class="sourceLineNo">308</span> if (state == S2)<a name="line.308"></a>
+<span class="sourceLineNo">309</span> throw new ParseException(session, "Could not find '=' following attribute name on object.");<a name="line.309"></a>
+<span class="sourceLineNo">310</span> if (state == S3)<a name="line.310"></a>
+<span class="sourceLineNo">311</span> throw new ParseException(session, "Dangling '=' found in object entry");<a name="line.311"></a>
+<span class="sourceLineNo">312</span> if (state == S4)<a name="line.312"></a>
+<span class="sourceLineNo">313</span> throw new ParseException(session, "Could not find ')' marking end of object.");<a name="line.313"></a>
+<span class="sourceLineNo">314</span><a name="line.314"></a>
+<span class="sourceLineNo">315</span> return null; // Unreachable.<a name="line.315"></a>
+<span class="sourceLineNo">316</span> }<a name="line.316"></a>
+<span class="sourceLineNo">317</span><a name="line.317"></a>
+<span class="sourceLineNo">318</span> private <E> Collection<E> parseIntoCollection(UonParserSession session, ParserReader r, Collection<E> l, ClassMeta<E> elementType, boolean isUrlParamValue, BeanPropertyMeta pMeta) throws Exception {<a name="line.318"></a>
<span class="sourceLineNo">319</span><a name="line.319"></a>
-<span class="sourceLineNo">320</span> // If we're parsing a top-level parameter, we're allowed to have comma-delimited lists outside parenthesis (e.g. "&foo=1,2,3&bar=a,b,c")<a name="line.320"></a>
-<span class="sourceLineNo">321</span> // This is not allowed at lower levels since we use comma's as end delimiters.<a name="line.321"></a>
-<span class="sourceLineNo">322</span> boolean isInParens = (c == '@');<a name="line.322"></a>
-<span class="sourceLineNo">323</span> if (! isInParens) {<a name="line.323"></a>
-<span class="sourceLineNo">324</span> if (isUrlParamValue)<a name="line.324"></a>
-<span class="sourceLineNo">325</span> r.unread();<a name="line.325"></a>
-<span class="sourceLineNo">326</span> else<a name="line.326"></a>
-<span class="sourceLineNo">327</span> throw new ParseException(session, "Could not find '(' marking beginning of collection.");<a name="line.327"></a>
-<span class="sourceLineNo">328</span> } else {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> r.read();<a name="line.329"></a>
-<span class="sourceLineNo">330</span> }<a name="line.330"></a>
-<span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span> if (isInParens) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span> final int S1=1; // Looking for starting of first entry.<a name="line.333"></a>
-<span class="sourceLineNo">334</span> final int S2=2; // Looking for starting of subsequent entries.<a name="line.334"></a>
-<span class="sourceLineNo">335</span> final int S3=3; // Looking for , or ) after first entry.<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span> int state = S1;<a name="line.337"></a>
-<span class="sourceLineNo">338</span> while (c != -1 && c != AMP) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span> c = r.read();<a name="line.339"></a>
-<span class="sourceLineNo">340</span> if (state == S1 || state == S2) {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> if (c == ')') {<a name="line.341"></a>
-<span class="sourceLineNo">342</span> if (state == S2) {<a name="line.342"></a>
-<span class="sourceLineNo">343</span> l.add(parseAnything(session, elementType, r.unread(), l, false, pMeta));<a name="line.343"></a>
-<span class="sourceLineNo">344</span> r.read();<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
-<span class="sourceLineNo">346</span> return l;<a name="line.346"></a>
-<span class="sourceLineNo">347</span> } else if (Character.isWhitespace(c)) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> skipSpace(r);<a name="line.348"></a>
-<span class="sourceLineNo">349</span> } else {<a name="line.349"></a>
-<span class="sourceLineNo">350</span> l.add(parseAnything(session, elementType, r.unread(), l, false, pMeta));<a name="line.350"></a>
-<span class="sourceLineNo">351</span> state = S3;<a name="line.351"></a>
-<span class="sourceLineNo">352</span> }<a name="line.352"></a>
-<span class="sourceLineNo">353</span> } else if (state == S3) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> if (c == ',') {<a name="line.354"></a>
-<span class="sourceLineNo">355</span> state = S2;<a name="line.355"></a>
-<span class="sourceLineNo">356</span> } else if (c == ')') {<a name="line.356"></a>
-<span class="sourceLineNo">357</span> return l;<a name="line.357"></a>
+<span class="sourceLineNo">320</span> int c = r.readSkipWs();<a name="line.320"></a>
+<span class="sourceLineNo">321</span> if (c == -1 || c == AMP)<a name="line.321"></a>
+<span class="sourceLineNo">322</span> return null;<a name="line.322"></a>
+<span class="sourceLineNo">323</span> if (c == 'n')<a name="line.323"></a>
+<span class="sourceLineNo">324</span> return (Collection<E>)parseNull(session, r);<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span> // If we're parsing a top-level parameter, we're allowed to have comma-delimited lists outside parenthesis (e.g. "&foo=1,2,3&bar=a,b,c")<a name="line.326"></a>
+<span class="sourceLineNo">327</span> // This is not allowed at lower levels since we use comma's as end delimiters.<a name="line.327"></a>
+<span class="sourceLineNo">328</span> boolean isInParens = (c == '@');<a name="line.328"></a>
+<span class="sourceLineNo">329</span> if (! isInParens) {<a name="line.329"></a>
+<span class="sourceLineNo">330</span> if (isUrlParamValue)<a name="line.330"></a>
+<span class="sourceLineNo">331</span> r.unread();<a name="line.331"></a>
+<span class="sourceLineNo">332</span> else<a name="line.332"></a>
+<span class="sourceLineNo">333</span> throw new ParseException(session, "Could not find '(' marking beginning of collection.");<a name="line.333"></a>
+<span class="sourceLineNo">334</span> } else {<a name="line.334"></a>
+<span class="sourceLineNo">335</span> r.read();<a name="line.335"></a>
+<span class="sourceLineNo">336</span> }<a name="line.336"></a>
+<span class="sourceLineNo">337</span><a name="line.337"></a>
+<span class="sourceLineNo">338</span> if (isInParens) {<a name="line.338"></a>
+<span class="sourceLineNo">339</span> final int S1=1; // Looking for starting of first entry.<a name="line.339"></a>
+<span class="sourceLineNo">340</span> final int S2=2; // Looking for starting of subsequent entries.<a name="line.340"></a>
+<span class="sourceLineNo">341</span> final int S3=3; // Looking for , or ) after first entry.<a name="line.341"></a>
+<span class="sourceLineNo">342</span><a name="line.342"></a>
+<span class="sourceLineNo">343</span> int state = S1;<a name="line.343"></a>
+<span class="sourceLineNo">344</span> while (c != -1 && c != AMP) {<a name="line.344"></a>
+<span class="sourceLineNo">345</span> c = r.read();<a name="line.345"></a>
+<span class="sourceLineNo">346</span> if (state == S1 || state == S2) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span> if (c == ')') {<a name="line.347"></a>
+<span class="sourceLineNo">348</span> if (state == S2) {<a name="line.348"></a>
+<span class="sourceLineNo">349</span> l.add(parseAnything(session, elementType, r.unread(), l, false, pMeta));<a name="line.349"></a>
+<span class="sourceLineNo">350</span> r.read();<a name="line.350"></a>
+<span class="sourceLineNo">351</span> }<a name="line.351"></a>
+<span class="sourceLineNo">352</span> return l;<a name="line.352"></a>
+<span class="sourceLineNo">353</span> } else if (Character.isWhitespace(c)) {<a name="line.353"></a>
+<span class="sourceLineNo">354</span> skipSpace(r);<a name="line.354"></a>
+<span class="sourceLineNo">355</span> } else {<a name="line.355"></a>
+<span class="sourceLineNo">356</span> l.add(parseAnything(session, elementType, r.unread(), l, false, pMeta));<a name="line.356"></a>
+<span class="sourceLineNo">357</span> state = S3;<a name="line.357"></a>
<span class="sourceLineNo">358</span> }<a name="line.358"></a>
-<span class="sourceLineNo">359</span> }<a name="line.359"></a>
-<span class="sourceLineNo">360</span> }<a name="line.360"></a>
-<span class="sourceLineNo">361</span> if (state == S1 || state == S2)<a name="line.361"></a>
-<span class="sourceLineNo">362</span> throw new ParseException(session, "Could not find start of entry in array.");<a name="line.362"></a>
-<span class="sourceLineNo">363</span> if (state == S3)<a name="line.363"></a>
-<span class="sourceLineNo">364</span> throw new ParseException(session, "Could not find end of entry in array.");<a name="line.364"></a>
-<span class="sourceLineNo">365</span><a name="line.365"></a>
-<span class="sourceLineNo">366</span> } else {<a name="line.366"></a>
-<span class="sourceLineNo">367</span> final int S1=1; // Looking for starting of entry.<a name="line.367"></a>
-<span class="sourceLineNo">368</span> final int S2=2; // Looking for , or & or END after first entry.<a name="line.368"></a>
-<span class="sourceLineNo">369</span><a name="line.369"></a>
-<span class="sourceLineNo">370</span> int state = S1;<a name="line.370"></a>
-<span class="sourceLineNo">371</span> while (c != -1 && c != AMP) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span> c = r.read();<a name="line.372"></a>
-<span class="sourceLineNo">373</span> if (state == S1) {<a name="line.373"></a>
-<span class="sourceLineNo">374</span> if (Character.isWhitespace(c)) {<a name="line.374"></a>
-<span class="sourceLineNo">375</span> skipSpace(r);<a name="line.375"></a>
-<span class="sourceLineNo">376</span> } else {<a name="line.376"></a>
-<span class="sourceLineNo">377</span> l.add(parseAnything(session, elementType, r.unread(), l, false, pMeta));<a name="line.377"></a>
-<span class="sourceLineNo">378</span> state = S2;<a name="line.378"></a>
-<span class="sourceLineNo">379</span> }<a name="line.379"></a>
-<span class="sourceLineNo">380</span> } else if (state == S2) {<a name="line.380"></a>
-<span class="sourceLineNo">381</span> if (c == ',') {<a name="line.381"></a>
-<span class="sourceLineNo">382</span> state = S1;<a name="line.382"></a>
-<span class="sourceLineNo">383</span> } else if (Character.isWhitespace(c)) {<a name="line.383"></a>
-<span class="sourceLineNo">384</span> skipSpace(r);<a name="line.384"></a>
-<span class="sourceLineNo">385</span> } else if (c == AMP || c == -1) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span> r.unread();<a name="line.386"></a>
-<span class="sourceLineNo">387</span> return l;<a name="line.387"></a>
-<span class="sourceLineNo">388</span> }<a name="line.388"></a>
-<span class="sourceLineNo">389</span> }<a name="line.389"></a>
-<span class="sourceLineNo">390</span> }<a name="line.390"></a>
-<span class="sourceLineNo">391</span> }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span> return null; // Unreachable.<a name="line.393"></a>
-<span class="sourceLineNo">394</span> }<a name="line.394"></a>
-<span class="sourceLineNo">395</span><a name="line.395"></a>
-<span class="sourceLineNo">396</span> private <T> BeanMap<T> parseIntoBeanMap(UonParserSession session, ParserReader r, BeanMap<T> m) throws Exception {<a name="line.396"></a>
-<span class="sourceLineNo">397</span><a name="line.397"></a>
-<span class="sourceLineNo">398</span> int c = r.readSkipWs();<a name="line.398"></a>
-<span class="sourceLineNo">399</span> if (c == -1 || c == AMP)<a name="line.399"></a>
-<span class="sourceLineNo">400</span> return null;<a name="line.400"></a>
-<span class="sourceLineNo">401</span> if (c == 'n')<a name="line.401"></a>
-<span class="sourceLineNo">402</span> return (BeanMap<T>)parseNull(session, r);<a name="line.402"></a>
-<span class="sourceLineNo">403</span> if (c != '(')<a name="line.403"></a>
-<span class="sourceLineNo">404</span> throw new ParseException(session, "Expected '(' at beginning of object.");<a name="line.404"></a>
-<span class="sourceLineNo">405</span><a name="line.405"></a>
-<span class="sourceLineNo">406</span> final int S1=1; // Looking for attrName start.<a name="line.406"></a>
-<span class="sourceLineNo">407</span> final int S2=2; // Found attrName end, looking for =.<a name="line.407"></a>
-<span class="sourceLineNo">408</span> final int S3=3; // Found =, looking for valStart.<a name="line.408"></a>
-<span class="sourceLineNo">409</span> final int S4=4; // Looking for , or }<a name="line.409"></a>
-<span class="sourceLineNo">410</span> boolean isInEscape = false;<a name="line.410"></a>
+<span class="sourceLineNo">359</span> } else if (state == S3) {<a name="line.359"></a>
+<span class="sourceLineNo">360</span> if (c == ',') {<a name="line.360"></a>
+<span class="sourceLineNo">361</span> state = S2;<a name="line.361"></a>
+<span class="sourceLineNo">362</span> } else if (c == ')') {<a name="line.362"></a>
+<span class="sourceLineNo">363</span> return l;<a name="line.363"></a>
+<span class="sourceLineNo">364</span> }<a name="line.364"></a>
+<span class="sourceLineNo">365</span> }<a name="line.365"></a>
+<span class="sourceLineNo">366</span> }<a name="line.366"></a>
+<span class="sourceLineNo">367</span> if (state == S1 || state == S2)<a name="line.367"></a>
+<span class="sourceLineNo">368</span> throw new ParseException(session, "Could not find start of entry in array.");<a name="line.368"></a>
+<span class="sourceLineNo">369</span> if (state == S3)<a name="line.369"></a>
+<span class="sourceLineNo">370</span> throw new ParseException(session, "Could not find end of entry in array.");<a name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span> } else {<a name="line.372"></a>
+<span class="sourceLineNo">373</span> final int S1=1; // Looking for starting of entry.<a name="line.373"></a>
+<span class="sourceLineNo">374</span> final int S2=2; // Looking for , or & or END after first entry.<a name="line.374"></a>
+<span class="sourceLineNo">375</span><a name="line.375"></a>
+<span class="sourceLineNo">376</span> int state = S1;<a name="line.376"></a>
+<span class="sourceLineNo">377</span> while (c != -1 && c != AMP) {<a name="line.377"></a>
+<span class="sourceLineNo">378</span> c = r.read();<a name="line.378"></a>
+<span class="sourceLineNo">379</span> if (state == S1) {<a name="line.379"></a>
+<span class="sourceLineNo">380</span> if (Character.isWhitespace(c)) {<a name="line.380"></a>
+<span class="sourceLineNo">381</span> skipSpace(r);<a name="line.381"></a>
+<span class="sourceLineNo">382</span> } else {<a name="line.382"></a>
+<span class="sourceLineNo">383</span> l.add(parseAnything(session, elementType, r.unread(), l, false, pMeta));<a name="line.383"></a>
+<span class="sourceLineNo">384</span> state = S2;<a name="line.384"></a>
+<span class="sourceLineNo">385</span> }<a name="line.385"></a>
+<span class="sourceLineNo">386</span> } else if (state == S2) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> if (c == ',') {<a name="line.387"></a>
+<span class="sourceLineNo">388</span> state = S1;<a name="line.388"></a>
+<span class="sourceLineNo">389</span> } else if (Character.isWhitespace(c)) {<a name="line.389"></a>
+<span class="sourceLineNo">390</span> skipSpace(r);<a name="line.390"></a>
+<span class="sourceLineNo">391</span> } else if (c == AMP || c == -1) {<a name="line.391"></a>
+<span class="sourceLineNo">392</span> r.unread();<a name="line.392"></a>
+<span class="sourceLineNo">393</span> return l;<a name="line.393"></a>
+<span class="sourceLineNo">394</span> }<a name="line.394"></a>
+<span class="sourceLineNo">395</span> }<a name="line.395"></a>
+<span class="sourceLineNo">396</span> }<a name="line.396"></a>
+<span class="sourceLineNo">397</span> }<a name="line.397"></a>
+<span class="sourceLineNo">398</span><a name="line.398"></a>
+<span class="sourceLineNo">399</span> return null; // Unreachable.<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 <T> BeanMap<T> parseIntoBeanMap(UonParserSession session, ParserReader r, BeanMap<T> m) throws Exception {<a name="line.402"></a>
+<span class="sourceLineNo">403</span><a name="line.403"></a>
+<span class="sourceLineNo">404</span> int c = r.readSkipWs();<a name="line.404"></a>
+<span class="sourceLineNo">405</span> if (c == -1 || c == AMP)<a name="line.405"></a>
+<span class="sourceLineNo">406</span> return null;<a name="line.406"></a>
+<span class="sourceLineNo">407</span> if (c == 'n')<a name="line.407"></a>
+<span class="sourceLineNo">408</span> return (BeanMap<T>)parseNull(session, r);<a name="line.408"></a>
+<span class="sourceLineNo">409</span> if (c != '(')<a name="line.409"></a>
+<span class="sourceLineNo">410</span> throw new ParseException(session, "Expected '(' at beginning of object.");<a name="line.410"></a>
<span class="sourceLineNo">411</span><a name="line.411"></a>
-<span class="sourceLineNo">412</span> int state = S1;<a name="line.412"></a>
-<span class="sourceLineNo">413</span> String currAttr = "";<a name="line.413"></a>
-<span class="sourceLineNo">414</span> int currAttrLine = -1, currAttrCol = -1;<a name="line.414"></a>
-<span class="sourceLineNo">415</span> while (c != -1 && c != AMP) {<a name="line.415"></a>
-<span class="sourceLineNo">416</span> c = r.read();<a name="line.416"></a>
-<span class="sourceLineNo">417</span> if (! isInEscape) {<a name="line.417"></a>
-<span class="sourceLineNo">418</span> if (state == S1) {<a name="line.418"></a>
-<span class="sourceLineNo">419</span> if (c == ')' || c == -1 || c == AMP) {<a name="line.419"></a>
-<span class="sourceLineNo">420</span> return m;<a name="line.420"></a>
-<span class="sourceLineNo">421</span> }<a name="line.421"></a>
-<span class="sourceLineNo">422</span> if (Character.isWhitespace(c))<a name="line.422"></a>
-<span class="sourceLineNo">423</span> skipSpace(r);<a name="line.423"></a>
-<span class="sourceLineNo">424</span> else {<a name="line.424"></a>
-<span class="sourceLineNo">425</span> r.unread();<a name="line.425"></a>
-<span class="sourceLineNo">426</span> currAttrLine= r.getLine();<a name="line.426"></a>
-<span class="sourceLineNo">427</span> currAttrCol = r.getColumn();<a name="line.427"></a>
-<span class="sourceLineNo">428</span> currAttr = parseAttrName(session, r, session.isDecodeChars());<a name="line.428"></a>
-<span class="sourceLineNo">429</span> if (currAttr == null) // Value was '%00'<a name="line.429"></a>
-<span class="sourceLineNo">430</span> return null;<a name="line.430"></a>
-<span class="sourceLineNo">431</span> state = S2;<a name="line.431"></a>
-<span class="sourceLineNo">432</span> }<a name="line.432"></a>
-<span class="sourceLineNo">433</span> } else if (state == S2) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> if (c == EQ || c == '=')<a name="line.434"></a>
-<span class="sourceLineNo">435</span> state = S3;<a name="line.435"></a>
-<span class="sourceLineNo">436</span> else if (c == -1 || c == ',' || c == ')' || c == AMP) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> m.put(currAttr, null);<a name="line.437"></a>
-<span class="sourceLineNo">438</span> if (c == ')' || c == -1 || c == AMP)<a name="line.438"></a>
-<span class="sourceLineNo">439</span> return m;<a name="line.439"></a>
-<span class="sourceLineNo">440</span> state = S1;<a name="line.440"></a>
-<span class="sourceLineNo">441</span> }<a name="line.441"></a>
-<span class="sourceLineNo">442</span> } else if (state == S3) {<a name="line.442"></a>
-<span class="sourceLineNo">443</span> if (c == -1 || c == ',' || c == ')' || c == AMP) {<a name="line.443"></a>
-<span class="sourceLineNo">444</span> if (! currAttr.equals(session.getBeanTypePropertyName())) {<a name="line.444"></a>
-<span class="sourceLineNo">445</span> BeanPropertyMeta pMeta = m.getPropertyMeta(currAttr);<a name="line.445"></a>
-<span class="sourceLineNo">446</span> if (pMeta == null) {<a name="line.446"></a>
-<span class="sourceLineNo">447</span> onUnknownProperty(session, currAttr, m, currAttrLine, currAttrCol);<a name="line.447"></a>
-<span class="sourceLineNo">448</span> } else {<a name="line.448"></a>
-<span class="sourceLineNo">449</span> Object value = session.convertToType("", pMeta.getClassMeta());<a name="line.449"></a>
-<span class="sourceLineNo">450</span> pMeta.set(m, value);<a name="line.450"></a>
-<span class="sourceLineNo">451</span> }<a name="line.451"></a>
-<span class="sourceLineNo">452</span> }<a name="line.452"></a>
-<span class="sourceLineNo">453</span> if (c == -1 || c == ')' || c == AMP)<a name="line.453"></a>
-<span class="sourceLineNo">454</span> return m;<a name="line.454"></a>
-<span class="sourceLineNo">455</span> state = S1;<a name="line.455"></a>
-<span class="sourceLineNo">456</span> } else {<a name="line.456"></a>
-<span class="sourceLineNo">457</span> if (! currAttr.equals(session.getBeanTypePropertyName())) {<a name="line.457"></a>
-<span class="sourceLineNo">458</span> BeanPropertyMeta pMeta = m.getPropertyMeta(currAttr);<a name="line.458"></a>
-<span class="sourceLineNo">459</span> if (pMeta == null) {<a name="line.459"></a>
-<span class="sourceLineNo">460</span> onUnknownProperty(session, currAttr, m, currAttrLine, currAttrCol);<a name="line.460"></a>
-<span class="sourceLineNo">461</span> parseAnything(session, object(), r.unread(), m.getBean(false), false, null); // Read content anyway to ignore it<a name="line.461"></a>
-<span class="sourceLineNo">462</span> } else {<a name="line.462"></a>
-<span class="sourceLineNo">463</span> session.setCurrentProperty(pMeta);<a name="line.463"></a>
-<span class="sourceLineNo">464</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.464"></a>
-<span class="sourceLineNo">465</span> Object value = parseAnything(session, cm, r.unread(), m.getBean(false), false, pMeta);<a name="line.465"></a>
-<span class="sourceLineNo">466</span> setName(cm, value, currAttr);<a name="line.466"></a>
-<span class="sourceLineNo">467</span> pMeta.set(m, value);<a name="line.467"></a>
-<span class="sourceLineNo">468</span> session.setCurrentProperty(null);<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> state = S4;<a name="line.471"></a>
-<span class="sourceLineNo">472</span> }<a name="line.472"></a>
-<span class="sourceLineNo">473</span> } else if (state == S4) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span> if (c == ',')<a name="line.474"></a>
-<span class="sourceLineNo">475</span> state = S1;<a name="line.475"></a>
-<span class="sourceLineNo">476</span> else if (c == ')' || c == -1 || c == AMP) {<a name="line.476"></a>
-<span class="sourceLineNo">477</span> return m;<a name="line.477"></a>
+<span class="sourceLineNo">412</span> final int S1=1; // Looking for attrName start.<a name="line.412"></a>
+<span class="sourceLineNo">413</span> final int S2=2; // Found attrName end, looking for =.<a name="line.413"></a>
+<span class="sourceLineNo">414</span> final int S3=3; // Found =, looking for valStart.<a name="line.414"></a>
+<span class="sourceLineNo">415</span> final int S4=4; // Looking for , or }<a name="line.415"></a>
+<span class="sourceLineNo">416</span> boolean isInEscape = false;<a name="line.416"></a>
+<span class="sourceLineNo">417</span><a name="line.417"></a>
+<span class="sourceLineNo">418</span> int state = S1;<a name="line.418"></a>
+<span class="sourceLineNo">419</span> String currAttr = "";<a name="line.419"></a>
+<span class="sourceLineNo">420</span> int currAttrLine = -1, currAttrCol = -1;<a name="line.420"></a>
+<span class="sourceLineNo">421</span> while (c != -1 && c != AMP) {<a name="line.421"></a>
+<span class="sourceLineNo">422</span> c = r.read();<a name="line.422"></a>
+<span class="sourceLineNo">423</span> if (! isInEscape) {<a name="line.423"></a>
+<span class="sourceLineNo">424</span> if (state == S1) {<a name="line.424"></a>
+<span class="sourceLineNo">425</span> if (c == ')' || c == -1 || c == AMP) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span> return m;<a name="line.426"></a>
+<span class="sourceLineNo">427</span> }<a name="line.427"></a>
+<span class="sourceLineNo">428</span> if (Character.isWhitespace(c))<a name="line.428"></a>
+<span class="sourceLineNo">429</span> skipSpace(r);<a name="line.429"></a>
+<span class="sourceLineNo">430</span> else {<a name="line.430"></a>
+<span class="sourceLineNo">431</span> r.unread();<a name="line.431"></a>
+<span class="sourceLineNo">432</span> currAttrLine= r.getLine();<a name="line.432"></a>
+<span class="sourceLineNo">433</span> currAttrCol = r.getColumn();<a name="line.433"></a>
+<span class="sourceLineNo">434</span> currAttr = parseAttrName(session, r, session.isDecodeChars());<a name="line.434"></a>
+<span class="sourceLineNo">435</span> if (currAttr == null) // Value was '%00'<a name="line.435"></a>
+<span class="sourceLineNo">436</span> return null;<a name="line.436"></a>
+<span class="sourceLineNo">437</span> state = S2;<a name="line.437"></a>
+<span class="sourceLineNo">438</span> }<a name="line.438"></a>
+<span class="sourceLineNo">439</span> } else if (state == S2) {<a name="line.439"></a>
+<span class="sourceLineNo">440</span> if (c == EQ || c == '=')<a name="line.440"></a>
+<span class="sourceLineNo">441</span> state = S3;<a name="line.441"></a>
+<span class="sourceLineNo">442</span> else if (c == -1 || c == ',' || c == ')' || c == AMP) {<a name="line.442"></a>
+<span class="sourceLineNo">443</span> m.put(currAttr, null);<a name="line.443"></a>
+<span class="sourceLineNo">444</span> if (c == ')' || c == -1 || c == AMP)<a name="line.444"></a>
+<span class="sourceLineNo">445</span> return m;<a name="line.445"></a>
+<span class="sourceLineNo">446</span> state = S1;<a name="line.446"></a>
+<span class="sourceLineNo">447</span> }<a name="line.447"></a>
+<span class="sourceLineNo">448</span> } else if (state == S3) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span> if (c == -1 || c == ',' || c == ')' || c == AMP) {<a name="line.449"></a>
+<span class="sourceLineNo">450</span> if (! currAttr.equals(session.getBeanTypePropertyName())) {<a name="line.450"></a>
+<span class="sourceLineNo">451</span> BeanPropertyMeta pMeta = m.getPropertyMeta(currAttr);<a name="line.451"></a>
+<span class="sourceLineNo">452</span> if (pMeta == null) {<a name="line.452"></a>
+<span class="sourceLineNo">453</span> onUnknownProperty(session, currAttr, m, currAttrLine, currAttrCol);<a name="line.453"></a>
+<span class="sourceLineNo">454</span> } else {<a name="line.454"></a>
+<span class="sourceLineNo">455</span> Object value = session.convertToType("", pMeta.getClassMeta());<a name="line.455"></a>
+<span class="sourceLineNo">456</span> pMeta.set(m, value);<a name="line.456"></a>
+<span class="sourceLineNo">457</span> }<a name="line.457"></a>
+<span class="sourceLineNo">458</span> }<a name="line.458"></a>
+<span class="sourceLineNo">459</span> if (c == -1 || c == ')' || c == AMP)<a name="line.459"></a>
+<span class="sourceLineNo">460</span> return m;<a name="line.460"></a>
+<span class="sourceLineNo">461</span> state = S1;<a name="line.461"></a>
+<span class="sourceLineNo">462</span> } else {<a name="line.462"></a>
+<span class="sourceLineNo">463</span> if (! currAttr.equals(session.getBeanTypePropertyName())) {<a name="line.463"></a>
+<span class="sourceLineNo">464</span> BeanPropertyMeta pMeta = m.getPropertyMeta(currAttr);<a name="line.464"></a>
+<span class="sourceLineNo">465</span> if (pMeta == null) {<a name="line.465"></a>
+<span class="sourceLineNo">466</span> onUnknownProperty(session, currAttr, m, currAttrLine, currAttrCol);<a name="line.466"></a>
+<span class="sourceLineNo">467</span> parseAnything(session, object(), r.unread(), m.getBean(false), false, null); // Read content anyway to ignore it<a name="line.467"></a>
+<span class="sourceLineNo">468</span> } else {<a name="line.468"></a>
+<span class="sourceLineNo">469</span> session.setCurrentProperty(pMeta);<a name="line.469"></a>
+<span class="sourceLineNo">470</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.470"></a>
+<span class="sourceLineNo">471</span> Object value = parseAnything(session, cm, r.unread(), m.getBean(false), false, pMeta);<a name="line.471"></a>
+<span class="sourceLineNo">472</span> setName(cm, value, currAttr);<a name="line.472"></a>
+<span class="sourceLineNo">473</span> pMeta.set(m, value);<a name="line.473"></a>
+<span class="sourceLineNo">474</span> session.setCurrentProperty(null);<a name="line.474"></a>
+<span class="sourceLineNo">475</span> }<a name="line.475"></a>
+<span class="sourceLineNo">476</span> }<a name="line.476"></a>
+<span class="sourceLineNo">477</span> state = S4;<a name="line.477"></a>
<span class="sourceLineNo">478</span> }<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> isInEscape = isInEscape(c, r, isInEscape);<a name="line.481"></a>
-<span class="sourceLineNo">482</span> }<a name="line.482"></a>
-<span class="sourceLineNo">483</span> if (state == S1)<a name="line.483"></a>
-<span class="sourceLineNo">484</span> throw new ParseException(session, "Could not find attribute name on object.");<a name="line.484"></a>
-<span class="sourceLineNo">485</span> if (state == S2)<a name="line.485"></a>
-<span class="sourceLineNo">486</span> throw new ParseException(session, "Could not find '=' following attribute name on object.");<a name="line.486"></a>
-<span class="sourceLineNo">487</span> if (state == S3)<a name="line.487"></a>
-<span class="sourceLineNo">488</span> throw new ParseException(session, "Could not find value following '=' on object.");<a name="line.488"></a>
-<span class="sourceLineNo">489</span> if (state == S4)<a name="line.489"></a>
-<span class="sourceLineNo">490</span> throw new ParseException(session, "Could not find ')' marking end of object.");<a name="line.490"></a>
-<span class="sourceLineNo">491</span><a name="line.491"></a>
-<span class="sourceLineNo">492</span> return null; // Unreachable.<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> private static Object parseNull(UonParserSession session, ParserReader r) throws Exception {<a name="line.495"></a>
-<span class="sourceLineNo">496</span> String s = parseString(session, r, false);<a name="line.496"></a>
-<span class="sourceLineNo">497</span> if ("ull".equals(s))<a name="line.497"></a>
-<span class="sourceLineNo">498</span> return null;<a name="line.498"></a>
-<span class="sourceLineNo">499</span> throw new ParseException(session, "Unexpected character sequence: ''{0}''", s);<a name="line.499"></a>
-<span class="sourceLineNo">500</span> }<a name="line.500"></a>
-<span class="sourceLineNo">501</span><a name="line.501"></a>
-<span class="sourceLineNo">502</span> /**<a name="line.502"></a>
-<span class="sourceLineNo">503</span> * Convenience method for parsing an attribute from the specified parser.<a name="line.503"></a>
-<span class="sourceLineNo">504</span> *<a name="line.504"></a>
-<span class="sourceLineNo">505</span> * @param session<a name="line.505"></a>
-<span class="sourceLineNo">506</span> * @param r<a name="line.506"></a>
-<span class="sourceLineNo">507</span> * @param encoded<a name="line.507"></a>
-<span class="sourceLineNo">508</span> * @return The parsed object<a name="line.508"></a>
-<span class="sourceLineNo">509</span> * @throws Exception<a name="line.509"></a>
-<span class="sourceLineNo">510</span> */<a name="line.510"></a>
-<span class="sourceLineNo">511</span> protected static final Object parseAttr(UonParserSession session, ParserReader r, boolean encoded) throws Exception {<a name="line.511"></a>
-<span class="sourceLineNo">512</span> Object attr;<a name="line.512"></a>
-<span class="sourceLineNo">513</span> attr = parseAttrName(session, r, encoded);<a name="line.513"></a>
-<span class="sourceLineNo">514</span> return attr;<a name="line.514"></a>
-<span class="sourceLineNo">515</span> }<a name="line.515"></a>
-<span class="sourceLineNo">516</span><a name="line.516"></a>
-<span class="sourceLineNo">517</span> /**<a name="line.517"></a>
-<span class="sourceLineNo">518</span> * Parses an attribute name from the specified reader.<a name="line.518"></a>
-<span class="sourceLineNo">519</span> *<a name="line.519"></a>
-<span class="sourceLineNo">520</span> * @param session<a name="line.520"></a>
-<span class="sourceLineNo">521</span> * @param r<a name="line.521"></a>
-<span class="sourceLineNo">522</span> * @param encoded<a name="line.522"></a>
-<span class="sourceLineNo">523</span> * @return The parsed attribute name.<a name="line.523"></a>
-<span class="sourceLineNo">524</span> * @throws Exception<a name="line.524"></a>
-<span class="sourceLineNo">525</span> */<a name="line.525"></a>
-<span class="sourceLineNo">526</span> protected static String parseAttrName(UonParserSession session, ParserReader r, boolean encoded) throws Exception {<a name="line.526"></a>
-<span class="sourceLineNo">527</span><a name="line.527"></a>
-<span class="sourceLineNo">528</span> // If string is of form 'xxx', we're looking for ' at the end.<a name="line.528"></a>
-<span class="sourceLineNo">529</span> // Otherwise, we're looking for '&' or '=' or WS or -1 denoting the end of this string.<a name="line.529"></a>
-<span class="sourceLineNo">530</span><a name="line.530"></a>
-<span class="sourceLineNo">531</span> int c = r.peekSkipWs();<a name="line.531"></a>
-<span class="sourceLineNo">532</span> if (c == '\'')<a name="line.532"></a>
-<span class="sourceLineNo">533</span> return parsePString(session, r);<a name="line.533"></a>
-<span class="sourceLineNo">534</span><a name="line.534"></a>
-<span class="sourceLineNo">535</span> r.mark();<a name="line.535"></a>
-<span class="sourceLineNo">536</span> boolean isInEscape = false;<a name="line.536"></a>
-<span class="sourceLineNo">537</span> if (encoded) {<a name="line.537"></a>
-<span class="sourceLineNo">538</span> while (c != -1) {<a name="line.538"></a>
-<span class="sourceLineNo">539</span> c = r.read();<a name="line.539"></a>
-<span class="sourceLineNo">540</span> if (! isInEscape) {<a name="line.540"></a>
-<span class="sourceLineNo">541</span> if (c == AMP || c == EQ || c == -1 || Character.isWhitespace(c)) {<a name="line.541"></a>
-<span class="sourceLineNo">542</span> if (c != -1)<a name="line.542"></a>
-<span class="sourceLineNo">543</span> r.unread();<a name="line.543"></a>
-<span class="sourceLineNo">544</span> String s = r.getMarked();<a name="line.544"></a>
-<span class="sourceLineNo">545</span> return ("null".equals(s) ? null : s);<a name="line.545"></a>
-<span class="sourceLineNo">546</span> }<a name="line.546"></a>
-<span class="sourceLineNo">547</span> }<a name="line.547"></a>
-<span class="sourceLineNo">548</span> else if (c == AMP)<a name="line.548"></a>
-<span class="sourceLineNo">549</span> r.replace('&');<a name="line.549"></a>
-<span class="sourceLineNo">550</span> else if (c == EQ)<a name="line.550"></a>
-<span class="sourceLineNo">551</span> r.replace('=');<a name="line.551"></a>
-<span class="sourceLineNo">552</span> isInEscape = isInEscape(c, r, isInEscape);<a name="line.552"></a>
-<span class="sourceLineNo">553</span> }<a name="line.553"></a>
-<span class="sourceLineNo">554</span> } else {<a name="line.554"></a>
-<span class="sourceLineNo">555</span> while (c != -1) {<a name="line.555"></a>
-<span class="sourceLineNo">556</span> c = r.read();<a name="line.556"></a>
-<span class="sourceLineNo">557</span> if (! isInEscape) {<a name="line.557"></a>
-<span class="sourceLineNo">558</span> if (c == '=' || c == -1 || Character.isWhitespace(c)) {<a name="line.558"></a>
-<span class="sourceLineNo">559</span> if (c != -1)<a name="line.559"></a>
-<span class="sourceLineNo">560</span> r.unread();<a name="line.560"></a>
-<span class="sourceLineNo">561</span> String s = r.getMarked();<a name="line.561"></a>
-<span class="sourceLineNo">562</span> return ("null".equals(s) ? null : session.trim(s));<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> isInEscape = isInEscape(c, r, isInEscape);<a name="line.565"></a>
-<span class="sourceLineNo">566</span> }<a name="line.566"></a>
-<span class="sourceLineNo">567</span> }<a name="line.567"></a>
-<span class="sourceLineNo">568</span><a name="line.568"></a>
-<span class="sourceLineNo">569</span> // We should never get here.<a name="line.569"></a>
-<span class="sourceLineNo">570</span> throw new ParseException(session, "Unexpected condition.");<a name="line.570"></a>
-<span class="sourceLineNo">571</span> }<a name="line.571"></a>
-<span class="sourceLineNo">572</span><a name="line.572"></a>
-<span class="sourceLineNo">573</span><a name="line.573"></a>
-<span class="sourceLineNo">574</span> /**<a name="line.574"></a>
-<span class="sourceLineNo">575</span> * Returns true if the next character in the stream is preceeded by an escape '~' character.<a name="line.575"></a>
-<span class="sourceLineNo">576</span> * @param c The current character.<a name="line.576"></a>
-<span class="sourceLineNo">577</span> * @param r The reader.<a name="line.577"></a>
-<span class="sourceLineNo">578</span> * @param prevIsInEscape What the flag was last time.<a name="line.578"></a>
-<span class="sourceLineNo">579</span> */<a name="line.579"></a>
-<span class="sourceLineNo">580</span> private static final boolean isInEscape(int c, ParserReader r, boolean prevIsInEscape) throws Exception {<a name="line.580"></a>
-<span class="sourceLineNo">581</span> if (c == '~' && ! prevIsInEscape) {<a name="line.581"></a>
-<span class="sourceLineNo">582</span> c = r.peek();<a name="line.582"></a>
-<span class="sourceLineNo">583</span> if (escapedChars.contains(c)) {<a name="line.583"></a>
-<span class="sourceLineNo">584</span> r.delete();<a name="line.584"></a>
-<span class="sourceLineNo">585</span> return true;<a name="line.585"></a>
-<span class="sourceLineNo">586</span> }<a name="line.586"></a>
-<span class="sourceLineNo">587</span> }<a name="line.587"></a>
-<span class="sourceLineNo">588</span> return false;<a name="line.588"></a>
-<span class="sourceLineNo">589</span> }<a name="line.589"></a>
-<span class="sourceLineNo">590</span><a name="line.590"></a>
-<span class="sourceLineNo">591</span> /**<a name="line.591"></a>
-<span class="sourceLineNo">592</span> * Parses a string value from the specified reader.<a name="line.592"></a>
-<span class="sourceLineNo">593</span> *<a name="line.593"></a>
-<span class="sourceLineNo">594</span> * @param session<a name="line.594"></a>
-<span class="sourceLineNo">595</span> * @param r<a name="line.595"></a>
-<span class="sourceLineNo">596</span> * @param isUrlParamValue<a name="line.596"></a>
-<span class="sourceLineNo">597</span> * @return The parsed string.<a name="line.597"></a>
-<span class="sourceLineNo">598</span> * @throws Exception<a name="line.598"></a>
-<span class="sourceLineNo">599</span> */<a name="line.599"></a>
-<span class="sourceLineNo">600</span> protected static String parseString(UonParserSession session, ParserReader r, boolean isUrlParamValue) throws Exception {<a name="line.600"></a>
-<span class="sourceLineNo">601</span><a name="line.601"></a>
-<span class="sourceLineNo">602</span> // If string is of form 'xxx', we're looking for ' at the end.<a name="line.602"></a>
-<span class="sourceLineNo">603</span> // Otherwise, we're looking for ',' or ')' or -1 denoting the end of this string.<a name="line.603"></a>
-<span class="sourceLineNo">604</span><a name="line.604"></a>
-<span class="sourceLineNo">605</span> int c = r.peekSkipWs();<a name="line.605"></a>
-<span class="sourceLineNo">606</span> if (c == '\'')<a name="line.606"></a>
-<span class="sourceLineNo">607</span> return parsePString(session, r);<a name="line.607"></a>
-<span class="sourceLineNo">608</span><a name="line.608"></a>
-<span class="sourceLineNo">609</span> r.mark();<a name="line.609"></a>
-<span class="sourceLineNo">610</span> boolean isInEscape = false;<a name="line.610"></a>
-<span class="sourceLineNo">611</span> String s = null;<a name="line.611"></a>
-<span class="sourceLineNo">612</span> AsciiSet endChars = (isUrlParamValue ? endCharsParam : endCharsNormal);<a name="line.612"></a>
-<span class="sourceLineNo">613</span> while (c != -1) {<a name="line.613"></a>
-<span class="sourceLineNo">614</span> c = r.read();<a name="line.614"></a>
-<span class="sourceLineNo">615</span> if (! isInEscape) {<a name="line.615"></a>
-<span class="sourceLineNo">616</span> // If this is a URL parameter value, we're looking for: &<a name="line.616"></a>
-<span class="sourceLineNo">617</span> // If not, we're looking for: &,)<a name="line.617"></a>
-<span class="sourceLineNo">618</span> if (endChars.contains(c)) {<a name="line.618"></a>
-<span class="sourceLineNo">619</span> r.unread();<a name="line.619"></a>
-<span class="sourceLineNo">620</span> c = -1;<a name="line.620"></a>
-<span class="sourceLineNo">621</span> }<a name="line.621"></a>
-<span class="sourceLineNo">622</span> }<a name="line.622"></a>
-<span class="sourceLineNo">623</span> if (c == -1)<a name="line.623"></a>
-<span class="sourceLineNo">624</span> s = r.getMarked();<a name="line.624"></a>
-<span class="sourceLineNo">625</span> else if (c == EQ)<a name="line.625"></a>
-<span class="sourceLineNo">626</span> r.replace('=');<a name="line.626"></a>
-<span class="sourceLineNo">627</span> else if (Character.isWhitespace(c) && ! isUrlParamValue) {<a name="line.627"></a>
-<span class="sourceLineNo">628</span> s = r.getMarked(0, -1);<a name="line.628"></a>
-<span class="sourceLineNo">629</span> skipSpace(r);<a name="line.629"></a>
-<span class="sourceLineNo">630</span> c = -1;<a name="line.630"></a>
-<span class="sourceLineNo">631</span> }<a name="line.631"></a>
-<span class="sourceLineNo">632</span> isInEscape = isInEscape(c, r, isInEscape);<a name="line.632"></a>
-<span class="sourceLineNo">633</span> }<a name="line.633"></a>
-<span class="sourceLineNo">634</span><a name="line.634"></a>
-<span class="sourceLineNo">635</span> if (isUrlParamValue)<a name="line.635"></a>
-<span class="sourceLineNo">636</span> s = StringUtils.trim(s);<a name="line.636"></a>
-<span class="sourceLineNo">637</span><a name="line.637"></a>
-<span class="sourceLineNo">638</span> return ("null".equals(s) ? null : session.trim(s));<a name="line.638"></a>
-<span class="sourceLineNo">639</span> }<a name="line.639"></a>
+<span class="sourceLineNo">479</span> } else if (state == S4) {<a name="line.479"></a>
+<span class="sourceLineNo">480</span> if (c == ',')<a name="line.480"></a>
+<span class="sourceLineNo">481</span> state = S1;<a name="line.481"></a>
+<span class="sourceLineNo">482</span> else if (c == ')' || c == -1 || c == AMP) {<a name="line.482"></a>
+<span class="sourceLineNo">483</span> return m;<a name="line.483"></a>
+<span class="sourceLineNo">484</span> }<a name="line.484"></a>
+<span class="sourceLineNo">485</span> }<a name="line.485"></a>
+<span class="sourceLineNo">486</span> }<a name="line.486"></a>
+<span class="sourceLineNo">487</span> isInEscape = isInEscape(c, r, isInEscape);<a name="line.487"></a>
+<span class="sourceLineNo">488</span> }<a name="line.488"></a>
+<span class="sourceLineNo">489</span> if (state == S1)<a name="line.489"></a>
+<span class="sourceLineNo">490</span> throw new ParseException(session, "Could not find attribute name on object.");<a name="line.490"></
<TRUNCATED>