From 63a9bd5e0adc03652e10506055564077aa00eeaa Mon Sep 17 00:00:00 2001 From: Nick Cameron Date: Thu, 8 Jan 2015 08:30:33 +1300 Subject: Fix precedence for ranges. Technically this is a [breaking-change] but it probably shouldn't affect your code. Closes #20256 --- src/libsyntax/parse/parser.rs | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 9c16dbb2c5c..d70f4e74b5f 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2536,7 +2536,7 @@ impl<'a> Parser<'a> { } // expr[...] - // An index expression. + // Could be either an index expression or a slicing expression. token::OpenDelim(token::Bracket) => { let bracket_pos = self.span.lo; self.bump(); @@ -2576,22 +2576,6 @@ impl<'a> Parser<'a> { "use `&expr[]` to construct a slice of the whole of expr"); } } - - // A range expression, either `expr..expr` or `expr..`. - token::DotDot if !self.restrictions.contains(RESTRICTION_NO_DOTS) => { - self.bump(); - - let opt_end = if self.token.can_begin_expr() { - let end = self.parse_expr_res(RESTRICTION_NO_DOTS); - Some(end) - } else { - None - }; - - let hi = self.span.hi; - let range = self.mk_range(Some(e), opt_end); - return self.mk_expr(lo, hi, range); - } _ => return e } } @@ -2834,7 +2818,7 @@ impl<'a> Parser<'a> { token::DotDot if !self.restrictions.contains(RESTRICTION_NO_DOTS) => { // A range, closed above: `..expr`. self.bump(); - let e = self.parse_prefix_expr(); + let e = self.parse_expr(); hi = e.span.hi; ex = self.mk_range(None, Some(e)); } @@ -2901,6 +2885,7 @@ impl<'a> Parser<'a> { self.restrictions.contains(RESTRICTION_NO_BAR_OP) { return lhs; } + self.expected_tokens.push(TokenType::Operator); let cur_opt = self.token.to_binop(); @@ -2909,6 +2894,7 @@ impl<'a> Parser<'a> { let cur_prec = operator_prec(cur_op); if cur_prec > min_prec { self.bump(); + // TODO let expr = self.parse_prefix_expr(); let rhs = self.parse_more_binops(expr, cur_prec); let lhs_span = lhs.span; @@ -2970,6 +2956,25 @@ impl<'a> Parser<'a> { let assign_op = self.mk_assign_op(aop, lhs, rhs); self.mk_expr(span.lo, rhs_span.hi, assign_op) } + // TODO + // A range expression, either `expr..expr` or `expr..`. + token::DotDot if !self.restrictions.contains(RESTRICTION_NO_DOTS) => { + self.bump(); + + let opt_end = if self.token.can_begin_expr() { + // TODO only use of RES...DOT + let end = self.parse_expr_res(RESTRICTION_NO_DOTS); + Some(end) + } else { + None + }; + + let lo = lhs.span.lo; + let hi = self.span.hi; + let range = self.mk_range(Some(lhs), opt_end); + return self.mk_expr(lo, hi, range); + } + _ => { lhs } -- cgit 1.4.1-3-g733a5 From 68a783a89f4c7e74d4c7e09bfac67283e054d4fc Mon Sep 17 00:00:00 2001 From: Nick Cameron Date: Thu, 8 Jan 2015 14:33:57 +1300 Subject: Remove String impls and fix for make tidy --- src/libcore/ops.rs | 51 ---------------------------------- src/libsyntax/parse/parser.rs | 3 -- src/test/run-pass/ranges-precedence.rs | 2 +- 3 files changed, 1 insertion(+), 55 deletions(-) (limited to 'src/libsyntax/parse') diff --git a/src/libcore/ops.rs b/src/libcore/ops.rs index 8d86252e051..ab956587d82 100644 --- a/src/libcore/ops.rs +++ b/src/libcore/ops.rs @@ -860,13 +860,6 @@ impl fmt::Show for FullRange { } } -#[unstable = "API still in development"] -impl fmt::String for FullRange { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { - fmt::String::fmt("..", fmt) - } -} - /// A (half-open) range which is bounded at both ends. #[derive(Copy, PartialEq, Eq)] #[lang="range"] @@ -925,20 +918,6 @@ impl fmt::Show for Range { write!(fmt, "{:?}..{:?}", self.start, self.end) } } -#[cfg(stage0)] -#[unstable = "API still in development"] -impl fmt::String for Range { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { - write!(fmt, "{}..{}", self.start, self.end) - } -} -#[cfg(not(stage0))] -#[unstable = "API still in development"] -impl fmt::String for Range { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { - write!(fmt, "{}..{}", self.start, self.end) - } -} /// A range which is only bounded below. #[derive(Copy, PartialEq, Eq)] @@ -969,21 +948,6 @@ impl fmt::Show for RangeFrom { } } -#[cfg(stage0)] -#[unstable = "API still in development"] -impl fmt::String for RangeFrom { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { - write!(fmt, "{}..", self.start) - } -} -#[cfg(not(stage0))] -#[unstable = "API still in development"] -impl fmt::String for RangeFrom { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { - write!(fmt, "{}..", self.start) - } -} - /// A range which is only bounded above. #[derive(Copy, PartialEq, Eq)] #[lang="range_to"] @@ -1000,21 +964,6 @@ impl fmt::Show for RangeTo { } } -#[cfg(stage0)] -#[unstable = "API still in development"] -impl fmt::String for RangeTo { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { - write!(fmt, "..{}", self.end) - } -} -#[cfg(not(stage0))] -#[unstable = "API still in development"] -impl fmt::String for RangeTo { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { - write!(fmt, "..{}", self.end) - } -} - /// The `Deref` trait is used to specify the functionality of dereferencing /// operations like `*v`. diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index d70f4e74b5f..ab4e39bd767 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2894,7 +2894,6 @@ impl<'a> Parser<'a> { let cur_prec = operator_prec(cur_op); if cur_prec > min_prec { self.bump(); - // TODO let expr = self.parse_prefix_expr(); let rhs = self.parse_more_binops(expr, cur_prec); let lhs_span = lhs.span; @@ -2956,13 +2955,11 @@ impl<'a> Parser<'a> { let assign_op = self.mk_assign_op(aop, lhs, rhs); self.mk_expr(span.lo, rhs_span.hi, assign_op) } - // TODO // A range expression, either `expr..expr` or `expr..`. token::DotDot if !self.restrictions.contains(RESTRICTION_NO_DOTS) => { self.bump(); let opt_end = if self.token.can_begin_expr() { - // TODO only use of RES...DOT let end = self.parse_expr_res(RESTRICTION_NO_DOTS); Some(end) } else { diff --git a/src/test/run-pass/ranges-precedence.rs b/src/test/run-pass/ranges-precedence.rs index ea72eb38865..f678eed8775 100644 --- a/src/test/run-pass/ranges-precedence.rs +++ b/src/test/run-pass/ranges-precedence.rs @@ -29,7 +29,7 @@ fn main() { let x = 1+3..4; assert!(x == (4..4)); - + let a = Foo { foo: 3 }; let x = a.foo..a.bar(); assert!(x == (3..5)); -- cgit 1.4.1-3-g733a5