summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2010-09-02 14:57:48 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2010-09-02 14:57:48 +0000
commit95fa7114881187ca083161e08948930929a20dc7 (patch)
tree229fa9ac80fc17ce8faa352f3d422a869f79320e /src/library
parent7c515b34e0aa390d3683959a4da0bc296140abb7 (diff)
downloadscala-95fa7114881187ca083161e08948930929a20dc7.tar.gz
scala-95fa7114881187ca083161e08948930929a20dc7.tar.bz2
scala-95fa7114881187ca083161e08948930929a20dc7.zip
Merged revisions 22648 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r22648 | dchenbecker | 2010-07-29 18:35:18 +0200 (Thu, 29 Jul 2010) | 6 lines Modified toString on JSONObject and JSONArray to print JSON Closes #3605 Relatively minor change to get it working. ........
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/util/parsing/json/Parser.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/util/parsing/json/Parser.scala b/src/library/scala/util/parsing/json/Parser.scala
index e8e7897ca4..ce9c1dd3fe 100644
--- a/src/library/scala/util/parsing/json/Parser.scala
+++ b/src/library/scala/util/parsing/json/Parser.scala
@@ -26,7 +26,7 @@ sealed abstract class JSONType
* @author Derek Chen-Becker <"java"+@+"chen-becker"+"."+"org">
*/
case class JSONObject (obj : Map[Any,Any]) extends JSONType {
- override def toString = "JSONObject(" + obj.map({ case (k,v) => k + " -> " + v }).mkString(", ") + ")"
+ override def toString = "{" + obj.map({ case (k,v) => k + " : " + v }).mkString(", ") + "}"
}
/**
@@ -34,7 +34,7 @@ case class JSONObject (obj : Map[Any,Any]) extends JSONType {
* @author Derek Chen-Becker <"java"+@+"chen-becker"+"."+"org">
*/
case class JSONArray (list : List[Any]) extends JSONType {
- override def toString = "JSONArray(" + list.mkString(", ") + ")"
+ override def toString = "[" + list.mkString(", ") + "]"
}
/**