---

yaml
---
r: 6912
b: refs/heads/master
c: 6f5a0a3
h: refs/heads/master
v: v3

Author: Lenny222

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8005f0c564311fe2a3c0a72a5f3d4482ad0947e2
+refs/heads/master: 6f5a0a3b3ba6fc444ce722049cadcfb26a96dc35

trunk/src/comp/syntax/parse/parser.rs

@@ -910,13 +910,10 @@ fn parse_bottom_expr(p: parser) -> @ast::expr {
             ex = ast::expr_fail(some(e));
         } else { ex = ast::expr_fail(none); }
     } else if eat_word(p, "log_full") {
-        expect(p, token::LPAREN);
         let lvl = parse_expr(p);
-        expect(p, token::COMMA);
         let e = parse_expr(p);
         ex = ast::expr_log(2, lvl, e);
-        hi = p.get_hi_pos();
-        expect(p, token::RPAREN);
+        hi = e.span.hi;
     } else if eat_word(p, "log") {
         let e = parse_expr(p);
         ex = ast::expr_log(1, mk_lit_u32(p, 1u32), e);

trunk/src/comp/syntax/print/pprust.rs

@@ -919,12 +919,8 @@ fn print_expr(s: ps, &&expr: @ast::expr) {
           0 { word_nbsp(s, "log_err"); print_expr(s, expr); }
           2 {
             word_nbsp(s, "log_full");
-            popen(s);
+            word(s.s, " ");
             print_expr(s, lexp);
-            word(s.s, ",");
-            space_if_not_bol(s);
-            print_expr(s, expr);
-            pclose(s);
           }
         }
       }

trunk/src/libstd/json.rs

@@ -34,6 +34,8 @@ tag json {
     list(@[json]);
     /* Variant: dict */
     dict(map::hashmap<str,json>);
+    /* Variant: null */
+    null;
 }
 
 /*
@@ -233,6 +235,14 @@ fn from_str_bool(s: str) -> (option::t<json>, str) {
     }
 }
 
+fn from_str_null(s: str) -> (option::t<json>, str) {
+    if (str::starts_with(s, "null")) {
+        (some(null), str::slice(s, 4u, str::byte_len(s)))
+    } else {
+        (none, s)
+    }
+}
+
 fn from_str_helper(s: str) -> (option::t<json>, str) {
     let s = str::trim_left(s);
     if str::is_empty(s) { ret (none, s); }
@@ -243,6 +253,7 @@ fn from_str_helper(s: str) -> (option::t<json>, str) {
         '{' { from_str_dict(s) }
         '0' to '9' | '-' | '+' | '.' { from_str_float(s) }
         't' | 'f' { from_str_bool(s) }
+        'n' { from_str_null(s) }
         _ { ret (none, s); }
     }
 }

trunk/src/snapshots.txt

@@ -1,9 +1,9 @@
-S 2011-12-21 047b02d
-  winnt-i386 cf6ed4fed5b07357cea5865ff91a9c4a0377a2f0
-  linux-i386 6f6e329199d4e3e3ce2e9dc595fe6f4334e00684
-  macos-i386 d125f065125bf0f3186d88afd58a1e471fe830a3
-  linux-x86_64 c3315c5c679648bcfdf65910f427a37982918b09
-  macos-x86_64 bab127bc6c383889d482c99e771be5e80405d7c9
+S 2011-12-21 5d1cf2a
+  winnt-i386 5ea4aceb8d40e2987f12c9fc808ef9f3023b8dad
+  linux-i386 3324be923f2b170b3e426423583a190d666c6da0
+  macos-i386 c29af3d5e05c9b01a9878859727978a9d9951a2b
+  linux-x86_64 5ea63b6550d6fef9a70244e6052c9405b6ef6b11
+  macos-x86_64 ece4fd073ca816a5be8dbcd2f132f96340d2cf85
 
 S 2011-12-19 edf6e1e
   winnt-i386 7a358117e123ad3d16fa66106819ec0daf5a6aba

trunk/src/test/stdtest/json.rs

@@ -5,6 +5,11 @@ import option;
 import std::json::*;
 import option::{none, some};
 
+#[test]
+fn test_from_str_null() {
+    assert(from_str("null") == some(null));
+}
+
 #[test]
 fn test_from_str_num() {
     assert(from_str("3") == some(num(3f)));
@@ -31,6 +36,7 @@ fn test_from_str_bool() {
 fn test_from_str_list() {
     assert(from_str("[]") == some(list(@[])));
     assert(from_str("[true]") == some(list(@[boolean(true)])));
+    assert(from_str("[null]") == some(list(@[null])));
     assert(from_str("[3, 1]") == some(list(@[num(3f), num(1f)])));
     assert(from_str("[2, [4, 1]]") ==
         some(list(@[num(2f), list(@[num(4f), num(1f)])])));
@@ -44,6 +50,7 @@ fn test_from_str_list() {
 fn test_from_str_dict() {
     assert(from_str("{}") != none);
     assert(from_str("{\"a\": 3}") != none);
+    assert(from_str("{\"a\": null}") != none);
     assert(from_str("{\"a\": }") == none);
     assert(from_str("{\"a\" }") == none);
     assert(from_str("{\"a\"") == none);