badmanners/maud
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update Rust

Browse source
This commit is contained in:
Chris Wong 2015-07-31 17:33:50 +12:00
parent e66723b80b
commit 6d59013f1b
1 changed files with 9 additions and 9 deletions

18
maud_macros/src/parse.rs
View file

@ -110,12 +110,12 @@ impl<'cx, 'i> Parser<'cx, 'i> {
self.literal(tt, false); self.literal(tt, false);
}, },
// If // If
[dollar!(), ident!(sp, name), ..] if name.as_str() == "if" => { [dollar!(), ident!(sp, name), ..] if name.name == "if" => {
self.shift(2); self.shift(2);
self.if_expr(sp); self.if_expr(sp);
}, },
// For // For
[dollar!(), ident!(sp, name), ..] if name.as_str() == "for" => { [dollar!(), ident!(sp, name), ..] if name.name == "for" => {
self.shift(2); self.shift(2);
self.for_expr(sp); self.for_expr(sp);
}, },
@ -133,7 +133,7 @@ impl<'cx, 'i> Parser<'cx, 'i> {
// Element // Element
[ident!(sp, name), ..] => { [ident!(sp, name), ..] => {
self.shift(1); self.shift(1);
self.element(sp, name.as_str()); self.element(sp, &name.name.as_str());
}, },
// Block // Block
[TtDelimited(_, ref d), ..] if d.delim == token::DelimToken::Brace => { [TtDelimited(_, ref d), ..] if d.delim == token::DelimToken::Brace => {
@ -190,10 +190,10 @@ impl<'cx, 'i> Parser<'cx, 'i> {
}} }}
// Parse the (optional) else // Parse the (optional) else
let else_body = match self.input { let else_body = match self.input {
[dollar!(), ident!(else_), ..] if else_.as_str() == "else" => { [dollar!(), ident!(else_), ..] if else_.name == "else" => {
self.shift(2); self.shift(2);
match self.input { match self.input {
[ident!(sp, if_), ..] if if_.as_str() == "if" => { [ident!(sp, if_), ..] if if_.name == "if" => {
self.shift(1); self.shift(1);
let else_body = { let else_body = {
// Parse an if expression, but capture the result // Parse an if expression, but capture the result
@ -221,7 +221,7 @@ impl<'cx, 'i> Parser<'cx, 'i> {
fn for_expr(&mut self, sp: Span) { fn for_expr(&mut self, sp: Span) {
let mut pattern = vec![]; let mut pattern = vec![];
loop { match self.input { loop { match self.input {
[ident!(in_), ..] if in_.as_str() == "in" => { [ident!(in_), ..] if in_.name == "in" => {
self.shift(1); self.shift(1);
break; break;
}, },
@ -299,7 +299,7 @@ impl<'cx, 'i> Parser<'cx, 'i> {
[ident!(name), eq!(), ..] => { [ident!(name), eq!(), ..] => {
// Non-empty attribute // Non-empty attribute
self.shift(2); self.shift(2);
self.render.attribute_start(name.as_str()); self.render.attribute_start(&name.name.as_str());
{ {
// Parse a value under an attribute context // Parse a value under an attribute context
let mut in_attr = true; let mut in_attr = true;
@ -320,13 +320,13 @@ impl<'cx, 'i> Parser<'cx, 'i> {
let cond = strip_outer_parens(cond).to_tokens(self.render.cx); let cond = strip_outer_parens(cond).to_tokens(self.render.cx);
let body = { let body = {
let mut r = self.render.fork(); let mut r = self.render.fork();
r.attribute_empty(name.as_str()); r.attribute_empty(&name.name.as_str());
r.into_stmts() r.into_stmts()
}; };
self.render.emit_if(cond, body, None); self.render.emit_if(cond, body, None);
} else { } else {
// Write the attribute unconditionally // Write the attribute unconditionally
self.render.attribute_empty(name.as_str()); self.render.attribute_empty(&name.name.as_str());
} }
}, },
_ => return, _ => return,