bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Revert previous 6 commits. Hopefully put out Windows fire.

Browse source 
Revert "rustc: Export only what's needed from middle::ty"

This reverts commit 4255d58aa5.

Revert "rustc: Make name resolution errors less fatal"

This reverts commit b8ab9ea89c.

Revert "rustc: Make import resolution errors less fatal"

This reverts commit 92a8ae94b9.

Revert "rustc: Export only what's used from middle::resolve"

This reverts commit 4539a2cf7a.

Revert "rustc: Re-introduce session.span_err, session.err"

This reverts commit 7fe9a88e31.

Revert "rustc: Rename session.span_err -> span_fatal, err -> fatal"

This reverts commit c394a7f49a.
This commit is contained in:
Brian Anderson 2011-06-19 03:24:42 -07:00
parent 4255d58aa5
commit cf9ed08a50
16 changed files with 191 additions and 449 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/comp/front/parser.rs
View file

@ -78,7 +78,7 @@ fn new_parser(session::session sess, eval::env env, ast::def_id initial_def,
lo = rdr.get_mark_chpos();
hi = rdr.get_chpos();
}
fn err(str m) -> ! { sess.span_fatal(rec(lo=lo, hi=hi), m); }
fn err(str m) -> ! { sess.span_err(rec(lo=lo, hi=hi), m); }
fn restrict(restriction r) { res = r; }
fn get_restriction() -> restriction { ret res; }
fn get_session() -> session::session { ret sess; }
@ -353,7 +353,7 @@ fn parse_ty_field(&parser p) -> ast::ty_field {
fn ident_index(&parser p, &vec[ast::arg] args, &ast::ident i) -> uint {
auto j = 0u;
for (ast::arg a in args) { if (a.ident == i) { ret j; } j += 1u; }
p.get_session().span_fatal(p.get_span(),
p.get_session().span_err(p.get_span(),
"Unbound variable " + i + " in constraint arg");
}