Skip to content

Commit 662de64

Browse files
author
Keegan McAllister
committed
---
yaml --- r: 118029 b: refs/heads/try c: 55776f2 h: refs/heads/master i: 118027: e6a3b76 v: v3
1 parent bca895d commit 662de64

File tree

2 files changed

+21
-8
lines changed

2 files changed

+21
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 3770c42a4959cbabc73da52abc7e3db96657974e
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: d6736a1440d42f6af967a8a20ab8d73522112b72
5-
refs/heads/try: b2f6dd53c95c866e206798976cfcc2f9a9b2fe2a
5+
refs/heads/try: 55776f28221e3da7dd31c2c6c5e05f7a9a31381f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libsyntax/parse/parser.rs

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2911,15 +2911,28 @@ impl<'a> Parser<'a> {
29112911
pat = PatRange(start, end);
29122912
} else if is_plain_ident(&self.token) && !can_be_enum_or_struct {
29132913
let name = self.parse_path(NoTypesAllowed).path;
2914-
let sub;
2915-
if self.eat(&token::AT) {
2916-
// parse foo @ pat
2917-
sub = Some(self.parse_pat());
2914+
if self.eat(&token::NOT) {
2915+
// macro invocation
2916+
let ket = token::close_delimiter_for(&self.token)
2917+
.unwrap_or_else(|| self.fatal("expected open delimiter"));
2918+
self.bump();
2919+
2920+
let tts = self.parse_seq_to_end(&ket,
2921+
seq_sep_none(),
2922+
|p| p.parse_token_tree());
2923+
2924+
let mac = MacInvocTT(name, tts, EMPTY_CTXT);
2925+
pat = ast::PatMac(codemap::Spanned {node: mac, span: self.span});
29182926
} else {
2919-
// or just foo
2920-
sub = None;
2927+
let sub = if self.eat(&token::AT) {
2928+
// parse foo @ pat
2929+
Some(self.parse_pat())
2930+
} else {
2931+
// or just foo
2932+
None
2933+
};
2934+
pat = PatIdent(BindByValue(MutImmutable), name, sub);
29212935
}
2922-
pat = PatIdent(BindByValue(MutImmutable), name, sub);
29232936
} else {
29242937
// parse an enum pat
29252938
let enum_path = self.parse_path(LifetimeAndTypesWithColons)

0 commit comments

Comments
 (0)