From 74757af096e4418d410b3099622ddcdb13e87568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Le=CC=81o=20Testard?= Date: Tue, 26 Nov 2013 16:35:12 +0100 Subject: [PATCH] Forbid keywords as lifetime parameters names. --- src/libsyntax/parse/lexer.rs | 12 +++++++++++- src/test/compile-fail/lifetime-no-keyword.rs | 16 ++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 src/test/compile-fail/lifetime-no-keyword.rs diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs index fa93c5f897711..9c35bb838a326 100644 --- a/src/libsyntax/parse/lexer.rs +++ b/src/libsyntax/parse/lexer.rs @@ -774,7 +774,17 @@ fn next_token_inner(rdr: @mut StringReader) -> token::Token { bump(rdr); } return with_str_from(rdr, start, |lifetime_name| { - token::LIFETIME(str_to_ident(lifetime_name)) + let ident = str_to_ident(lifetime_name); + let tok = &token::IDENT(ident, false); + + if token::is_any_keyword(tok) + && !token::is_keyword(token::keywords::Static, tok) + && !token::is_keyword(token::keywords::Self, tok) { + fatal_span(rdr, start, rdr.last_pos, + ~"invalid lifetime name"); + } + + token::LIFETIME(ident) }) } diff --git a/src/test/compile-fail/lifetime-no-keyword.rs b/src/test/compile-fail/lifetime-no-keyword.rs new file mode 100644 index 0000000000000..593e1dc5e0889 --- /dev/null +++ b/src/test/compile-fail/lifetime-no-keyword.rs @@ -0,0 +1,16 @@ + +// 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +fn foo(a: &'let int) { } //~ ERROR invalid lifetime name +fn bar(a: &'static int) { } +fn baz<'self>(a: &'self int) { } + +fn main() { }