rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

auto merge of #12338 : edwardw/rust/hygienic-break-continue, r=cmr

Browse Source 
Makes labelled loops hygiene by performing renaming of the labels defined in e.g. `'x: loop { ... }` and then used in break and continue statements within loop body so that they act hygienically when used with macros.
    
Closes #12262.
This commit is contained in:
bors
2014-02-23 15:37:05 -08:00
parent cbed3321f5 386db05df8
commit 329fcd48e5
18 changed files with 262 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libsyntax/ast.rs
View File

@@ -58,8 +58,13 @@ impl Eq for Ident {
// if it should be non-hygienic (most things are), just compare the
// 'name' fields of the idents. Or, even better, replace the idents
// with Name's.
fail!("not allowed to compare these idents: {:?}, {:?}.
Probably related to issue \\#6993", self, other);
//
// On the other hand, if the comparison does need to be hygienic,
// one example and its non-hygienic counterpart would be:
// syntax::parse::token::mtwt_token_eq
// syntax::ext::tt::macro_parser::token_name_eq
fail!("not allowed to compare these idents: {:?}, {:?}. \
Probably related to issue \\#6993", self, other);
}
}
fn ne(&self, other: &Ident) -> bool {
@@ -564,8 +569,8 @@ pub enum Expr_ {
ExprPath(Path),
ExprAddrOf(Mutability, @Expr),
ExprBreak(Option<Name>),
ExprAgain(Option<Name>),
ExprBreak(Option<Ident>),
ExprAgain(Option<Ident>),
ExprRet(Option<@Expr>),
/// Gets the log level for the enclosing module