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 2016-04-27 12:10:37 +12:00
parent 8492259638
commit 00ec443326
2 changed files with 11 additions and 11 deletions
maud_macros/src
lib.rsparse.rs

2
maud_macros/src/lib.rs
View file

@ -32,7 +32,7 @@ fn html_utf8(cx: &mut ExtCtxt, sp: Span, mac_name: &str, args: &[TokenTree]) ->
let io_write = io_write.to_vec(); let io_write = io_write.to_vec();
let fmt_write = token::gensym_ident("__maud_utf8_writer"); let fmt_write = token::gensym_ident("__maud_utf8_writer");
let fmt_write = vec![ let fmt_write = vec![
TokenTree::Token(DUMMY_SP, token::Ident(fmt_write, token::IdentStyle::Plain))]; TokenTree::Token(DUMMY_SP, token::Ident(fmt_write))];
let expr = parse::parse(cx, sp, &fmt_write, input)?; let expr = parse::parse(cx, sp, &fmt_write, input)?;
Ok(quote_expr!(cx, Ok(quote_expr!(cx,
match ::maud::Utf8Writer::new(&mut $io_write) { match ::maud::Utf8Writer::new(&mut $io_write) {

20
maud_macros/src/parse.rs
View file

@ -7,8 +7,8 @@ use syntax::errors::{DiagnosticBuilder, FatalError};
use syntax::ext::base::ExtCtxt; use syntax::ext::base::ExtCtxt;
use syntax::parse; use syntax::parse;
use syntax::parse::parser::Parser as RustParser; use syntax::parse::parser::Parser as RustParser;
use syntax::parse::token::{BinOpToken, DelimToken, IdentStyle, Token, Lit as LitToken}; use syntax::parse::token::{BinOpToken, DelimToken, Token, Lit as LitToken};
use syntax::parse::token::keywords::Keyword; use syntax::parse::token::keywords;
use syntax::ptr::P; use syntax::ptr::P;
use super::render::Renderer; use super::render::Renderer;
@ -67,10 +67,10 @@ macro_rules! integer {
() => (TokenTree::Token(_, Token::Literal(LitToken::Integer(_), _))) () => (TokenTree::Token(_, Token::Literal(LitToken::Integer(_), _)))
} }
macro_rules! ident { macro_rules! ident {
($sp:pat, $x:pat) => (TokenTree::Token($sp, Token::Ident($x, IdentStyle::Plain))) ($sp:pat, $x:pat) => (TokenTree::Token($sp, Token::Ident($x)))
} }
macro_rules! substnt { macro_rules! substnt {
($sp:pat, $x:pat) => (TokenTree::Token($sp, Token::SubstNt($x, IdentStyle::Plain))) ($sp:pat, $x:pat) => (TokenTree::Token($sp, Token::SubstNt($x)))
} }
macro_rules! keyword { macro_rules! keyword {
($sp:pat, $x:ident) => (TokenTree::Token($sp, ref $x @ Token::Ident(..))) ($sp:pat, $x:ident) => (TokenTree::Token($sp, ref $x @ Token::Ident(..)))
@ -163,17 +163,17 @@ impl<'cx, 'i> Parser<'cx, 'i> {
self.literal(tt, false)?; self.literal(tt, false)?;
}, },
// If // If
[at!(), keyword!(sp, k), ..] if k.is_keyword(Keyword::If) => { [at!(), keyword!(sp, k), ..] if k.is_keyword(keywords::If) => {
self.shift(2); self.shift(2);
self.if_expr(sp)?; self.if_expr(sp)?;
}, },
// For // For
[at!(), keyword!(sp, k), ..] if k.is_keyword(Keyword::For) => { [at!(), keyword!(sp, k), ..] if k.is_keyword(keywords::For) => {
self.shift(2); self.shift(2);
self.for_expr(sp)?; self.for_expr(sp)?;
}, },
// Match // Match
[at!(), keyword!(sp, k), ..] if k.is_keyword(Keyword::Match) => { [at!(), keyword!(sp, k), ..] if k.is_keyword(keywords::Match) => {
self.shift(2); self.shift(2);
self.match_expr(sp)?; self.match_expr(sp)?;
}, },
@ -247,10 +247,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 {
[at!(), keyword!(_, k), ..] if k.is_keyword(Keyword::Else) => { [at!(), keyword!(_, k), ..] if k.is_keyword(keywords::Else) => {
self.shift(2); self.shift(2);
match self.input { match self.input {
[keyword!(sp, k), ..] if k.is_keyword(Keyword::If) => { [keyword!(sp, k), ..] if k.is_keyword(keywords::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
@ -282,7 +282,7 @@ impl<'cx, 'i> Parser<'cx, 'i> {
fn for_expr(&mut self, sp: Span) -> PResult<()> { fn for_expr(&mut self, sp: Span) -> PResult<()> {
let mut pattern = vec![]; let mut pattern = vec![];
loop { match self.input { loop { match self.input {
[keyword!(_, k), ..] if k.is_keyword(Keyword::In) => { [keyword!(_, k), ..] if k.is_keyword(keywords::In) => {
self.shift(1); self.shift(1);
break; break;
}, },