---

yaml
---
r: 2149
b: refs/heads/master
c: 6511d47
h: refs/heads/master
i:
  2147: 97cf83c
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d3a423094c77b25b20afe3a812a67f03080cc3d
+refs/heads/master: 6511d471bafd446026462ce0dba8ef5e2ebf462f

trunk/src/boot/me/trans.ml

@@ -2664,10 +2664,12 @@ let trans_visitor
            nabi_rust (upcall_fixup name) args);
 
   and trans_log_int lev (a:Ast.atom) : unit =
-    trans_void_upcall "upcall_log_int" [| simm (Int64.of_int lev); (trans_atom a) |]
+    trans_void_upcall "upcall_log_int" [| simm (Int64.of_int lev);
+                                          trans_atom a |]
 
   and trans_log_str lev (a:Ast.atom) : unit =
-    trans_void_upcall "upcall_log_str" [| simm (Int64.of_int lev); (trans_atom a) |]
+    trans_void_upcall "upcall_log_str" [| simm (Int64.of_int lev);
+                                          trans_atom a |]
 
   and trans_spawn
       ((*initializing*)_:bool)

trunk/src/comp/driver/rustc.rs

@@ -18,6 +18,7 @@ import std.option.some;
 import std.option.none;
 import std._str;
 import std._vec;
+import std.io;
 
 fn default_environment(session.session sess,
                        str argv0,
@@ -88,26 +89,24 @@ impure fn pretty_print_input(session.session sess,
 }
 
 fn warn_wrong_compiler() {
-    log "This is the rust 'self-hosted' compiler.";
-    log "The one written in rust.";
-    log "It is currently incomplete.";
-    log "You may want rustboot instead, the compiler next door.";
+    io.stdout().write_str("This is the rust 'self-hosted' compiler.
+The one written in rust.
+It is currently incomplete.
+You may want rustboot instead, the compiler next door.\n");
 }
 
 fn usage(session.session sess, str argv0) {
-    log #fmt("usage: %s [options] <input>", argv0);
-    log "options:";
-    log "";
-    log "    -o <filename>      write output to <filename>";
-    log "    -nowarn            suppress wrong-compiler warning";
-    log "    -glue              generate glue.bc file";
-    log "    -shared            compile a shared-library crate";
-    log "    -pp                pretty-print the input instead of compiling";
-    log "    -ls                list the symbols defined by a crate file";
-    log "    -L <path>          add a directory to the library search path";
-    log "    -h                 display this message";
-    log "";
-    log "";
+    io.stdout().write_str(#fmt("usage: %s [options] <input>\n", argv0) + "
+options:
+
+    -o <filename>      write output to <filename>
+    -nowarn            suppress wrong-compiler warning
+    -glue              generate glue.bc file
+    -shared            compile a shared-library crate
+    -pp                pretty-print the input instead of compiling
+    -ls                list the symbols defined by a crate file
+    -L <path>          add a directory to the library search path
+    -h                 display this message\n\n");
 }
 
 fn get_os() -> session.os {

trunk/src/comp/driver/session.rs

@@ -42,16 +42,16 @@ state obj session(ast.crate_num cnum, cfg targ,
     fn span_err(span sp, str msg) {
         auto lo = codemap.lookup_pos(cm, sp.lo);
         auto hi = codemap.lookup_pos(cm, sp.hi);
-        log #fmt("%s:%u:%u:%u:%u: error: %s",
-                 lo.filename,
-                 lo.line, lo.col,
-                 hi.line, hi.col,
-                 msg);
+        log_err #fmt("%s:%u:%u:%u:%u: error: %s",
+                     lo.filename,
+                     lo.line, lo.col,
+                     hi.line, hi.col,
+                     msg);
         fail;
     }
 
     fn err(str msg) {
-        log #fmt("error: %s", msg);
+        log_err #fmt("error: %s", msg);
         fail;
     }
 
@@ -65,31 +65,31 @@ state obj session(ast.crate_num cnum, cfg targ,
     fn span_warn(span sp, str msg) {
         auto lo = codemap.lookup_pos(cm, sp.lo);
         auto hi = codemap.lookup_pos(cm, sp.hi);
-        log #fmt("%s:%u:%u:%u:%u: warning: %s",
-                 lo.filename,
-                 lo.line, lo.col,
-                 hi.line, hi.col,
-                 msg);
+        log_err #fmt("%s:%u:%u:%u:%u: warning: %s",
+                     lo.filename,
+                     lo.line, lo.col,
+                     hi.line, hi.col,
+                     msg);
     }
 
     fn bug(str msg) {
-        log #fmt("error: internal compiler error %s", msg);
+        log_err #fmt("error: internal compiler error %s", msg);
         fail;
     }
 
     fn span_unimpl(span sp, str msg) {
         auto lo = codemap.lookup_pos(cm, sp.lo);
         auto hi = codemap.lookup_pos(cm, sp.hi);
-        log #fmt("%s:%u:%u:%u:%u: error: unimplemented %s",
-                 lo.filename,
-                 lo.line, lo.col,
-                 hi.line, hi.col,
-                 msg);
+        log_err #fmt("%s:%u:%u:%u:%u: error: unimplemented %s",
+                     lo.filename,
+                     lo.line, lo.col,
+                     hi.line, hi.col,
+                     msg);
         fail;
     }
 
     fn unimpl(str msg) {
-        log #fmt("error: unimplemented %s", msg);
+        log_err #fmt("error: unimplemented %s", msg);
         fail;
     }
 

trunk/src/comp/front/codemap.rs

@@ -46,7 +46,7 @@ fn lookup_pos(codemap map, uint pos) -> loc {
             }
         }
     }
-    log #fmt("Failed to find a location for character %u", pos);
+    log_err #fmt("Failed to find a location for character %u", pos);
     fail;
 }
 

trunk/src/comp/front/creader.rs

@@ -67,7 +67,7 @@ fn parse_ty_str(str rep, str_def sd) -> @ty.t {
     auto st = @rec(rep=rep, mutable pos=0u, len=len);
     auto result = parse_ty(st, sd);
     if (st.pos != len) {
-        log "parse_ty_str: incomplete parse, stopped at byte "
+        log_err "parse_ty_str: incomplete parse, stopped at byte "
             + _uint.to_str(st.pos, 10u) + " of "
             + _uint.to_str(len, 10u) + " in str '" + rep + "'";
     }
@@ -242,7 +242,7 @@ fn parse_def_id(vec[u8] buf) -> ast.def_id {
         colon_idx += 1u;
     }
     if (colon_idx == len) {
-        log "didn't find ':' when parsing def id";
+        log_err "didn't find ':' when parsing def id";
         fail;
     }
 
@@ -407,8 +407,8 @@ fn load_crate(session.session sess,
         }
     }
 
-    log #fmt("can't open crate '%s' (looked for '%s' in lib search paths)",
-        ident, filename);
+    log_err #fmt("can't open crate '%s' (looked for '%s' in lib search path)",
+                 ident, filename);
     fail;
 }
 
@@ -459,8 +459,8 @@ fn kind_has_type_params(u8 kind_ch) -> bool {
     else if (kind_ch == ('n' as u8)) { ret false; }
     else if (kind_ch == ('v' as u8)) { ret true;  }
     else {
-        log #fmt("kind_has_type_params(): unknown kind char: %d",
-                 kind_ch as int);
+        log_err #fmt("kind_has_type_params(): unknown kind char: %d",
+                     kind_ch as int);
         fail;
     }
 }
@@ -503,7 +503,7 @@ fn lookup_def(session.session sess, int cnum, vec[ast.ident] path)
         tid = tup(cnum, tid._1);
         def = ast.def_variant(tid, did);
     } else {
-        log #fmt("lookup_def(): unknown kind char: %d", kind_ch as int);
+        log_err #fmt("lookup_def(): unknown kind char: %d", kind_ch as int);
         fail;
     }
 

trunk/src/comp/front/extfmt.rs

@@ -49,7 +49,7 @@ fn expand_syntax_ext(vec[@ast.expr] args,
                      option.t[@ast.expr] body) -> @ast.expr {
 
     if (_vec.len[@ast.expr](args) == 0u) {
-        log "malformed #fmt call";
+        log_err "malformed #fmt call";
         fail;
     }
 
@@ -74,7 +74,7 @@ fn expr_to_str(@ast.expr expr) -> str {
             }
         }
     }
-    log "malformed #fmt call";
+    log_err "malformed #fmt call";
     fail;
 }
 
@@ -214,7 +214,7 @@ fn pieces_to_expr(vec[piece] pieces, vec[@ast.expr] args) -> @ast.expr {
                     ret make_call(sp, count_is_path, count_is_args);
                 }
                 case (_) {
-                    log "not implemented";
+                    log_err "not implemented";
                     fail;
                 }
             }
@@ -302,7 +302,7 @@ fn pieces_to_expr(vec[piece] pieces, vec[@ast.expr] args) -> @ast.expr {
             case (option.none[int]) {
             }
             case (_) {
-                log unsupported;
+                log_err unsupported;
                 fail;
             }
         }
@@ -313,21 +313,21 @@ fn pieces_to_expr(vec[piece] pieces, vec[@ast.expr] args) -> @ast.expr {
                 }
                 case (flag_sign_always) {
                     if (!is_signed_type(cnv)) {
-                        log "+ flag only valid in signed #fmt conversions";
+                        log_err "+ flag only valid in signed #fmt conversion";
                         fail;
                     }
                 }
                 case (flag_space_for_sign) {
                     if (!is_signed_type(cnv)) {
-                        log "space flag only valid in "
+                        log_err "space flag only valid in "
                             + "signed #fmt conversions";
                         fail;
                     }
                 }
                 case (flag_left_zero_pad) {
                 }
                 case (_) {
-                    log unsupported;
+                    log_err unsupported;
                     fail;
                 }
             }
@@ -339,7 +339,7 @@ fn pieces_to_expr(vec[piece] pieces, vec[@ast.expr] args) -> @ast.expr {
             case (count_is(_)) {
             }
             case (_) {
-                log unsupported;
+                log_err unsupported;
                 fail;
             }
         }
@@ -350,7 +350,7 @@ fn pieces_to_expr(vec[piece] pieces, vec[@ast.expr] args) -> @ast.expr {
             case (count_is(_)) {
             }
             case (_) {
-                log unsupported;
+                log_err unsupported;
                 fail;
             }
         }
@@ -382,7 +382,7 @@ fn pieces_to_expr(vec[piece] pieces, vec[@ast.expr] args) -> @ast.expr {
                 ret make_conv_call(arg.span, "uint", cnv, arg);
             }
             case (_) {
-                log unsupported;
+                log_err unsupported;
                 fail;
             }
         }
@@ -492,7 +492,7 @@ fn pieces_to_expr(vec[piece] pieces, vec[@ast.expr] args) -> @ast.expr {
             }
             case (piece_conv(?conv)) {
                 if (n >= _vec.len[@ast.expr](args)) {
-                    log "too many conversions in #fmt string";
+                    log_err "too many conversions in #fmt string";
                     fail;
                 }
 

trunk/src/comp/front/lexer.rs

@@ -321,7 +321,7 @@ impure fn consume_block_comment(reader rdr) {
             }
         }
         if (rdr.is_eof()) {
-            log "unterminated block comment";
+            log_err "unterminated block comment";
             fail;
         }
     }
@@ -359,7 +359,7 @@ impure fn scan_exponent(reader rdr) -> option.t[str] {
             ret(some(res + exponent));
         }
         else {
-            log ("scan_exponent: bad fp literal");
+            log_err ("scan_exponent: bad fp literal");
             fail;
         }
     }
@@ -538,8 +538,7 @@ impure fn scan_numeric_escape(reader rdr) -> char {
         case ('u') { n_hex_digits = 4; }
         case ('U') { n_hex_digits = 8; }
         case (?c) {
-            log "unknown numeric character escape";
-            log c;
+            log_err #fmt("unknown numeric character escape: %d", c as int);
             fail;
         }
     }
@@ -551,8 +550,7 @@ impure fn scan_numeric_escape(reader rdr) -> char {
 
     while (n_hex_digits != 0) {
         if (!is_hex_digit(n)) {
-            log "illegal numeric character escape";
-            log n;
+            log_err #fmt("illegal numeric character escape: %d", n as int);
             fail;
         }
         accum_int *= 16;
@@ -593,7 +591,7 @@ impure fn next_token(reader rdr) -> token.token {
 
         auto rsvd = rdr.get_reserved();
         if (rsvd.contains_key(accum_str)) {
-            log "reserved keyword";
+            log_err #fmt("reserved keyword: %s", accum_str);
             fail;
         }
 
@@ -716,16 +714,16 @@ impure fn next_token(reader rdr) -> token.token {
                     case ('U') { c2 = scan_numeric_escape(rdr); }
 
                     case (?c2) {
-                        log "unknown character escape";
-                        log c2;
+                        log_err #fmt("unknown character escape: %d",
+                                     c2 as int);
                         fail;
                     }
                 }
                 rdr.bump();
             }
 
             if (rdr.next() != '\'') {
-                log "unterminated character constant";
+                log_err "unterminated character constant";
                 fail;
             }
             rdr.bump(); // advance curr to closing '
@@ -776,8 +774,8 @@ impure fn next_token(reader rdr) -> token.token {
                             }
 
                             case (?c2) {
-                                log "unknown string escape";
-                                log c2;
+                                log_err #fmt("unknown string escape: %d",
+                                             c2 as int);
                                 fail;
                             }
                         }
@@ -843,8 +841,7 @@ impure fn next_token(reader rdr) -> token.token {
         }
 
         case (?c) {
-            log "unkown start of token";
-            log c;
+            log_err #fmt("unkown start of token: %d", c as int);
             fail;
         }
     }

trunk/src/comp/lib/llvm.rs

@@ -1400,7 +1400,7 @@ fn type_to_str_inner(type_names names,
         case (13) { ret "Vector"; }
         case (14) { ret "Metadata"; }
         case (_) {
-            log "unknown TypeKind" + util.common.istr(kind as int);
+            log_err #fmt("unknown TypeKind %d", kind as int);
             fail;
         }
     }