bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustrt: Make begin_unwind take a single file/line pointer

Browse source 
Smaller text size.
This commit is contained in:
Brian Anderson 2014-07-28 21:26:21 -07:00 • committed by Alex Crichton
parent 571f6cf29a
commit 134946d06e
3 changed files with 57 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libsyntax/ext/build.rs
View file

@ -690,6 +690,13 @@ impl<'a> AstBuilder for ExtCtxt<'a> {
fn expr_fail(&self, span: Span, msg: InternedString) -> Gc<ast::Expr> {
let loc = self.codemap().lookup_char_pos(span.lo);
let expr_file = self.expr_str(span,
token::intern_and_get_ident(loc.file
.name
.as_slice()));
let expr_line = self.expr_uint(span, loc.line);
let expr_file_line_tuple = self.expr_tuple(span, vec!(expr_file, expr_line));
let expr_file_line_ptr = self.expr_addr_of(span, expr_file_line_tuple);
self.expr_call_global(
span,
vec!(
@ -698,11 +705,7 @@ impl<'a> AstBuilder for ExtCtxt<'a> {
self.ident_of("begin_unwind")),
vec!(
self.expr_str(span, msg),
self.expr_str(span,
token::intern_and_get_ident(loc.file
.name
.as_slice())),
self.expr_uint(span, loc.line)))
expr_file_line_ptr))
}
fn expr_unreachable(&self, span: Span) -> Gc<ast::Expr> {