---

yaml
---
r: 29990
b: refs/heads/incoming
c: 0a5f88a
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 73ffc7e7005142c5a2d898fcb2aa39018efe07fb
+refs/heads/incoming: 0a5f88a2406bf78a216ea8e2128441766dd7cd9c
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libsyntax/ast.rs

@@ -309,6 +309,10 @@ enum blk_check_mode { default_blk, unchecked_blk, unsafe_blk, }
 type expr = {id: node_id, callee_id: node_id, node: expr_, span: span};
 // Extra node ID is only used for index, assign_op, unary, binary
 
+#[auto_serialize]
+enum log_level { error, debug, other }
+// 0 = error, 1 = debug, 2 = other
+
 #[auto_serialize]
 enum alt_mode { alt_check, alt_exhaustive, }
 
@@ -354,7 +358,7 @@ enum expr_ {
     expr_break(option<ident>),
     expr_again(option<ident>),
     expr_ret(option<@expr>),
-    expr_log(int, @expr, @expr),
+    expr_log(log_level, @expr, @expr),
 
     /* just an assert */
     expr_assert(@expr),

branches/incoming/src/libsyntax/parse/parser.rs

@@ -947,7 +947,7 @@ struct parser {
             let lvl = self.parse_expr();
             self.expect(token::COMMA);
             let e = self.parse_expr();
-            ex = expr_log(2, lvl, e);
+            ex = expr_log(ast::other, lvl, e);
             hi = self.span.hi;
             self.expect(token::RPAREN);
         } else if self.eat_keyword(~"assert") {

branches/incoming/src/libsyntax/print/pprust.rs

@@ -1309,10 +1309,10 @@ fn print_expr(s: ps, &&expr: @ast::expr) {
         }
       }
       ast::expr_log(lvl, lexp, expr) => {
-        match check lvl {
-          1 => { word_nbsp(s, ~"log"); print_expr(s, expr); }
-          0 => { word_nbsp(s, ~"log_err"); print_expr(s, expr); }
-          2 => {
+        match lvl {
+          ast::debug => { word_nbsp(s, ~"log"); print_expr(s, expr); }
+          ast::error => { word_nbsp(s, ~"log_err"); print_expr(s, expr); }
+          ast::other => {
             word_nbsp(s, ~"log");
             popen(s);
             print_expr(s, lexp);