bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

rustc: Extract driver::diagnostic from syntax::codemap

Browse source
This commit is contained in:
Brian Anderson 2012-01-13 16:05:58 -08:00
parent bb1e8d2339
commit ced0aa13d3
7 changed files with 154 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/comp/syntax/parse/parser.rs
View file

@ -10,6 +10,7 @@ import util::interner;
import ast::{node_id, spanned};
import front::attr;
import lexer::reader;
import driver::diagnostic;
tag restriction {
UNRESTRICTED;
@ -71,11 +72,11 @@ impl parser for parser {
self.span_fatal(self.span, m);
}
fn span_fatal(sp: span, m: str) -> ! {
codemap::emit_error(some((self.sess.cm, sp)), m);
diagnostic::emit_error(some((self.sess.cm, sp)), m);
fail;
}
fn warn(m: str) {
codemap::emit_warning(some((self.sess.cm, self.span)), m);
diagnostic::emit_warning(some((self.sess.cm, self.span)), m);
}
fn get_str(i: token::str_num) -> str {
interner::get(*self.reader.interner, i)
@ -92,7 +93,7 @@ fn new_parser_from_file(sess: parse_sess, cfg: ast::crate_cfg, path: str,
src
}
result::err(e) {
codemap::emit_error(none, e);
diagnostic::emit_error(none, e);
fail;
}
};
@ -2525,7 +2526,7 @@ fn parse_crate_from_file(input: str, cfg: ast::crate_cfg, sess: parse_sess) ->
} else if str::ends_with(input, ".rs") {
parse_crate_from_source_file(input, cfg, sess)
} else {
codemap::emit_error(none, "unknown input file type: " + input);
diagnostic::emit_error(none, "unknown input file type: " + input);
fail
}
}