diff options
author | Derek Chen-Beker <dchenbecker@gmail.com> | 2009-08-12 14:25:05 +0000 |
---|---|---|
committer | Derek Chen-Beker <dchenbecker@gmail.com> | 2009-08-12 14:25:05 +0000 |
commit | e5187676e6a58f506e870b7c33bc5ebf8f5089ba (patch) | |
tree | cdd97f2e2ba6d70151e11ac8c3c411dca590bc85 /src | |
parent | dad6fe790174f1b13769227f26bc267a8aa9c23b (diff) | |
download | scala-e5187676e6a58f506e870b7c33bc5ebf8f5089ba.tar.gz scala-e5187676e6a58f506e870b7c33bc5ebf8f5089ba.tar.bz2 scala-e5187676e6a58f506e870b7c33bc5ebf8f5089ba.zip |
Fixed the resolveType method per ticket #2207.
Diffstat (limited to 'src')
-rw-r--r-- | src/library/scala/util/parsing/json/JSON.scala | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/library/scala/util/parsing/json/JSON.scala b/src/library/scala/util/parsing/json/JSON.scala index 75e25062ca..648aa5993a 100644 --- a/src/library/scala/util/parsing/json/JSON.scala +++ b/src/library/scala/util/parsing/json/JSON.scala @@ -74,13 +74,16 @@ object JSON extends Parser { case (key: String, value: List[_]) => objMap = objMap.+[Any](key -> resolveType(value)) true - case (key : String, value : Any) => + case (key : String, value) => objMap += key -> value true case _ => false }) objMap else - input + input.map { + case l : List[_] => resolveType(l) + case x => x + } } /** |