syntax: indicate an error when a macro ignores trailing tokens.
That is, only a single expression or item gets parsed, so if there are any extra tokens (e.g. the start of another item/expression) the user should be told, rather than silently dropping them. An example: macro_rules! foo { () => { println("hi"); println("bye); } } would expand to just `println("hi")`, which is almost certainly not what the programmer wanted. Fixes #8012.
This commit is contained in:
parent
bbbafc4e46
commit
8284df9e7c
3 changed files with 56 additions and 5 deletions
|
@ -39,7 +39,7 @@ pub fn expand_deriving_eq(cx: @ExtCtxt,
|
|||
ret_ty: Literal(Path::new(~["bool"])),
|
||||
const_nonmatching: true,
|
||||
combine_substructure: $f
|
||||
},
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
|
|
|
@ -21,22 +21,47 @@ use ext::tt::macro_parser::{parse, parse_or_else, success, failure};
|
|||
use parse::lexer::{new_tt_reader, reader};
|
||||
use parse::parser::Parser;
|
||||
use parse::token::{get_ident_interner, special_idents, gensym_ident, ident_to_str};
|
||||
use parse::token::{FAT_ARROW, SEMI, nt_matchers, nt_tt};
|
||||
use parse::token::{FAT_ARROW, SEMI, nt_matchers, nt_tt, EOF};
|
||||
use print;
|
||||
|
||||
struct ParserAnyMacro {
|
||||
parser: @Parser,
|
||||
}
|
||||
|
||||
impl ParserAnyMacro {
|
||||
/// Make sure we don't have any tokens left to parse, so we don't
|
||||
/// silently drop anything. `allow_semi` is so that "optional"
|
||||
/// semilons at the end of normal expressions aren't complained
|
||||
/// about e.g. the semicolon in `macro_rules! kapow( () => {
|
||||
/// fail!(); } )` doesn't get picked up by .parse_expr(), but it's
|
||||
/// allowed to be there.
|
||||
fn ensure_complete_parse(&self, allow_semi: bool) {
|
||||
if allow_semi && *self.parser.token == SEMI {
|
||||
self.parser.bump()
|
||||
}
|
||||
if *self.parser.token != EOF {
|
||||
let msg = format!("macro expansion ignores token `{}` and any following",
|
||||
self.parser.this_token_to_str());
|
||||
self.parser.span_err(*self.parser.span, msg);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl AnyMacro for ParserAnyMacro {
|
||||
fn make_expr(&self) -> @ast::Expr {
|
||||
self.parser.parse_expr()
|
||||
let ret = self.parser.parse_expr();
|
||||
self.ensure_complete_parse(true);
|
||||
ret
|
||||
}
|
||||
fn make_item(&self) -> Option<@ast::item> {
|
||||
self.parser.parse_item(~[]) // no attrs
|
||||
let ret = self.parser.parse_item(~[]); // no attrs
|
||||
self.ensure_complete_parse(false);
|
||||
ret
|
||||
}
|
||||
fn make_stmt(&self) -> @ast::Stmt {
|
||||
self.parser.parse_stmt(~[]) // no attrs
|
||||
let ret = self.parser.parse_stmt(~[]); // no attrs
|
||||
self.ensure_complete_parse(true);
|
||||
ret
|
||||
}
|
||||
}
|
||||
|
||||
|
|
26
src/test/compile-fail/macro-incomplete-parse.rs
Normal file
26
src/test/compile-fail/macro-incomplete-parse.rs
Normal file
|
@ -0,0 +1,26 @@
|
|||
// Copyright 2013 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 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
macro_rules! ignored_item {
|
||||
() => {
|
||||
fn foo() {}
|
||||
fn bar() {} //~ ERROR macro expansion ignores token `fn`
|
||||
}
|
||||
}
|
||||
|
||||
macro_rules! ignored_expr {
|
||||
() => ( 1, 2 ) //~ ERROR macro expansion ignores token `,`
|
||||
}
|
||||
|
||||
ignored_item!()
|
||||
|
||||
fn main() {
|
||||
ignored_expr!()
|
||||
}
|
Loading…
Add table
Reference in a new issue