From d4a0e545e7dac8f5b4e07ebaf76e7f91b87f34f3 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Mon, 23 Nov 2015 21:06:51 +0100 Subject: [PATCH 1/3] Print the macro context name on incomplete parse Fixes #22425 Also fixes #30007, since it's just a change from `true` to `false`. --- src/libsyntax/ext/tt/macro_rules.rs | 20 +++++------ .../compile-fail/invalid-macro-matcher.rs | 2 +- src/test/compile-fail/issue-30007.rs | 19 +++++++++++ src/test/compile-fail/macro-context.rs | 33 +++++++++++++++++++ 4 files changed, 63 insertions(+), 11 deletions(-) create mode 100644 src/test/compile-fail/issue-30007.rs create mode 100644 src/test/compile-fail/macro-context.rs diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs index 43647ea4a2e17..516d323b4e5cd 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.rs @@ -44,7 +44,7 @@ impl<'a> ParserAnyMacro<'a> { /// about e.g. the semicolon in `macro_rules! kapow { () => { /// panic!(); } }` doesn't get picked up by .parse_expr(), but it's /// allowed to be there. - fn ensure_complete_parse(&self, allow_semi: bool) { + fn ensure_complete_parse(&self, allow_semi: bool, context: &str) { let mut parser = self.parser.borrow_mut(); if allow_semi && parser.token == token::Semi { panictry!(parser.bump()) @@ -58,8 +58,8 @@ impl<'a> ParserAnyMacro<'a> { parser.span_err(span, &msg[..]); let msg = format!("caused by the macro expansion here; the usage \ - of `{}` is likely invalid in this context", - self.macro_ident); + of `{}!` is likely invalid in this {} context", + self.macro_ident, context); parser.span_note(self.site_span, &msg[..]); } } @@ -68,12 +68,12 @@ impl<'a> ParserAnyMacro<'a> { impl<'a> MacResult for ParserAnyMacro<'a> { fn make_expr(self: Box>) -> Option> { let ret = panictry!(self.parser.borrow_mut().parse_expr()); - self.ensure_complete_parse(true); + self.ensure_complete_parse(true, "expression"); Some(ret) } fn make_pat(self: Box>) -> Option> { let ret = panictry!(self.parser.borrow_mut().parse_pat()); - self.ensure_complete_parse(false); + self.ensure_complete_parse(false, "pattern"); Some(ret) } fn make_items(self: Box>) -> Option>> { @@ -81,7 +81,7 @@ impl<'a> MacResult for ParserAnyMacro<'a> { while let Some(item) = panictry!(self.parser.borrow_mut().parse_item()) { ret.push(item); } - self.ensure_complete_parse(false); + self.ensure_complete_parse(false, "item"); Some(ret) } @@ -95,7 +95,7 @@ impl<'a> MacResult for ParserAnyMacro<'a> { _ => ret.push(panictry!(parser.parse_impl_item())) } } - self.ensure_complete_parse(false); + self.ensure_complete_parse(false, "item"); Some(ret) } @@ -115,13 +115,13 @@ impl<'a> MacResult for ParserAnyMacro<'a> { } } } - self.ensure_complete_parse(false); + self.ensure_complete_parse(false, "statement"); Some(ret) } fn make_ty(self: Box>) -> Option> { let ret = panictry!(self.parser.borrow_mut().parse_ty()); - self.ensure_complete_parse(true); + self.ensure_complete_parse(false, "type"); Some(ret) } } @@ -327,7 +327,7 @@ fn check_lhs_nt_follows(cx: &mut ExtCtxt, lhs: &TokenTree, sp: Span) { tt @ &TokenTree::Sequence(..) => { check_matcher(cx, Some(tt).into_iter(), &Eof); }, - _ => cx.span_err(sp, "Invalid macro matcher; matchers must be contained \ + _ => cx.span_err(sp, "invalid macro matcher; matchers must be contained \ in balanced delimiters or a repetition indicator") }; // we don't abort on errors on rejection, the driver will do that for us diff --git a/src/test/compile-fail/invalid-macro-matcher.rs b/src/test/compile-fail/invalid-macro-matcher.rs index 302bf34ff9916..03bcaab4a9db5 100644 --- a/src/test/compile-fail/invalid-macro-matcher.rs +++ b/src/test/compile-fail/invalid-macro-matcher.rs @@ -9,7 +9,7 @@ // except according to those terms. macro_rules! invalid { - _ => (); //~^ ERROR Invalid macro matcher + _ => (); //~^ ERROR invalid macro matcher } fn main() { diff --git a/src/test/compile-fail/issue-30007.rs b/src/test/compile-fail/issue-30007.rs new file mode 100644 index 0000000000000..95a52cb232a49 --- /dev/null +++ b/src/test/compile-fail/issue-30007.rs @@ -0,0 +1,19 @@ +// Copyright 2015 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![feature(type_macros)] + +macro_rules! t { + () => ( String ; ); //~ ERROR macro expansion ignores token `;` +} + +fn main() { + let i: Vec; //~ NOTE caused by the macro expansion here +} diff --git a/src/test/compile-fail/macro-context.rs b/src/test/compile-fail/macro-context.rs new file mode 100644 index 0000000000000..f6b979395d5dc --- /dev/null +++ b/src/test/compile-fail/macro-context.rs @@ -0,0 +1,33 @@ +// Copyright 2015 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![feature(type_macros)] + +// (typeof used because it's surprisingly hard to find an unparsed token after a stmt) +macro_rules! m { + () => ( i ; typeof ); //~ ERROR `typeof` is a reserved keyword + //~| ERROR macro expansion ignores token `typeof` + //~| ERROR macro expansion ignores token `typeof` + //~| ERROR macro expansion ignores token `;` + //~| ERROR macro expansion ignores token `;` + //~| ERROR macro expansion ignores token `i` +} + +m!(); //~ NOTE the usage of `m!` is likely invalid in this item context + +fn main() { + let a: m!(); //~ NOTE the usage of `m!` is likely invalid in this type context + let i = m!(); //~ NOTE the usage of `m!` is likely invalid in this expression context + match 0 { + m!() => {} //~ NOTE the usage of `m!` is likely invalid in this pattern context + } + + m!(); //~ NOTE the usage of `m!` is likely invalid in this statement context +} From 52d3de7a7e88b519dceda6f6a3e0032ff1800b7b Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Tue, 24 Nov 2015 16:34:48 +0100 Subject: [PATCH 2/3] Remove "this" --- src/libsyntax/ext/tt/macro_rules.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs index 516d323b4e5cd..6569a444830b6 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.rs @@ -58,7 +58,7 @@ impl<'a> ParserAnyMacro<'a> { parser.span_err(span, &msg[..]); let msg = format!("caused by the macro expansion here; the usage \ - of `{}!` is likely invalid in this {} context", + of `{}!` is likely invalid in {} context", self.macro_ident, context); parser.span_note(self.site_span, &msg[..]); } From 5cb5d20bf9f69a393b888564147fa8eb4b524c8f Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Tue, 24 Nov 2015 17:46:10 +0100 Subject: [PATCH 3/3] Fix test failures --- src/test/compile-fail/macro-context.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/compile-fail/macro-context.rs b/src/test/compile-fail/macro-context.rs index f6b979395d5dc..af33dbb972ec1 100644 --- a/src/test/compile-fail/macro-context.rs +++ b/src/test/compile-fail/macro-context.rs @@ -20,14 +20,14 @@ macro_rules! m { //~| ERROR macro expansion ignores token `i` } -m!(); //~ NOTE the usage of `m!` is likely invalid in this item context +m!(); //~ NOTE the usage of `m!` is likely invalid in item context fn main() { - let a: m!(); //~ NOTE the usage of `m!` is likely invalid in this type context - let i = m!(); //~ NOTE the usage of `m!` is likely invalid in this expression context + let a: m!(); //~ NOTE the usage of `m!` is likely invalid in type context + let i = m!(); //~ NOTE the usage of `m!` is likely invalid in expression context match 0 { - m!() => {} //~ NOTE the usage of `m!` is likely invalid in this pattern context + m!() => {} //~ NOTE the usage of `m!` is likely invalid in pattern context } - m!(); //~ NOTE the usage of `m!` is likely invalid in this statement context + m!(); //~ NOTE the usage of `m!` is likely invalid in statement context }