From 52fa187431b4209a4e8606790287eaf08741ef25 Mon Sep 17 00:00:00 2001 From: defuz Date: Thu, 22 Jan 2015 21:56:27 +0200 Subject: FIX #21475: Interval match patterns won't parse namespace specifiers correctly --- src/libsyntax/parse/parser.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index f171e8279f4..1ef62cdf315 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -3539,6 +3539,19 @@ impl<'a> Parser<'a> { self.bump(); pat = PatStruct(enum_path, fields, etc); } + token::DotDotDot => { + let hi = self.last_span.hi; + let start = self.mk_expr(lo, hi, ExprPath(enum_path)); + self.eat(&token::DotDotDot); + let end = if self.token.is_ident() || self.token.is_path() { + let path = self.parse_path(LifetimeAndTypesWithColons); + let hi = self.span.hi; + self.mk_expr(lo, hi, ExprPath(path)) + } else { + self.parse_literal_maybe_minus() + }; + pat = PatRange(start, end); + } _ => { let mut args: Vec> = Vec::new(); match self.token { -- cgit 1.4.1-3-g733a5 From 6c35bf4fbc4f795eb18bbb0c750ed478a47fff4e Mon Sep 17 00:00:00 2001 From: defuz Date: Sat, 28 Feb 2015 11:01:28 +0200 Subject: FIX #21475: Expr_::ExprPath with two fields --- src/libsyntax/parse/parser.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 1ef62cdf315..9a265cb592d 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -3541,12 +3541,12 @@ impl<'a> Parser<'a> { } token::DotDotDot => { let hi = self.last_span.hi; - let start = self.mk_expr(lo, hi, ExprPath(enum_path)); + let start = self.mk_expr(lo, hi, ExprPath(None, enum_path)); self.eat(&token::DotDotDot); let end = if self.token.is_ident() || self.token.is_path() { let path = self.parse_path(LifetimeAndTypesWithColons); let hi = self.span.hi; - self.mk_expr(lo, hi, ExprPath(path)) + self.mk_expr(lo, hi, ExprPath(None, path)) } else { self.parse_literal_maybe_minus() }; -- cgit 1.4.1-3-g733a5