bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

syntax: swap from .span_fatal to .span_err in #[deriving(FromPrimitive)]

Browse source
This commit is contained in:
Erick Tryzelaar 2013-09-17 07:45:49 -07:00
parent 0feaccf526
commit 8f8cc061d9
2 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -136,6 +136,7 @@ pub trait AstBuilder {
fn expr_some(&self, sp: Span, expr: @ast::Expr) -> @ast::Expr;
fn expr_none(&self, sp: Span) -> @ast::Expr;
fn expr_fail(&self, span: Span, msg: @str) -> @ast::Expr;
fn expr_unreachable(&self, span: Span) -> @ast::Expr;
fn pat(&self, span: Span, pat: ast::Pat_) -> @ast::Pat;
@ -591,7 +592,7 @@ impl AstBuilder for @ExtCtxt {
self.expr_path(none)
}
fn expr_unreachable(&self, span: Span) -> @ast::Expr {
fn expr_fail(&self, span: Span, msg: @str) -> @ast::Expr {
let loc = self.codemap().lookup_char_pos(span.lo);
self.expr_call_global(
span,
@ -602,12 +603,16 @@ impl AstBuilder for @ExtCtxt {
self.ident_of("fail_with"),
],
~[
self.expr_str(span, @"internal error: entered unreachable code"),
self.expr_str(span, msg),
self.expr_str(span, loc.file.name),
self.expr_uint(span, loc.line),
])
}
fn expr_unreachable(&self, span: Span) -> @ast::Expr {
self.expr_fail(span, @"internal error: entered unreachable code")
}
fn pat(&self, span: Span, pat: ast::Pat_) -> @ast::Pat {
@ast::Pat { id: ast::DUMMY_NODE_ID, node: pat, span: span }