squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

rustc: Replace parser's error handling with diagnostic impl

Browse source
This commit is contained in:
Brian Anderson 2012-01-13 17:14:52 -08:00
parent 2e69c29660
commit e90701c546
2 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/comp/driver/driver.rs
View file

@ -452,14 +452,19 @@ fn build_session(sopts: @session::options, input: str) -> session::session {
sopts.target_triple, sopts.target_triple,
sopts.addl_lib_search_paths); sopts.addl_lib_search_paths);
let codemap = codemap::new_codemap(); let codemap = codemap::new_codemap();
let diagnostic_handler = diagnostic::mk_codemap_handler(codemap);
@{targ_cfg: target_cfg, @{targ_cfg: target_cfg,
opts: sopts, opts: sopts,
cstore: cstore, cstore: cstore,
parse_sess: @{cm: codemap, mutable next_id: 1}, parse_sess: @{
cm: codemap,
mutable next_id: 1,
diagnostic: diagnostic_handler
},
codemap: codemap, codemap: codemap,
// For a library crate, this is always none // For a library crate, this is always none
mutable main_fn: none, mutable main_fn: none,
diagnostic: diagnostic::mk_codemap_handler(codemap), diagnostic: diagnostic_handler,
filesearch: filesearch, filesearch: filesearch,
mutable building_library: false, mutable building_library: false,
working_dir: fs::dirname(input)} working_dir: fs::dirname(input)}

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

@ -21,7 +21,11 @@ tag restriction {
tag file_type { CRATE_FILE; SOURCE_FILE; } tag file_type { CRATE_FILE; SOURCE_FILE; }
type parse_sess = @{cm: codemap::codemap, mutable next_id: node_id}; type parse_sess = @{
cm: codemap::codemap,
mutable next_id: node_id,
diagnostic: diagnostic::handler
};
fn next_node_id(sess: parse_sess) -> node_id { fn next_node_id(sess: parse_sess) -> node_id {
let rv = sess.next_id; let rv = sess.next_id;
@ -69,14 +73,13 @@ impl parser for parser {
ret self.buffer[distance - 1u].tok; ret self.buffer[distance - 1u].tok;
} }
fn fatal(m: str) -> ! { fn fatal(m: str) -> ! {
self.span_fatal(self.span, m); self.sess.diagnostic.span_fatal(self.span, m)
} }
fn span_fatal(sp: span, m: str) -> ! { fn span_fatal(sp: span, m: str) -> ! {
diagnostic::emit_error(some((self.sess.cm, sp)), m); self.sess.diagnostic.span_fatal(sp, m)
fail;
} }
fn warn(m: str) { fn warn(m: str) {
diagnostic::emit_warning(some((self.sess.cm, self.span)), m); self.sess.diagnostic.span_warn(self.span, m)
} }
fn get_str(i: token::str_num) -> str { fn get_str(i: token::str_num) -> str {
interner::get(*self.reader.interner, i) interner::get(*self.reader.interner, i)
@ -93,8 +96,7 @@ fn new_parser_from_file(sess: parse_sess, cfg: ast::crate_cfg, path: str,
src src
} }
result::err(e) { result::err(e) {
diagnostic::emit_error(none, e); sess.diagnostic.fatal(e)
fail;
} }
}; };
let filemap = codemap::new_filemap(path, chpos, byte_pos); let filemap = codemap::new_filemap(path, chpos, byte_pos);
@ -2526,8 +2528,7 @@ fn parse_crate_from_file(input: str, cfg: ast::crate_cfg, sess: parse_sess) ->
} else if str::ends_with(input, ".rs") { } else if str::ends_with(input, ".rs") {
parse_crate_from_source_file(input, cfg, sess) parse_crate_from_source_file(input, cfg, sess)
} else { } else {
diagnostic::emit_error(none, "unknown input file type: " + input); sess.diagnostic.fatal("unknown input file type: " + input)
fail
} }
} }