bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

syntax: allow stmt/expr macro invocations to be delimited by {}.

Browse source 
This makes using control-flow-y macros like `spawn! { ... }` more fluent
and natural.

cc #11892.
This commit is contained in:
Huon Wilson 2014-02-24 00:53:59 +11:00 • committed by Alex Crichton
parent 0309104cc5
commit 6757053cff
5 changed files with 94 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/libsyntax/parse/parser.rs
View file

@ -3185,15 +3185,35 @@ impl Parser {
let pth = self.parse_path(NoTypesAllowed).path;
self.bump();
let id = if self.token == token::LPAREN {
let id = if self.token == token::LPAREN || self.token == token::LBRACE {
token::special_idents::invalid // no special identifier
} else {
self.parse_ident()
};
// check that we're pointing at delimiters (need to check
// again after the `if`, because of `parse_ident`
// consuming more tokens).
let (bra, ket) = match self.token {
token::LPAREN => (token::LPAREN, token::RPAREN),
token::LBRACE => (token::LBRACE, token::RBRACE),
_ => {
// we only expect an ident if we didn't parse one
// above.
let ident_str = if id == token::special_idents::invalid {
"identifier, "
} else {
""
};
let tok_str = self.this_token_to_str();
self.fatal(format!("expected {}`(` or `\\{`, but found `{}`",
ident_str, tok_str))
}
};
let tts = self.parse_unspanned_seq(
&token::LPAREN,
&token::RPAREN,
&bra,
&ket,
seq_sep_none(),
|p| p.parse_token_tree()
);