summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/util/parsing/json/JSON.scala29
1 files changed, 12 insertions, 17 deletions
diff --git a/src/library/scala/util/parsing/json/JSON.scala b/src/library/scala/util/parsing/json/JSON.scala
index 734a8de008..71bf2fbcb3 100644
--- a/src/library/scala/util/parsing/json/JSON.scala
+++ b/src/library/scala/util/parsing/json/JSON.scala
@@ -43,22 +43,17 @@ object JSON extends Parser {
* A utility method to resolve a parsed JSON list into objects or
* arrays. See the parse method for details.
*/
- def resolveType(input: List[Any]): Any =
- input match {
- case jo: List[Any] =>
- var objMap = Map[String, Any]()
-
- if(jo.forall {
- case (key: String, value : List[Any]) =>
- objMap = objMap + key -> resolveType(value)
- true
- case _ => false
- }) objMap
- else {
- jo
- }
+ def resolveType(input: List[Any]): Any = {
+ var objMap = Map[String, Any]()
+
+ if(input.forall {
+ case (key: String, value : List[Any]) =>
+ objMap = objMap + key -> resolveType(value)
+ true
+ case _ => false
+ }) objMap
+ else
+ input
+ }
- case _ @ elem =>
- elem
- }
}