diff options
| author | Graydon Hoare <graydon@mozilla.com> | 2011-12-22 17:53:53 -0800 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2011-12-22 17:53:53 -0800 |
| commit | f0dfbe7b1b8d630488441982cf3d46f82a3a89db (patch) | |
| tree | 8e26605c3d3628cd336e566b8ec7391c058c3a1a /src/comp/syntax/parse | |
| parent | ccb5b6fb259d5de9be751175fc53df1eaea4cd2c (diff) | |
| download | rust-f0dfbe7b1b8d630488441982cf3d46f82a3a89db.tar.gz rust-f0dfbe7b1b8d630488441982cf3d46f82a3a89db.zip | |
Register new snapshots, purge log_err and log_full in favour of log(...).
Diffstat (limited to 'src/comp/syntax/parse')
| -rw-r--r-- | src/comp/syntax/parse/lexer.rs | 6 | ||||
| -rw-r--r-- | src/comp/syntax/parse/parser.rs | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/comp/syntax/parse/lexer.rs b/src/comp/syntax/parse/lexer.rs index 9821f7bdfa9..338c29ddb07 100644 --- a/src/comp/syntax/parse/lexer.rs +++ b/src/comp/syntax/parse/lexer.rs @@ -580,7 +580,7 @@ fn read_line_comments(rdr: reader, code_to_the_left: bool) -> cmnt { let lines: [str] = []; while rdr.curr() == '/' && rdr.next() == '/' { let line = read_one_line_comment(rdr); - log_full(core::debug, line); + log(debug, line); lines += [line]; consume_non_eol_whitespace(rdr); } @@ -603,7 +603,7 @@ fn trim_whitespace_prefix_and_push_line(&lines: [str], s: str, col: uint) { s1 = str::slice(s, col, str::byte_len(s)); } else { s1 = ""; } } else { s1 = s; } - log_full(core::debug, "pushing line: " + s1); + log(debug, "pushing line: " + s1); lines += [s1]; } @@ -707,7 +707,7 @@ fn gather_comments_and_literals(cm: codemap::codemap, path: str, if is_lit(tok.tok) { literals += [{lit: rdr.get_str_from(tok.bpos), pos: tok.chpos}]; } - log_full(core::debug, "tok: " + token::to_str(rdr, tok.tok)); + log(debug, "tok: " + token::to_str(rdr, tok.tok)); first_read = false; } ret {cmnts: comments, lits: literals}; diff --git a/src/comp/syntax/parse/parser.rs b/src/comp/syntax/parse/parser.rs index 209d56a51d0..3f2c11dd821 100644 --- a/src/comp/syntax/parse/parser.rs +++ b/src/comp/syntax/parse/parser.rs @@ -165,8 +165,7 @@ fn bad_expr_word_table() -> hashmap<str, ()> { "cont", "ret", "be", "fail", "type", "resource", "check", "assert", "claim", "native", "fn", "lambda", "pure", "unsafe", "block", "import", "export", "let", "const", - "log", "log_err", "log_full", - "tag", "obj", "copy", "sendfn", "impl"] { + "log", "tag", "obj", "copy", "sendfn", "impl"] { words.insert(word, ()); } words @@ -910,10 +909,7 @@ fn parse_bottom_expr(p: parser) -> @ast::expr { hi = e.span.hi; ex = ast::expr_fail(some(e)); } else { ex = ast::expr_fail(none); } - } else if - (eat_word(p, "log_full") - || eat_word(p, "log") - || eat_word(p, "log_err")) { + } else if eat_word(p, "log") { expect(p, token::LPAREN); let lvl = parse_expr(p); expect(p, token::COMMA); |
