From 0465d5217d7268aed71d1cc99bf025ee1fe748b5 Mon Sep 17 00:00:00 2001
From: Tycho Sci <tychosci@gmail.com>
Date: Wed, 29 Feb 2012 16:14:43 +0900
Subject: [PATCH 1/2] libstd: Skip trailing whitespaces after outer rparen

This makes "{ \"foo\": 1 }\n" and "[ 1 ]\n" valid json string
---
 src/libstd/json.rs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/libstd/json.rs b/src/libstd/json.rs
index d2bbc7dc5e736..891cea9937861 100644
--- a/src/libstd/json.rs
+++ b/src/libstd/json.rs
@@ -392,6 +392,7 @@ impl parser for parser {
 
         if self.ch == ']' {
             self.bump();
+            self.parse_whitespace();
             ret ok(list(values));
         }
 
@@ -406,7 +407,11 @@ impl parser for parser {
 
             alt self.ch {
               ',' { self.bump(); }
-              ']' { self.bump(); ret ok(list(values)); }
+              ']' {
+                  self.bump();
+                  self.parse_whitespace();
+                  ret ok(list(values));
+              }
               _ { ret self.error("expecting ',' or ']'"); }
             }
         }
@@ -422,6 +427,7 @@ impl parser for parser {
 
         if self.ch == '}' {
           self.bump();
+          self.parse_whitespace();
           ret ok(dict(values));
         }
 
@@ -453,7 +459,11 @@ impl parser for parser {
 
             alt self.ch {
               ',' { self.bump(); }
-              '}' { self.bump(); ret ok(dict(values)); }
+              '}' {
+                  self.bump();
+                  self.parse_whitespace();
+                  ret ok(dict(values));
+              }
               _ {
                   if self.eof() { break; }
                   ret self.error("expecting ',' or '}'");
@@ -691,6 +701,7 @@ mod tests {
         assert from_str("[ false ]") == ok(list([boolean(false)]));
         assert from_str("[null]") == ok(list([null]));
         assert from_str("[3, 1]") == ok(list([num(3f), num(1f)]));
+        assert from_str("\n[3, 2]\n") == ok(list([num(3f), num(2f)]));
         assert from_str("[2, [4, 1]]") ==
                ok(list([num(2f), list([num(4f), num(1f)])]));
     }
@@ -727,6 +738,8 @@ mod tests {
 
         assert eq(result::get(from_str("{ \"a\": null, \"b\" : true }")),
                   mk_dict([("a", null), ("b", boolean(true))]));
+        assert eq(result::get(from_str("\n{ \"a\": null, \"b\" : true }\n")),
+                  mk_dict([("a", null), ("b", boolean(true))]));
         assert eq(result::get(from_str("{\"a\" : 1.0 ,\"b\": [ true ]}")),
                   mk_dict([
                       ("a", num(1.0)),

From ecf87c3180898b7792e93fccccdf6a21f2d00508 Mon Sep 17 00:00:00 2001
From: Tycho Sci <tychosci@gmail.com>
Date: Wed, 29 Feb 2012 17:47:17 +0900
Subject: [PATCH 2/2] libstd: Skip trailing whitespaces after JSON value

---
 src/libstd/json.rs | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/libstd/json.rs b/src/libstd/json.rs
index 891cea9937861..d069c36e866c1 100644
--- a/src/libstd/json.rs
+++ b/src/libstd/json.rs
@@ -154,6 +154,8 @@ impl parser for parser {
     fn parse() -> result::t<json, error> {
         alt self.parse_value() {
           ok(value) {
+            // Skip trailing whitespaces.
+            self.parse_whitespace();
             // Make sure there is no trailing characters.
             if self.eof() {
                 ok(value)
@@ -392,7 +394,6 @@ impl parser for parser {
 
         if self.ch == ']' {
             self.bump();
-            self.parse_whitespace();
             ret ok(list(values));
         }
 
@@ -407,11 +408,7 @@ impl parser for parser {
 
             alt self.ch {
               ',' { self.bump(); }
-              ']' {
-                  self.bump();
-                  self.parse_whitespace();
-                  ret ok(list(values));
-              }
+              ']' { self.bump(); ret ok(list(values)); }
               _ { ret self.error("expecting ',' or ']'"); }
             }
         }
@@ -427,7 +424,6 @@ impl parser for parser {
 
         if self.ch == '}' {
           self.bump();
-          self.parse_whitespace();
           ret ok(dict(values));
         }
 
@@ -459,11 +455,7 @@ impl parser for parser {
 
             alt self.ch {
               ',' { self.bump(); }
-              '}' {
-                  self.bump();
-                  self.parse_whitespace();
-                  ret ok(dict(values));
-              }
+              '}' { self.bump(); ret ok(dict(values)); }
               _ {
                   if self.eof() { break; }
                   ret self.error("expecting ',' or '}'");
@@ -637,6 +629,9 @@ mod tests {
         assert from_str("null") == ok(null);
         assert from_str("true") == ok(boolean(true));
         assert from_str("false") == ok(boolean(false));
+        assert from_str(" null ") == ok(null);
+        assert from_str(" true ") == ok(boolean(true));
+        assert from_str(" false ") == ok(boolean(false));
     }
 
     #[test]
@@ -664,6 +659,7 @@ mod tests {
         assert from_str("0.4e5") == ok(num(0.4e5f));
         assert from_str("0.4e+15") == ok(num(0.4e15f));
         assert from_str("0.4e-01") == ok(num(0.4e-01f));
+        assert from_str(" 3 ") == ok(num(3f));
     }
 
     #[test]
@@ -680,6 +676,7 @@ mod tests {
         assert from_str("\"\\n\"") == ok(string("\n"));
         assert from_str("\"\\r\"") == ok(string("\r"));
         assert from_str("\"\\t\"") == ok(string("\t"));
+        assert from_str(" \"foo\" ") == ok(string("foo"));
     }
 
     #[test]