diff options
| author | Mathias <mathias@spray.cc> | 2011-12-06 13:22:37 +0100 |
|---|---|---|
| committer | Mathias <mathias@spray.cc> | 2011-12-06 13:23:02 +0100 |
| commit | 94b1fba92d40568c642a0b86c719c4bcc0865b54 (patch) | |
| tree | 0c9a278e636426f99435b7e4f155cc2fe03495ff /src/main/scala/cc/spray/json/JsonParser.scala | |
| parent | 701be7bcf0a295c3de272a11e7cfb477db7ed026 (diff) | |
| download | spray-json-94b1fba92d40568c642a0b86c719c4bcc0865b54.tar.gz spray-json-94b1fba92d40568c642a0b86c719c4bcc0865b54.tar.bz2 spray-json-94b1fba92d40568c642a0b86c719c4bcc0865b54.zip | |
Remove JsField, turn JsObject(List[JsField]) into JsObject(Map[String, JsValue])
Diffstat (limited to 'src/main/scala/cc/spray/json/JsonParser.scala')
| -rw-r--r-- | src/main/scala/cc/spray/json/JsonParser.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/cc/spray/json/JsonParser.scala b/src/main/scala/cc/spray/json/JsonParser.scala index b93a9a6..21b1d68 100644 --- a/src/main/scala/cc/spray/json/JsonParser.scala +++ b/src/main/scala/cc/spray/json/JsonParser.scala @@ -31,10 +31,10 @@ object JsonParser extends Parser { def Json = rule { WhiteSpace ~ Value ~ EOI } def JsonObject: Rule1[JsObject] = rule { - "{ " ~ zeroOrMore(Pair, separator = ", ") ~ "} " ~~> (JsObject(_)) + "{ " ~ zeroOrMore(Pair, separator = ", ") ~ "} " ~~> (JsObject(_ :_*)) } - def Pair = rule { JsonStringUnwrapped ~ ": " ~ Value ~~> (JsField(_, _)) } + def Pair = rule { JsonStringUnwrapped ~ ": " ~ Value ~~> ((_, _)) } def Value: Rule1[JsValue] = rule { JsonString | JsonNumber | JsonObject | JsonArray | JsonTrue | JsonFalse | JsonNull |