From 03a51019a40c1c5e2ab1635f993fc71517d1edc2 Mon Sep 17 00:00:00 2001 From: Michael Hewson Date: Wed, 10 May 2017 00:30:47 +0000 Subject: Resurrecting #33135 Started rebasing @sgrif's PR #33135 off of current master. (Well, actually merging it into a new branch based off current master.) The following files still need to be fixed or at least reviewed: - `src/libsyntax/ext/tt/macro_parser.rs`: calls `Parser::parse_lifetime`, which doesn't exist anymore - `src/libsyntax/parse/parser.rs`: @sgrif added an error message to `Parser::parse_lifetime`. Code has since been refactored, so I just took it out for now. - `src/libsyntax/ext/tt/transcribe.rs`: This code has been refactored bigtime. Not sure whether @sgrif's changes here are still necessary. Took it out for this commit. --- src/libsyntax/parse/token.rs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 05368c52d2c..a5766f5601a 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -524,6 +524,7 @@ pub enum Nonterminal { NtGenerics(ast::Generics), NtWhereClause(ast::WhereClause), NtArg(ast::Arg), + NtLifetime(ast::Lifetime), } impl fmt::Debug for Nonterminal { @@ -546,6 +547,7 @@ impl fmt::Debug for Nonterminal { NtWhereClause(..) => f.pad("NtWhereClause(..)"), NtArg(..) => f.pad("NtArg(..)"), NtVis(..) => f.pad("NtVis(..)"), + NtLifetime(..) => f.pad("NtLifetime(..)"), } } } -- cgit 1.4.1-3-g733a5 From e12b87096a9c1856db9874c3af0bc64423b5477a Mon Sep 17 00:00:00 2001 From: Michael Hewson Date: Thu, 11 May 2017 22:59:48 +0000 Subject: replace parse_lifetime with expect_lifetime made `parser::Parser::expect_lifetime` public, so it can be called from `macro_parser::parse_nt` --- src/libsyntax/ext/tt/macro_parser.rs | 2 +- src/libsyntax/parse/parser.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index 91074ec4734..124477620c2 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -603,7 +603,7 @@ fn parse_nt<'a>(p: &mut Parser<'a>, sp: Span, name: &str) -> Nonterminal { "path" => token::NtPath(panictry!(p.parse_path_common(PathStyle::Type, false))), "meta" => token::NtMeta(panictry!(p.parse_meta_item())), "vis" => token::NtVis(panictry!(p.parse_visibility(true))), - "lifetime" => token::NtLifetime(panictry!(p.parse_lifetime())), + "lifetime" => token::NtLifetime(p.expect_lifetime()), // this is not supposed to happen, since it has been checked // when compiling the macro. _ => p.span_bug(sp, "invalid fragment specifier") diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index a4aad81f5f5..29f0e2a0fee 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2031,7 +2031,7 @@ impl<'a> Parser<'a> { } /// Parse single lifetime 'a or panic. - fn expect_lifetime(&mut self) -> Lifetime { + pub fn expect_lifetime(&mut self) -> Lifetime { match self.token { token::Lifetime(ident) => { let ident_span = self.span; -- cgit 1.4.1-3-g733a5 From ce76b1a1f396dd27e8c73bd59333aef42308920b Mon Sep 17 00:00:00 2001 From: Matt Peterson Date: Wed, 20 Dec 2017 17:22:37 -0500 Subject: Fix tests --- src/libsyntax/parse/parser.rs | 24 +++++++++++++++++------- src/libsyntax/parse/token.rs | 12 ++++++++++-- 2 files changed, 27 insertions(+), 9 deletions(-) (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 29f0e2a0fee..8aa03e007e4 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1295,6 +1295,10 @@ impl<'a> Parser<'a> { fn get_label(&mut self) -> ast::Ident { match self.token { token::Lifetime(ref ident) => *ident, + token::Interpolated(ref nt) => match nt.0 { + token::NtLifetime(lifetime) => lifetime.ident, + _ => self.bug("not a lifetime"), + }, _ => self.bug("not a lifetime"), } } @@ -2032,14 +2036,20 @@ impl<'a> Parser<'a> { /// Parse single lifetime 'a or panic. pub fn expect_lifetime(&mut self) -> Lifetime { - match self.token { - token::Lifetime(ident) => { - let ident_span = self.span; - self.bump(); - Lifetime { ident: ident, span: ident_span, id: ast::DUMMY_NODE_ID } + let lifetime = match self.token { + token::Lifetime(ident) => + Lifetime { ident: ident, span: self.span, id: ast::DUMMY_NODE_ID }, + token::Interpolated(ref nt) => match nt.0 { + token::NtLifetime(lifetime) => + lifetime, + //Lifetime { ident: lifetime.ident, span: lifetime.span, id: ast::DUMMY_NODE_ID }, + _ => self.span_bug(self.span, &format!("not a lifetime: {:?}", self.token)) } - _ => self.span_bug(self.span, "not a lifetime") - } + _ => self.span_bug(self.span, &format!("not a lifetime: {:?}", self.token)) + }; + + self.bump(); + lifetime } /// Parse mutability (`mut` or nothing). diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index a5766f5601a..2d7ab938f7b 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -251,7 +251,7 @@ impl Token { Lt | BinOp(Shl) | // associated path ModSep => true, // global path Interpolated(ref nt) => match nt.0 { - NtIdent(..) | NtTy(..) | NtPath(..) => true, + NtIdent(..) | NtTy(..) | NtPath(..) | NtLifetime(..) => true, _ => false, }, _ => false, @@ -318,7 +318,11 @@ impl Token { pub fn is_lifetime(&self) -> bool { match *self { Lifetime(..) => true, - _ => false, + Interpolated(ref nt) => match nt.0 { + NtLifetime(..) => true, + _ => false, + }, + _ => false, } } @@ -486,6 +490,10 @@ impl Token { let token = Token::Ident(ident.node); tokens = Some(TokenTree::Token(ident.span, token).into()); } + Nonterminal::NtLifetime(lifetime) => { + let token = Token::Lifetime(lifetime.ident); + tokens = Some(TokenTree::Token(lifetime.span, token).into()); + } Nonterminal::NtTT(ref tt) => { tokens = Some(tt.clone().into()); } -- cgit 1.4.1-3-g733a5 From e838cfce03caf9394fb71c909ab9e1afa8bae282 Mon Sep 17 00:00:00 2001 From: Matt Peterson Date: Thu, 21 Dec 2017 08:45:44 -0500 Subject: Cleanup --- src/libsyntax/parse/parser.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 8aa03e007e4..7251af77dcc 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2040,12 +2040,11 @@ impl<'a> Parser<'a> { token::Lifetime(ident) => Lifetime { ident: ident, span: self.span, id: ast::DUMMY_NODE_ID }, token::Interpolated(ref nt) => match nt.0 { - token::NtLifetime(lifetime) => + token::NtLifetime(lifetime) => lifetime, - //Lifetime { ident: lifetime.ident, span: lifetime.span, id: ast::DUMMY_NODE_ID }, - _ => self.span_bug(self.span, &format!("not a lifetime: {:?}", self.token)) + _ => self.span_bug(self.span, "not a lifetime") } - _ => self.span_bug(self.span, &format!("not a lifetime: {:?}", self.token)) + _ => self.span_bug(self.span, "not a lifetime") }; self.bump(); -- cgit 1.4.1-3-g733a5 From 8b4bdc2f3f753e0d0b00ecc892a813e9786621e9 Mon Sep 17 00:00:00 2001 From: Matt Peterson Date: Sat, 30 Dec 2017 21:47:45 -0500 Subject: refactor lifetime out of is_lifetime --- src/libsyntax/parse/parser.rs | 19 ++++++------------- src/libsyntax/parse/token.rs | 20 ++++++++++++++------ 2 files changed, 20 insertions(+), 19 deletions(-) (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 7251af77dcc..eae558f002a 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2036,19 +2036,12 @@ impl<'a> Parser<'a> { /// Parse single lifetime 'a or panic. pub fn expect_lifetime(&mut self) -> Lifetime { - let lifetime = match self.token { - token::Lifetime(ident) => - Lifetime { ident: ident, span: self.span, id: ast::DUMMY_NODE_ID }, - token::Interpolated(ref nt) => match nt.0 { - token::NtLifetime(lifetime) => - lifetime, - _ => self.span_bug(self.span, "not a lifetime") - } - _ => self.span_bug(self.span, "not a lifetime") - }; - - self.bump(); - lifetime + if let Some(lifetime) = self.token.lifetime(self.span) { + self.bump(); + lifetime + } else { + self.span_bug(self.span, "not a lifetime") + } } /// Parse mutability (`mut` or nothing). diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 2d7ab938f7b..bd4f7f9853d 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -314,18 +314,26 @@ impl Token { false } - /// Returns `true` if the token is a lifetime. - pub fn is_lifetime(&self) -> bool { + /// Returns a lifetime with the span and a dummy id if it is a lifetime, + /// or the original lifetime if it is an interpolated lifetime, ignoring + /// the span. + pub fn lifetime(&self, span: Span) -> Option { match *self { - Lifetime(..) => true, + Lifetime(ident) => + Some(ast::Lifetime { ident: ident, span: span, id: ast::DUMMY_NODE_ID }), Interpolated(ref nt) => match nt.0 { - NtLifetime(..) => true, - _ => false, + NtLifetime(lifetime) => Some(lifetime), + _ => None, }, - _ => false, + _ => None, } } + /// Returns `true` if the token is a lifetime. + pub fn is_lifetime(&self) -> bool { + self.lifetime(syntax_pos::DUMMY_SP).is_some() + } + /// Returns `true` if the token is either the `mut` or `const` keyword. pub fn is_mutability(&self) -> bool { self.is_keyword(keywords::Mut) || -- cgit 1.4.1-3-g733a5