2014-04-17 08:35:31 +00:00
|
|
|
|
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
|
2012-12-10 23:44:02 +00:00
|
|
|
|
// 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.
|
|
|
|
|
|
2018-04-25 16:30:39 +00:00
|
|
|
|
use rustc_target::spec::abi::{self, Abi};
|
2017-07-19 23:39:34 +00:00
|
|
|
|
use ast::{AngleBracketedParameterData, ParenthesizedParameterData, AttrStyle, BareFnTy};
|
2014-12-24 06:38:10 +00:00
|
|
|
|
use ast::{RegionTyParamBound, TraitTyParamBound, TraitBoundModifier};
|
2016-02-09 16:54:11 +00:00
|
|
|
|
use ast::Unsafety;
|
2018-05-17 18:28:50 +00:00
|
|
|
|
use ast::{Mod, AnonConst, Arg, Arm, Attribute, BindingMode, TraitItemKind};
|
2016-02-08 12:16:12 +00:00
|
|
|
|
use ast::Block;
|
2017-10-07 14:36:28 +00:00
|
|
|
|
use ast::{BlockCheckMode, CaptureBy, Movability};
|
2016-10-27 06:36:56 +00:00
|
|
|
|
use ast::{Constness, Crate};
|
2016-06-17 02:30:01 +00:00
|
|
|
|
use ast::Defaultness;
|
2016-05-24 11:38:39 +00:00
|
|
|
|
use ast::EnumDef;
|
2016-01-13 06:23:31 +00:00
|
|
|
|
use ast::{Expr, ExprKind, RangeLimits};
|
2016-02-08 15:05:05 +00:00
|
|
|
|
use ast::{Field, FnDecl};
|
2016-02-09 10:31:19 +00:00
|
|
|
|
use ast::{ForeignItem, ForeignItemKind, FunctionRetTy};
|
2017-10-16 19:07:26 +00:00
|
|
|
|
use ast::GenericParam;
|
2017-10-12 12:51:31 +00:00
|
|
|
|
use ast::{Ident, ImplItem, IsAuto, Item, ItemKind};
|
2018-01-15 22:44:32 +00:00
|
|
|
|
use ast::{Label, Lifetime, LifetimeDef, Lit, LitKind, UintTy};
|
2016-02-08 16:06:20 +00:00
|
|
|
|
use ast::Local;
|
2016-02-09 10:56:59 +00:00
|
|
|
|
use ast::MacStmtStyle;
|
2018-05-22 15:01:21 +00:00
|
|
|
|
use ast::{Mac, Mac_, MacDelimiter};
|
2016-02-08 12:16:12 +00:00
|
|
|
|
use ast::{MutTy, Mutability};
|
2017-03-08 17:30:06 +00:00
|
|
|
|
use ast::{Pat, PatKind, PathSegment};
|
2015-03-11 21:38:58 +00:00
|
|
|
|
use ast::{PolyTraitRef, QSelf};
|
2016-02-08 16:23:13 +00:00
|
|
|
|
use ast::{Stmt, StmtKind};
|
|
|
|
|
use ast::{VariantData, StructField};
|
2016-02-08 12:16:12 +00:00
|
|
|
|
use ast::StrStyle;
|
2016-02-08 14:43:56 +00:00
|
|
|
|
use ast::SelfKind;
|
2017-10-10 14:33:19 +00:00
|
|
|
|
use ast::{TraitItem, TraitRef, TraitObjectSyntax};
|
2016-02-08 15:53:21 +00:00
|
|
|
|
use ast::{Ty, TyKind, TypeBinding, TyParam, TyParamBounds};
|
2018-01-29 05:12:09 +00:00
|
|
|
|
use ast::{Visibility, VisibilityKind, WhereClause, CrateSugar};
|
2017-09-26 21:04:00 +00:00
|
|
|
|
use ast::{UseTree, UseTreeKind};
|
2016-02-08 12:16:12 +00:00
|
|
|
|
use ast::{BinOpKind, UnOp};
|
2017-09-21 10:13:26 +00:00
|
|
|
|
use ast::{RangeEnd, RangeSyntax};
|
2016-11-14 09:31:03 +00:00
|
|
|
|
use {ast, attr};
|
2017-03-15 00:22:48 +00:00
|
|
|
|
use codemap::{self, CodeMap, Spanned, respan};
|
2018-01-16 05:38:12 +00:00
|
|
|
|
use syntax_pos::{self, Span, MultiSpan, BytePos, FileName, DUMMY_SP};
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
use errors::{self, Applicability, DiagnosticBuilder};
|
2017-01-29 08:38:44 +00:00
|
|
|
|
use parse::{self, classify, token};
|
2016-02-23 04:24:42 +00:00
|
|
|
|
use parse::common::SeqSep;
|
2017-01-13 04:49:20 +00:00
|
|
|
|
use parse::lexer::TokenAndSpan;
|
2017-02-20 05:44:06 +00:00
|
|
|
|
use parse::lexer::comments::{doc_comment_style, strip_doc_comment_decoration};
|
2016-11-05 04:16:26 +00:00
|
|
|
|
use parse::{new_sub_parser_from_file, ParseSess, Directory, DirectoryOwnership};
|
2015-10-15 12:51:30 +00:00
|
|
|
|
use util::parser::{AssocOp, Fixity};
|
2014-10-28 00:05:28 +00:00
|
|
|
|
use print::pprust;
|
2014-09-13 16:06:01 +00:00
|
|
|
|
use ptr::P;
|
2015-03-28 21:58:51 +00:00
|
|
|
|
use parse::PResult;
|
2017-02-21 05:05:59 +00:00
|
|
|
|
use tokenstream::{self, Delimited, ThinTokenStream, TokenTree, TokenStream};
|
2016-11-16 10:52:37 +00:00
|
|
|
|
use symbol::{Symbol, keywords};
|
2016-06-18 04:01:57 +00:00
|
|
|
|
use util::ThinVec;
|
2012-12-23 22:41:37 +00:00
|
|
|
|
|
2018-05-18 06:19:35 +00:00
|
|
|
|
use std::borrow::Cow;
|
2017-04-24 14:26:04 +00:00
|
|
|
|
use std::cmp;
|
2017-01-03 11:19:13 +00:00
|
|
|
|
use std::mem;
|
2017-04-24 14:26:04 +00:00
|
|
|
|
use std::path::{self, Path, PathBuf};
|
2017-01-03 11:19:13 +00:00
|
|
|
|
use std::slice;
|
2010-08-18 22:41:13 +00:00
|
|
|
|
|
2014-09-16 05:22:12 +00:00
|
|
|
|
bitflags! {
|
2017-09-08 19:08:01 +00:00
|
|
|
|
pub struct Restrictions: u8 {
|
|
|
|
|
const STMT_EXPR = 1 << 0;
|
|
|
|
|
const NO_STRUCT_LITERAL = 1 << 1;
|
2014-09-16 05:22:12 +00:00
|
|
|
|
}
|
2011-12-21 04:12:52 +00:00
|
|
|
|
}
|
2011-01-24 23:26:10 +00:00
|
|
|
|
|
2017-12-02 19:15:03 +00:00
|
|
|
|
type ItemInfo = (Ident, ItemKind, Option<Vec<Attribute>>);
|
2012-05-23 22:06:11 +00:00
|
|
|
|
|
2017-07-19 23:39:34 +00:00
|
|
|
|
/// How to parse a path.
|
2015-03-30 13:38:59 +00:00
|
|
|
|
#[derive(Copy, Clone, PartialEq)]
|
2016-04-18 21:42:18 +00:00
|
|
|
|
pub enum PathStyle {
|
2017-07-19 23:39:34 +00:00
|
|
|
|
/// In some contexts, notably in expressions, paths with generic arguments are ambiguous
|
|
|
|
|
/// with something else. For example, in expressions `segment < ....` can be interpreted
|
|
|
|
|
/// as a comparison and `segment ( ....` can be interpreted as a function call.
|
|
|
|
|
/// In all such contexts the non-path interpretation is preferred by default for practical
|
|
|
|
|
/// reasons, but the path interpretation can be forced by the disambiguator `::`, e.g.
|
|
|
|
|
/// `x<y>` - comparisons, `x::<y>` - unambiguously a path.
|
2016-04-18 21:42:18 +00:00
|
|
|
|
Expr,
|
2017-07-19 23:39:34 +00:00
|
|
|
|
/// In other contexts, notably in types, no ambiguity exists and paths can be written
|
|
|
|
|
/// without the disambiguator, e.g. `x<y>` - unambiguously a path.
|
2017-07-29 01:47:12 +00:00
|
|
|
|
/// Paths with disambiguators are still accepted, `x::<Y>` - unambiguously a path too.
|
2017-07-19 23:39:34 +00:00
|
|
|
|
Type,
|
|
|
|
|
/// A path with generic arguments disallowed, e.g. `foo::bar::Baz`, used in imports,
|
|
|
|
|
/// visibilities or attributes.
|
|
|
|
|
/// Technically, this variant is unnecessary and e.g. `Expr` can be used instead
|
|
|
|
|
/// (paths in "mod" contexts have to be checked later for absence of generic arguments
|
|
|
|
|
/// anyway, due to macros), but it is used to avoid weird suggestions about expected
|
|
|
|
|
/// tokens when something goes wrong.
|
|
|
|
|
Mod,
|
2013-08-07 16:47:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-04-13 19:37:05 +00:00
|
|
|
|
#[derive(Clone, Copy, Debug, PartialEq)]
|
2016-02-10 03:11:27 +00:00
|
|
|
|
pub enum SemiColonMode {
|
|
|
|
|
Break,
|
|
|
|
|
Ignore,
|
|
|
|
|
}
|
|
|
|
|
|
2017-04-13 19:37:05 +00:00
|
|
|
|
#[derive(Clone, Copy, Debug, PartialEq)]
|
|
|
|
|
pub enum BlockMode {
|
|
|
|
|
Break,
|
|
|
|
|
Ignore,
|
|
|
|
|
}
|
|
|
|
|
|
2014-10-27 08:22:52 +00:00
|
|
|
|
/// Possibly accept an `token::Interpolated` expression (a pre-parsed expression
|
|
|
|
|
/// dropped into the token stream, which happens while parsing the result of
|
|
|
|
|
/// macro expansion). Placement of these is not as complex as I feared it would
|
|
|
|
|
/// be. The important thing is to make sure that lookahead doesn't balk at
|
|
|
|
|
/// `token::Interpolated` tokens.
|
2014-11-14 17:18:10 +00:00
|
|
|
|
macro_rules! maybe_whole_expr {
|
2016-11-02 03:03:55 +00:00
|
|
|
|
($p:expr) => {
|
|
|
|
|
if let token::Interpolated(nt) = $p.token.clone() {
|
2017-03-29 01:55:01 +00:00
|
|
|
|
match nt.0 {
|
2018-04-09 23:08:47 +00:00
|
|
|
|
token::NtExpr(ref e) | token::NtLiteral(ref e) => {
|
2016-11-02 03:03:55 +00:00
|
|
|
|
$p.bump();
|
|
|
|
|
return Ok((*e).clone());
|
2013-07-05 10:15:21 +00:00
|
|
|
|
}
|
2016-11-02 03:03:55 +00:00
|
|
|
|
token::NtPath(ref path) => {
|
|
|
|
|
$p.bump();
|
2014-06-14 03:48:09 +00:00
|
|
|
|
let span = $p.span;
|
2016-11-02 03:03:55 +00:00
|
|
|
|
let kind = ExprKind::Path(None, (*path).clone());
|
2017-03-15 00:22:48 +00:00
|
|
|
|
return Ok($p.mk_expr(span, kind, ThinVec::new()));
|
2014-05-26 01:33:52 +00:00
|
|
|
|
}
|
2016-11-02 03:03:55 +00:00
|
|
|
|
token::NtBlock(ref block) => {
|
|
|
|
|
$p.bump();
|
2014-06-14 03:48:09 +00:00
|
|
|
|
let span = $p.span;
|
2018-04-16 03:44:39 +00:00
|
|
|
|
let kind = ExprKind::Block((*block).clone(), None);
|
2017-03-15 00:22:48 +00:00
|
|
|
|
return Ok($p.mk_expr(span, kind, ThinVec::new()));
|
2013-07-05 10:15:21 +00:00
|
|
|
|
}
|
2016-11-02 03:03:55 +00:00
|
|
|
|
_ => {},
|
2013-07-05 10:15:21 +00:00
|
|
|
|
};
|
2013-02-21 05:04:05 +00:00
|
|
|
|
}
|
2016-11-02 03:03:55 +00:00
|
|
|
|
}
|
2014-11-14 17:18:10 +00:00
|
|
|
|
}
|
2012-07-10 23:37:44 +00:00
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// As maybe_whole_expr, but for things other than expressions
|
2014-11-14 17:18:10 +00:00
|
|
|
|
macro_rules! maybe_whole {
|
2016-11-02 03:03:55 +00:00
|
|
|
|
($p:expr, $constructor:ident, |$x:ident| $e:expr) => {
|
|
|
|
|
if let token::Interpolated(nt) = $p.token.clone() {
|
2017-03-29 01:55:01 +00:00
|
|
|
|
if let token::$constructor($x) = nt.0.clone() {
|
2016-11-02 03:03:55 +00:00
|
|
|
|
$p.bump();
|
|
|
|
|
return Ok($e);
|
2013-03-02 21:02:27 +00:00
|
|
|
|
}
|
2013-07-02 19:47:32 +00:00
|
|
|
|
}
|
2016-11-02 03:03:55 +00:00
|
|
|
|
};
|
2014-11-14 17:18:10 +00:00
|
|
|
|
}
|
2012-07-04 01:39:37 +00:00
|
|
|
|
|
2017-12-02 19:15:03 +00:00
|
|
|
|
fn maybe_append(mut lhs: Vec<Attribute>, mut rhs: Option<Vec<Attribute>>) -> Vec<Attribute> {
|
|
|
|
|
if let Some(ref mut rhs) = rhs {
|
|
|
|
|
lhs.append(rhs);
|
2012-08-14 18:07:41 +00:00
|
|
|
|
}
|
2014-10-15 06:05:01 +00:00
|
|
|
|
lhs
|
2012-08-14 18:07:41 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-07-20 04:54:01 +00:00
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq)]
|
2016-09-21 02:16:28 +00:00
|
|
|
|
enum PrevTokenKind {
|
2016-09-16 05:46:40 +00:00
|
|
|
|
DocComment,
|
|
|
|
|
Comma,
|
2017-04-04 22:12:53 +00:00
|
|
|
|
Plus,
|
2016-09-16 05:46:40 +00:00
|
|
|
|
Interpolated,
|
|
|
|
|
Eof,
|
2017-07-04 14:04:34 +00:00
|
|
|
|
Ident,
|
2016-09-16 05:46:40 +00:00
|
|
|
|
Other,
|
|
|
|
|
}
|
|
|
|
|
|
2017-12-18 20:26:59 +00:00
|
|
|
|
trait RecoverQPath: Sized {
|
|
|
|
|
const PATH_STYLE: PathStyle = PathStyle::Expr;
|
2017-12-16 22:53:11 +00:00
|
|
|
|
fn to_ty(&self) -> Option<P<Ty>>;
|
|
|
|
|
fn to_recovered(&self, qself: Option<QSelf>, path: ast::Path) -> Self;
|
|
|
|
|
fn to_string(&self) -> String;
|
2017-12-18 20:26:59 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl RecoverQPath for Ty {
|
|
|
|
|
const PATH_STYLE: PathStyle = PathStyle::Type;
|
|
|
|
|
fn to_ty(&self) -> Option<P<Ty>> {
|
|
|
|
|
Some(P(self.clone()))
|
|
|
|
|
}
|
|
|
|
|
fn to_recovered(&self, qself: Option<QSelf>, path: ast::Path) -> Self {
|
|
|
|
|
Self { span: path.span, node: TyKind::Path(qself, path), id: self.id }
|
|
|
|
|
}
|
|
|
|
|
fn to_string(&self) -> String {
|
|
|
|
|
pprust::ty_to_string(self)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl RecoverQPath for Pat {
|
|
|
|
|
fn to_ty(&self) -> Option<P<Ty>> {
|
|
|
|
|
self.to_ty()
|
|
|
|
|
}
|
|
|
|
|
fn to_recovered(&self, qself: Option<QSelf>, path: ast::Path) -> Self {
|
|
|
|
|
Self { span: path.span, node: PatKind::Path(qself, path), id: self.id }
|
|
|
|
|
}
|
|
|
|
|
fn to_string(&self) -> String {
|
|
|
|
|
pprust::pat_to_string(self)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl RecoverQPath for Expr {
|
|
|
|
|
fn to_ty(&self) -> Option<P<Ty>> {
|
|
|
|
|
self.to_ty()
|
|
|
|
|
}
|
|
|
|
|
fn to_recovered(&self, qself: Option<QSelf>, path: ast::Path) -> Self {
|
|
|
|
|
Self { span: path.span, node: ExprKind::Path(qself, path),
|
|
|
|
|
id: self.id, attrs: self.attrs.clone() }
|
|
|
|
|
}
|
|
|
|
|
fn to_string(&self) -> String {
|
|
|
|
|
pprust::expr_to_string(self)
|
|
|
|
|
}
|
2017-12-16 22:53:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-08-01 21:34:35 +00:00
|
|
|
|
/* ident is handled by common.rs */
|
2012-07-26 17:14:01 +00:00
|
|
|
|
|
2017-06-15 03:42:24 +00:00
|
|
|
|
#[derive(Clone)]
|
2014-03-09 14:54:34 +00:00
|
|
|
|
pub struct Parser<'a> {
|
2014-03-27 22:39:48 +00:00
|
|
|
|
pub sess: &'a ParseSess,
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// the current token:
|
2014-03-27 22:39:48 +00:00
|
|
|
|
pub token: token::Token,
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// the span of the current token:
|
2014-03-27 22:39:48 +00:00
|
|
|
|
pub span: Span,
|
2016-09-21 02:09:22 +00:00
|
|
|
|
/// the span of the previous token:
|
2017-03-29 07:17:18 +00:00
|
|
|
|
pub meta_var_span: Option<Span>,
|
2016-09-21 02:09:22 +00:00
|
|
|
|
pub prev_span: Span,
|
2016-09-16 05:46:40 +00:00
|
|
|
|
/// the previous token kind
|
2016-09-21 02:16:28 +00:00
|
|
|
|
prev_token_kind: PrevTokenKind,
|
2014-09-16 05:22:12 +00:00
|
|
|
|
pub restrictions: Restrictions,
|
2012-12-11 20:20:27 +00:00
|
|
|
|
/// Used to determine the path to externally loaded source files
|
2018-05-18 06:19:35 +00:00
|
|
|
|
pub directory: Directory<'a>,
|
2017-05-17 22:37:24 +00:00
|
|
|
|
/// Whether to parse sub-modules in other files.
|
|
|
|
|
pub recurse_into_file_modules: bool,
|
2014-05-16 21:23:04 +00:00
|
|
|
|
/// Name of the root module this parser originated from. If `None`, then the
|
|
|
|
|
/// name is not known. This does not change while the parser is descending
|
|
|
|
|
/// into modules, and sub-parsers have new values for this name.
|
2014-05-22 23:57:53 +00:00
|
|
|
|
pub root_module_name: Option<String>,
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
pub expected_tokens: Vec<TokenType>,
|
2017-02-20 05:44:06 +00:00
|
|
|
|
token_cursor: TokenCursor,
|
2016-11-03 10:44:25 +00:00
|
|
|
|
pub desugar_doc_comments: bool,
|
2017-01-18 00:13:36 +00:00
|
|
|
|
/// Whether we should configure out of line modules as we parse.
|
|
|
|
|
pub cfg_mods: bool,
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-05-17 22:37:24 +00:00
|
|
|
|
|
2017-06-10 03:30:33 +00:00
|
|
|
|
#[derive(Clone)]
|
2017-02-20 05:44:06 +00:00
|
|
|
|
struct TokenCursor {
|
|
|
|
|
frame: TokenCursorFrame,
|
|
|
|
|
stack: Vec<TokenCursorFrame>,
|
|
|
|
|
}
|
|
|
|
|
|
2017-06-10 03:30:33 +00:00
|
|
|
|
#[derive(Clone)]
|
2017-02-20 05:44:06 +00:00
|
|
|
|
struct TokenCursorFrame {
|
|
|
|
|
delim: token::DelimToken,
|
|
|
|
|
span: Span,
|
|
|
|
|
open_delim: bool,
|
|
|
|
|
tree_cursor: tokenstream::Cursor,
|
|
|
|
|
close_delim: bool,
|
2017-07-12 16:50:05 +00:00
|
|
|
|
last_token: LastToken,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// This is used in `TokenCursorFrame` above to track tokens that are consumed
|
|
|
|
|
/// by the parser, and then that's transitively used to record the tokens that
|
|
|
|
|
/// each parse AST item is created with.
|
|
|
|
|
///
|
|
|
|
|
/// Right now this has two states, either collecting tokens or not collecting
|
|
|
|
|
/// tokens. If we're collecting tokens we just save everything off into a local
|
|
|
|
|
/// `Vec`. This should eventually though likely save tokens from the original
|
|
|
|
|
/// token stream and just use slicing of token streams to avoid creation of a
|
|
|
|
|
/// whole new vector.
|
|
|
|
|
///
|
|
|
|
|
/// The second state is where we're passively not recording tokens, but the last
|
|
|
|
|
/// token is still tracked for when we want to start recording tokens. This
|
|
|
|
|
/// "last token" means that when we start recording tokens we'll want to ensure
|
|
|
|
|
/// that this, the first token, is included in the output.
|
|
|
|
|
///
|
|
|
|
|
/// You can find some more example usage of this in the `collect_tokens` method
|
|
|
|
|
/// on the parser.
|
|
|
|
|
#[derive(Clone)]
|
|
|
|
|
enum LastToken {
|
|
|
|
|
Collecting(Vec<TokenTree>),
|
|
|
|
|
Was(Option<TokenTree>),
|
2017-02-20 05:44:06 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl TokenCursorFrame {
|
|
|
|
|
fn new(sp: Span, delimited: &Delimited) -> Self {
|
|
|
|
|
TokenCursorFrame {
|
|
|
|
|
delim: delimited.delim,
|
|
|
|
|
span: sp,
|
|
|
|
|
open_delim: delimited.delim == token::NoDelim,
|
2017-02-21 05:05:59 +00:00
|
|
|
|
tree_cursor: delimited.stream().into_trees(),
|
2017-02-20 05:44:06 +00:00
|
|
|
|
close_delim: delimited.delim == token::NoDelim,
|
2017-07-12 16:50:05 +00:00
|
|
|
|
last_token: LastToken::Was(None),
|
2017-02-20 05:44:06 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl TokenCursor {
|
|
|
|
|
fn next(&mut self) -> TokenAndSpan {
|
|
|
|
|
loop {
|
|
|
|
|
let tree = if !self.frame.open_delim {
|
|
|
|
|
self.frame.open_delim = true;
|
2017-02-21 05:05:59 +00:00
|
|
|
|
Delimited { delim: self.frame.delim, tts: TokenStream::empty().into() }
|
|
|
|
|
.open_tt(self.frame.span)
|
2017-02-20 05:44:06 +00:00
|
|
|
|
} else if let Some(tree) = self.frame.tree_cursor.next() {
|
|
|
|
|
tree
|
|
|
|
|
} else if !self.frame.close_delim {
|
|
|
|
|
self.frame.close_delim = true;
|
2017-02-21 05:05:59 +00:00
|
|
|
|
Delimited { delim: self.frame.delim, tts: TokenStream::empty().into() }
|
|
|
|
|
.close_tt(self.frame.span)
|
2017-02-20 05:44:06 +00:00
|
|
|
|
} else if let Some(frame) = self.stack.pop() {
|
|
|
|
|
self.frame = frame;
|
|
|
|
|
continue
|
|
|
|
|
} else {
|
2017-02-21 12:04:45 +00:00
|
|
|
|
return TokenAndSpan { tok: token::Eof, sp: syntax_pos::DUMMY_SP }
|
2017-02-20 05:44:06 +00:00
|
|
|
|
};
|
|
|
|
|
|
2017-07-12 16:50:05 +00:00
|
|
|
|
match self.frame.last_token {
|
|
|
|
|
LastToken::Collecting(ref mut v) => v.push(tree.clone()),
|
|
|
|
|
LastToken::Was(ref mut t) => *t = Some(tree.clone()),
|
|
|
|
|
}
|
|
|
|
|
|
2017-02-20 05:44:06 +00:00
|
|
|
|
match tree {
|
|
|
|
|
TokenTree::Token(sp, tok) => return TokenAndSpan { tok: tok, sp: sp },
|
|
|
|
|
TokenTree::Delimited(sp, ref delimited) => {
|
|
|
|
|
let frame = TokenCursorFrame::new(sp, delimited);
|
|
|
|
|
self.stack.push(mem::replace(&mut self.frame, frame));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn next_desugared(&mut self) -> TokenAndSpan {
|
|
|
|
|
let (sp, name) = match self.next() {
|
|
|
|
|
TokenAndSpan { sp, tok: token::DocComment(name) } => (sp, name),
|
2017-05-12 18:05:39 +00:00
|
|
|
|
tok => return tok,
|
2017-02-20 05:44:06 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let stripped = strip_doc_comment_decoration(&name.as_str());
|
|
|
|
|
|
|
|
|
|
// Searches for the occurrences of `"#*` and returns the minimum number of `#`s
|
|
|
|
|
// required to wrap the text.
|
|
|
|
|
let mut num_of_hashes = 0;
|
|
|
|
|
let mut count = 0;
|
|
|
|
|
for ch in stripped.chars() {
|
|
|
|
|
count = match ch {
|
|
|
|
|
'"' => 1,
|
|
|
|
|
'#' if count > 0 => count + 1,
|
|
|
|
|
_ => 0,
|
|
|
|
|
};
|
|
|
|
|
num_of_hashes = cmp::max(num_of_hashes, count);
|
|
|
|
|
}
|
|
|
|
|
|
2017-02-21 05:05:59 +00:00
|
|
|
|
let body = TokenTree::Delimited(sp, Delimited {
|
2017-02-20 05:44:06 +00:00
|
|
|
|
delim: token::Bracket,
|
2018-03-10 05:56:40 +00:00
|
|
|
|
tts: [TokenTree::Token(sp, token::Ident(ast::Ident::from_str("doc"), false)),
|
2017-02-21 05:05:59 +00:00
|
|
|
|
TokenTree::Token(sp, token::Eq),
|
|
|
|
|
TokenTree::Token(sp, token::Literal(
|
|
|
|
|
token::StrRaw(Symbol::intern(&stripped), num_of_hashes), None))]
|
|
|
|
|
.iter().cloned().collect::<TokenStream>().into(),
|
|
|
|
|
});
|
2017-02-20 05:44:06 +00:00
|
|
|
|
|
|
|
|
|
self.stack.push(mem::replace(&mut self.frame, TokenCursorFrame::new(sp, &Delimited {
|
|
|
|
|
delim: token::NoDelim,
|
|
|
|
|
tts: if doc_comment_style(&name.as_str()) == AttrStyle::Inner {
|
|
|
|
|
[TokenTree::Token(sp, token::Pound), TokenTree::Token(sp, token::Not), body]
|
2017-02-21 05:05:59 +00:00
|
|
|
|
.iter().cloned().collect::<TokenStream>().into()
|
2017-02-20 05:44:06 +00:00
|
|
|
|
} else {
|
2017-02-21 05:05:59 +00:00
|
|
|
|
[TokenTree::Token(sp, token::Pound), body]
|
|
|
|
|
.iter().cloned().collect::<TokenStream>().into()
|
2017-02-20 05:44:06 +00:00
|
|
|
|
},
|
|
|
|
|
})));
|
|
|
|
|
|
|
|
|
|
self.next()
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-01-04 03:54:18 +00:00
|
|
|
|
#[derive(PartialEq, Eq, Clone)]
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
pub enum TokenType {
|
|
|
|
|
Token(token::Token),
|
2015-01-16 03:04:28 +00:00
|
|
|
|
Keyword(keywords::Keyword),
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
Operator,
|
2017-01-18 16:01:04 +00:00
|
|
|
|
Lifetime,
|
|
|
|
|
Ident,
|
|
|
|
|
Path,
|
|
|
|
|
Type,
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl TokenType {
|
|
|
|
|
fn to_string(&self) -> String {
|
|
|
|
|
match *self {
|
|
|
|
|
TokenType::Token(ref t) => format!("`{}`", Parser::token_to_string(t)),
|
2016-04-18 21:42:18 +00:00
|
|
|
|
TokenType::Keyword(kw) => format!("`{}`", kw.name()),
|
2017-01-18 16:01:04 +00:00
|
|
|
|
TokenType::Operator => "an operator".to_string(),
|
|
|
|
|
TokenType::Lifetime => "lifetime".to_string(),
|
|
|
|
|
TokenType::Ident => "identifier".to_string(),
|
|
|
|
|
TokenType::Path => "path".to_string(),
|
|
|
|
|
TokenType::Type => "type".to_string(),
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2012-09-08 02:04:40 +00:00
|
|
|
|
}
|
2012-05-23 22:06:11 +00:00
|
|
|
|
|
2018-02-23 20:39:51 +00:00
|
|
|
|
/// Returns true if `IDENT t` can start a type - `IDENT::a::b`, `IDENT<u8, u8>`,
|
|
|
|
|
/// `IDENT<<u8 as Trait>::AssocTy>`.
|
|
|
|
|
///
|
|
|
|
|
/// Types can also be of the form `IDENT(u8, u8) -> u8`, however this assumes
|
|
|
|
|
/// that IDENT is not the ident of a fn trait
|
|
|
|
|
fn can_continue_type_after_non_fn_ident(t: &token::Token) -> bool {
|
2017-10-10 14:33:19 +00:00
|
|
|
|
t == &token::ModSep || t == &token::Lt ||
|
2018-02-23 20:39:51 +00:00
|
|
|
|
t == &token::BinOp(token::Shl)
|
2017-10-10 14:33:19 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-07-03 00:50:18 +00:00
|
|
|
|
/// Information about the path to a module.
|
|
|
|
|
pub struct ModulePath {
|
|
|
|
|
pub name: String,
|
|
|
|
|
pub path_exists: bool,
|
2017-02-12 14:18:41 +00:00
|
|
|
|
pub result: Result<ModulePathSuccess, Error>,
|
2015-07-03 00:50:18 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub struct ModulePathSuccess {
|
2016-11-05 04:16:26 +00:00
|
|
|
|
pub path: PathBuf,
|
|
|
|
|
pub directory_ownership: DirectoryOwnership,
|
2016-11-14 09:31:03 +00:00
|
|
|
|
warn: bool,
|
2015-07-03 00:50:18 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub struct ModulePathError {
|
|
|
|
|
pub err_msg: String,
|
|
|
|
|
pub help_msg: String,
|
|
|
|
|
}
|
|
|
|
|
|
2017-02-12 14:18:41 +00:00
|
|
|
|
pub enum Error {
|
2017-02-12 13:33:17 +00:00
|
|
|
|
FileNotFoundForModule {
|
|
|
|
|
mod_name: String,
|
|
|
|
|
default_path: String,
|
|
|
|
|
secondary_path: String,
|
|
|
|
|
dir_path: String,
|
|
|
|
|
},
|
|
|
|
|
DuplicatePaths {
|
|
|
|
|
mod_name: String,
|
|
|
|
|
default_path: String,
|
|
|
|
|
secondary_path: String,
|
|
|
|
|
},
|
|
|
|
|
UselessDocComment,
|
|
|
|
|
InclusiveRangeWithNoEnd,
|
|
|
|
|
}
|
|
|
|
|
|
2017-02-12 14:18:41 +00:00
|
|
|
|
impl Error {
|
2018-01-16 05:38:12 +00:00
|
|
|
|
pub fn span_err<S: Into<MultiSpan>>(self,
|
|
|
|
|
sp: S,
|
|
|
|
|
handler: &errors::Handler) -> DiagnosticBuilder {
|
2017-02-12 13:33:17 +00:00
|
|
|
|
match self {
|
2017-02-12 14:18:41 +00:00
|
|
|
|
Error::FileNotFoundForModule { ref mod_name,
|
|
|
|
|
ref default_path,
|
|
|
|
|
ref secondary_path,
|
|
|
|
|
ref dir_path } => {
|
2017-02-12 13:33:17 +00:00
|
|
|
|
let mut err = struct_span_err!(handler, sp, E0583,
|
|
|
|
|
"file not found for module `{}`", mod_name);
|
2018-03-29 11:03:24 +00:00
|
|
|
|
err.help(&format!("name the file either {} or {} inside the directory \"{}\"",
|
2017-02-12 13:33:17 +00:00
|
|
|
|
default_path,
|
|
|
|
|
secondary_path,
|
|
|
|
|
dir_path));
|
|
|
|
|
err
|
|
|
|
|
}
|
2017-02-12 14:18:41 +00:00
|
|
|
|
Error::DuplicatePaths { ref mod_name, ref default_path, ref secondary_path } => {
|
2017-02-12 13:33:17 +00:00
|
|
|
|
let mut err = struct_span_err!(handler, sp, E0584,
|
|
|
|
|
"file for module `{}` found at both {} and {}",
|
|
|
|
|
mod_name,
|
|
|
|
|
default_path,
|
|
|
|
|
secondary_path);
|
|
|
|
|
err.help("delete or rename one of them to remove the ambiguity");
|
|
|
|
|
err
|
|
|
|
|
}
|
2017-02-12 14:18:41 +00:00
|
|
|
|
Error::UselessDocComment => {
|
2017-02-12 13:33:17 +00:00
|
|
|
|
let mut err = struct_span_err!(handler, sp, E0585,
|
|
|
|
|
"found a documentation comment that doesn't document anything");
|
|
|
|
|
err.help("doc comments must come before what they document, maybe a comment was \
|
|
|
|
|
intended with `//`?");
|
|
|
|
|
err
|
|
|
|
|
}
|
2017-02-12 14:18:41 +00:00
|
|
|
|
Error::InclusiveRangeWithNoEnd => {
|
2017-02-12 13:33:17 +00:00
|
|
|
|
let mut err = struct_span_err!(handler, sp, E0586,
|
|
|
|
|
"inclusive range with no end");
|
2017-09-19 05:40:04 +00:00
|
|
|
|
err.help("inclusive ranges must be bounded at the end (`..=b` or `a..=b`)");
|
2017-02-12 13:33:17 +00:00
|
|
|
|
err
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-06-10 03:30:33 +00:00
|
|
|
|
#[derive(Debug)]
|
2015-11-03 16:39:51 +00:00
|
|
|
|
pub enum LhsExpr {
|
|
|
|
|
NotYetParsed,
|
2016-06-18 04:01:57 +00:00
|
|
|
|
AttributesParsed(ThinVec<Attribute>),
|
2015-11-03 16:39:51 +00:00
|
|
|
|
AlreadyParsed(P<Expr>),
|
|
|
|
|
}
|
|
|
|
|
|
2016-06-18 04:01:57 +00:00
|
|
|
|
impl From<Option<ThinVec<Attribute>>> for LhsExpr {
|
|
|
|
|
fn from(o: Option<ThinVec<Attribute>>) -> Self {
|
2015-11-03 16:39:51 +00:00
|
|
|
|
if let Some(attrs) = o {
|
|
|
|
|
LhsExpr::AttributesParsed(attrs)
|
|
|
|
|
} else {
|
|
|
|
|
LhsExpr::NotYetParsed
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl From<P<Expr>> for LhsExpr {
|
|
|
|
|
fn from(expr: P<Expr>) -> Self {
|
|
|
|
|
LhsExpr::AlreadyParsed(expr)
|
|
|
|
|
}
|
|
|
|
|
}
|
2015-07-03 00:50:18 +00:00
|
|
|
|
|
2017-03-29 01:56:29 +00:00
|
|
|
|
/// Create a placeholder argument.
|
|
|
|
|
fn dummy_arg(span: Span) -> Arg {
|
2018-03-18 13:47:09 +00:00
|
|
|
|
let ident = Ident::new(keywords::Invalid.name(), span);
|
2017-03-29 01:56:29 +00:00
|
|
|
|
let pat = P(Pat {
|
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2018-03-18 13:47:09 +00:00
|
|
|
|
node: PatKind::Ident(BindingMode::ByValue(Mutability::Immutable), ident, None),
|
2017-08-07 05:54:09 +00:00
|
|
|
|
span,
|
2017-03-29 01:56:29 +00:00
|
|
|
|
});
|
|
|
|
|
let ty = Ty {
|
|
|
|
|
node: TyKind::Err,
|
2017-08-07 05:54:09 +00:00
|
|
|
|
span,
|
2017-03-29 01:56:29 +00:00
|
|
|
|
id: ast::DUMMY_NODE_ID
|
|
|
|
|
};
|
|
|
|
|
Arg { ty: P(ty), pat: pat, id: ast::DUMMY_NODE_ID }
|
|
|
|
|
}
|
|
|
|
|
|
2017-09-07 06:07:49 +00:00
|
|
|
|
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
|
|
|
|
|
enum TokenExpectType {
|
|
|
|
|
Expect,
|
|
|
|
|
NoExpect,
|
|
|
|
|
}
|
|
|
|
|
|
2014-03-09 14:54:34 +00:00
|
|
|
|
impl<'a> Parser<'a> {
|
2016-12-07 00:28:51 +00:00
|
|
|
|
pub fn new(sess: &'a ParseSess,
|
2017-02-21 05:05:59 +00:00
|
|
|
|
tokens: TokenStream,
|
2018-05-18 06:19:35 +00:00
|
|
|
|
directory: Option<Directory<'a>>,
|
2017-05-17 22:37:24 +00:00
|
|
|
|
recurse_into_file_modules: bool,
|
2016-12-07 00:28:51 +00:00
|
|
|
|
desugar_doc_comments: bool)
|
|
|
|
|
-> Self {
|
2016-11-03 07:43:29 +00:00
|
|
|
|
let mut parser = Parser {
|
2017-08-07 05:54:09 +00:00
|
|
|
|
sess,
|
2018-03-08 11:27:23 +00:00
|
|
|
|
token: token::Whitespace,
|
2016-11-03 07:43:29 +00:00
|
|
|
|
span: syntax_pos::DUMMY_SP,
|
|
|
|
|
prev_span: syntax_pos::DUMMY_SP,
|
2017-03-29 07:17:18 +00:00
|
|
|
|
meta_var_span: None,
|
2016-09-21 02:16:28 +00:00
|
|
|
|
prev_token_kind: PrevTokenKind::Other,
|
2015-04-29 21:58:43 +00:00
|
|
|
|
restrictions: Restrictions::empty(),
|
2017-08-07 05:54:09 +00:00
|
|
|
|
recurse_into_file_modules,
|
2017-11-28 02:14:24 +00:00
|
|
|
|
directory: Directory {
|
2018-05-18 06:19:35 +00:00
|
|
|
|
path: Cow::from(PathBuf::new()),
|
2017-11-28 02:14:24 +00:00
|
|
|
|
ownership: DirectoryOwnership::Owned { relative: None }
|
|
|
|
|
},
|
2014-05-25 23:27:36 +00:00
|
|
|
|
root_module_name: None,
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
expected_tokens: Vec::new(),
|
2017-02-20 05:44:06 +00:00
|
|
|
|
token_cursor: TokenCursor {
|
|
|
|
|
frame: TokenCursorFrame::new(syntax_pos::DUMMY_SP, &Delimited {
|
|
|
|
|
delim: token::NoDelim,
|
2017-02-21 05:05:59 +00:00
|
|
|
|
tts: tokens.into(),
|
2017-02-20 05:44:06 +00:00
|
|
|
|
}),
|
|
|
|
|
stack: Vec::new(),
|
|
|
|
|
},
|
2017-08-07 05:54:09 +00:00
|
|
|
|
desugar_doc_comments,
|
2017-01-18 00:13:36 +00:00
|
|
|
|
cfg_mods: true,
|
2016-11-03 07:43:29 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let tok = parser.next_tok();
|
|
|
|
|
parser.token = tok.tok;
|
|
|
|
|
parser.span = tok.sp;
|
2017-05-17 22:37:24 +00:00
|
|
|
|
|
2016-12-07 00:28:51 +00:00
|
|
|
|
if let Some(directory) = directory {
|
|
|
|
|
parser.directory = directory;
|
2017-12-14 07:09:19 +00:00
|
|
|
|
} else if !parser.span.source_equal(&DUMMY_SP) {
|
2018-05-18 06:19:35 +00:00
|
|
|
|
if let FileName::Real(mut path) = sess.codemap().span_to_unmapped_path(parser.span) {
|
|
|
|
|
path.pop();
|
|
|
|
|
parser.directory.path = Cow::from(path);
|
2017-12-14 07:09:19 +00:00
|
|
|
|
}
|
2016-11-03 07:43:29 +00:00
|
|
|
|
}
|
2017-05-17 22:37:24 +00:00
|
|
|
|
|
2017-03-29 07:17:18 +00:00
|
|
|
|
parser.process_potential_macro_variable();
|
2016-11-03 07:43:29 +00:00
|
|
|
|
parser
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn next_tok(&mut self) -> TokenAndSpan {
|
2017-05-12 18:05:39 +00:00
|
|
|
|
let mut next = if self.desugar_doc_comments {
|
|
|
|
|
self.token_cursor.next_desugared()
|
|
|
|
|
} else {
|
|
|
|
|
self.token_cursor.next()
|
2017-02-21 12:04:45 +00:00
|
|
|
|
};
|
|
|
|
|
if next.sp == syntax_pos::DUMMY_SP {
|
2018-04-22 01:10:15 +00:00
|
|
|
|
// Tweak the location for better diagnostics, but keep syntactic context intact.
|
|
|
|
|
next.sp = self.prev_span.with_ctxt(next.sp.ctxt());
|
2014-05-25 23:27:36 +00:00
|
|
|
|
}
|
2017-02-21 12:04:45 +00:00
|
|
|
|
next
|
2014-05-25 23:27:36 +00:00
|
|
|
|
}
|
2014-06-09 20:12:30 +00:00
|
|
|
|
|
|
|
|
|
/// Convert a token to a string using self's reader
|
2014-06-21 10:39:03 +00:00
|
|
|
|
pub fn token_to_string(token: &token::Token) -> String {
|
2014-10-28 00:05:28 +00:00
|
|
|
|
pprust::token_to_string(token)
|
2013-06-15 01:21:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Convert the current token to a string using self's reader
|
2015-01-21 11:44:49 +00:00
|
|
|
|
pub fn this_token_to_string(&self) -> String {
|
2014-06-21 10:39:03 +00:00
|
|
|
|
Parser::token_to_string(&self.token)
|
2013-06-15 01:21:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
2018-01-06 22:43:20 +00:00
|
|
|
|
pub fn token_descr(&self) -> Option<&'static str> {
|
|
|
|
|
Some(match &self.token {
|
|
|
|
|
t if t.is_special_ident() => "reserved identifier",
|
|
|
|
|
t if t.is_used_keyword() => "keyword",
|
|
|
|
|
t if t.is_unused_keyword() => "reserved keyword",
|
|
|
|
|
_ => return None,
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
2016-04-20 23:03:29 +00:00
|
|
|
|
pub fn this_token_descr(&self) -> String {
|
2018-01-06 22:43:20 +00:00
|
|
|
|
if let Some(prefix) = self.token_descr() {
|
|
|
|
|
format!("{} `{}`", prefix, self.this_token_to_string())
|
|
|
|
|
} else {
|
|
|
|
|
format!("`{}`", self.this_token_to_string())
|
|
|
|
|
}
|
2016-04-20 23:03:29 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-12-30 23:11:53 +00:00
|
|
|
|
pub fn unexpected_last<T>(&self, t: &token::Token) -> PResult<'a, T> {
|
2014-06-21 10:39:03 +00:00
|
|
|
|
let token_str = Parser::token_to_string(t);
|
2016-09-21 02:09:22 +00:00
|
|
|
|
Err(self.span_fatal(self.prev_span, &format!("unexpected token: `{}`", token_str)))
|
2013-06-15 01:21:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-12-30 23:11:53 +00:00
|
|
|
|
pub fn unexpected<T>(&mut self) -> PResult<'a, T> {
|
2015-03-28 21:58:51 +00:00
|
|
|
|
match self.expect_one_of(&[], &[]) {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
Err(e) => Err(e),
|
|
|
|
|
Ok(_) => unreachable!(),
|
2015-03-28 21:58:51 +00:00
|
|
|
|
}
|
2013-06-15 01:21:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Expect and consume the token t. Signal an error if
|
|
|
|
|
/// the next token is not t.
|
2015-12-20 21:00:43 +00:00
|
|
|
|
pub fn expect(&mut self, t: &token::Token) -> PResult<'a, ()> {
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
if self.expected_tokens.is_empty() {
|
|
|
|
|
if self.token == *t {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
|
|
|
|
Ok(())
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
} else {
|
|
|
|
|
let token_str = Parser::token_to_string(t);
|
|
|
|
|
let this_token_str = self.this_token_to_string();
|
2018-02-19 00:59:33 +00:00
|
|
|
|
let mut err = self.fatal(&format!("expected `{}`, found `{}`",
|
|
|
|
|
token_str,
|
|
|
|
|
this_token_str));
|
|
|
|
|
err.span_label(self.span, format!("expected `{}`", token_str));
|
|
|
|
|
Err(err)
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
}
|
2013-06-15 01:21:47 +00:00
|
|
|
|
} else {
|
2018-06-01 14:05:46 +00:00
|
|
|
|
self.expect_one_of(slice::from_ref(t), &[])
|
2013-06-15 01:21:47 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Expect next token to be edible or inedible token. If edible,
|
|
|
|
|
/// then consume it; if inedible, then return without consuming
|
|
|
|
|
/// anything. Signal a fatal error if next token is unexpected.
|
2013-12-30 22:04:00 +00:00
|
|
|
|
pub fn expect_one_of(&mut self,
|
|
|
|
|
edible: &[token::Token],
|
2015-12-20 21:00:43 +00:00
|
|
|
|
inedible: &[token::Token]) -> PResult<'a, ()>{
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
fn tokens_to_string(tokens: &[TokenType]) -> String {
|
2013-08-05 20:18:29 +00:00
|
|
|
|
let mut i = tokens.iter();
|
|
|
|
|
// This might be a sign we need a connect method on Iterator.
|
2014-05-07 23:33:43 +00:00
|
|
|
|
let b = i.next()
|
2014-12-11 03:46:38 +00:00
|
|
|
|
.map_or("".to_string(), |t| t.to_string());
|
2017-05-12 18:05:39 +00:00
|
|
|
|
i.enumerate().fold(b, |mut b, (i, a)| {
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
if tokens.len() > 2 && i == tokens.len() - 2 {
|
|
|
|
|
b.push_str(", or ");
|
|
|
|
|
} else if tokens.len() == 2 && i == tokens.len() - 2 {
|
|
|
|
|
b.push_str(" or ");
|
|
|
|
|
} else {
|
|
|
|
|
b.push_str(", ");
|
|
|
|
|
}
|
2016-02-08 22:55:55 +00:00
|
|
|
|
b.push_str(&a.to_string());
|
2014-05-07 23:33:43 +00:00
|
|
|
|
b
|
|
|
|
|
})
|
2013-08-05 20:18:29 +00:00
|
|
|
|
}
|
2013-12-30 23:09:41 +00:00
|
|
|
|
if edible.contains(&self.token) {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
|
|
|
|
Ok(())
|
2013-12-30 23:09:41 +00:00
|
|
|
|
} else if inedible.contains(&self.token) {
|
2013-08-05 20:18:29 +00:00
|
|
|
|
// leave it in the input
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(())
|
2013-08-05 20:18:29 +00:00
|
|
|
|
} else {
|
2015-04-17 04:57:38 +00:00
|
|
|
|
let mut expected = edible.iter()
|
|
|
|
|
.map(|x| TokenType::Token(x.clone()))
|
|
|
|
|
.chain(inedible.iter().map(|x| TokenType::Token(x.clone())))
|
|
|
|
|
.chain(self.expected_tokens.iter().cloned())
|
|
|
|
|
.collect::<Vec<_>>();
|
2018-03-30 09:54:14 +00:00
|
|
|
|
expected.sort_by_cached_key(|x| x.to_string());
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
expected.dedup();
|
2015-02-18 19:48:57 +00:00
|
|
|
|
let expect = tokens_to_string(&expected[..]);
|
2014-06-21 10:39:03 +00:00
|
|
|
|
let actual = self.this_token_to_string();
|
2017-03-25 22:36:59 +00:00
|
|
|
|
let (msg_exp, (label_sp, label_exp)) = if expected.len() > 1 {
|
|
|
|
|
let short_expect = if expected.len() > 6 {
|
|
|
|
|
format!("{} possible tokens", expected.len())
|
2013-08-05 20:18:29 +00:00
|
|
|
|
} else {
|
2017-03-25 22:36:59 +00:00
|
|
|
|
expect.clone()
|
|
|
|
|
};
|
2017-03-25 02:14:58 +00:00
|
|
|
|
(format!("expected one of {}, found `{}`", expect, actual),
|
2018-01-14 17:29:07 +00:00
|
|
|
|
(self.sess.codemap().next_point(self.prev_span),
|
|
|
|
|
format!("expected one of {} here", short_expect)))
|
2017-03-25 02:14:58 +00:00
|
|
|
|
} else if expected.is_empty() {
|
|
|
|
|
(format!("unexpected token: `{}`", actual),
|
2017-03-25 22:36:59 +00:00
|
|
|
|
(self.prev_span, "unexpected token after this".to_string()))
|
2017-03-25 02:14:58 +00:00
|
|
|
|
} else {
|
|
|
|
|
(format!("expected {}, found `{}`", expect, actual),
|
2018-01-14 17:29:07 +00:00
|
|
|
|
(self.sess.codemap().next_point(self.prev_span),
|
|
|
|
|
format!("expected {} here", expect)))
|
2017-03-25 02:14:58 +00:00
|
|
|
|
};
|
|
|
|
|
let mut err = self.fatal(&msg_exp);
|
2017-03-25 22:36:59 +00:00
|
|
|
|
let sp = if self.token == token::Token::Eof {
|
|
|
|
|
// This is EOF, don't want to point at the following char, but rather the last token
|
|
|
|
|
self.prev_span
|
|
|
|
|
} else {
|
|
|
|
|
label_sp
|
|
|
|
|
};
|
2017-11-29 21:28:47 +00:00
|
|
|
|
|
|
|
|
|
let cm = self.sess.codemap();
|
|
|
|
|
match (cm.lookup_line(self.span.lo()), cm.lookup_line(sp.lo())) {
|
|
|
|
|
(Ok(ref a), Ok(ref b)) if a.line == b.line => {
|
|
|
|
|
// When the spans are in the same line, it means that the only content between
|
|
|
|
|
// them is whitespace, point at the found token in that case:
|
|
|
|
|
//
|
|
|
|
|
// X | () => { syntax error };
|
|
|
|
|
// | ^^^^^ expected one of 8 possible tokens here
|
|
|
|
|
//
|
|
|
|
|
// instead of having:
|
|
|
|
|
//
|
|
|
|
|
// X | () => { syntax error };
|
|
|
|
|
// | -^^^^^ unexpected token
|
|
|
|
|
// | |
|
|
|
|
|
// | expected one of 8 possible tokens here
|
|
|
|
|
err.span_label(self.span, label_exp);
|
|
|
|
|
}
|
|
|
|
|
_ => {
|
|
|
|
|
err.span_label(sp, label_exp);
|
|
|
|
|
err.span_label(self.span, "unexpected token");
|
|
|
|
|
}
|
2017-03-25 22:36:59 +00:00
|
|
|
|
}
|
2017-03-25 02:14:58 +00:00
|
|
|
|
Err(err)
|
2013-08-05 20:18:29 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-01-27 09:47:33 +00:00
|
|
|
|
/// returns the span of expr, if it was not interpolated or the span of the interpolated token
|
2016-01-27 10:26:38 +00:00
|
|
|
|
fn interpolated_or_expr_span(&self,
|
|
|
|
|
expr: PResult<'a, P<Expr>>)
|
|
|
|
|
-> PResult<'a, (Span, P<Expr>)> {
|
2016-01-27 09:47:33 +00:00
|
|
|
|
expr.map(|e| {
|
2016-09-21 02:16:28 +00:00
|
|
|
|
if self.prev_token_kind == PrevTokenKind::Interpolated {
|
2016-09-21 02:09:22 +00:00
|
|
|
|
(self.prev_span, e)
|
2016-01-27 09:47:33 +00:00
|
|
|
|
} else {
|
|
|
|
|
(e.span, e)
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-23 03:03:51 +00:00
|
|
|
|
fn expected_ident_found(&self) -> DiagnosticBuilder<'a> {
|
|
|
|
|
let mut err = self.struct_span_err(self.span,
|
|
|
|
|
&format!("expected identifier, found {}",
|
|
|
|
|
self.this_token_descr()));
|
|
|
|
|
if let Some(token_descr) = self.token_descr() {
|
|
|
|
|
err.span_label(self.span, format!("expected identifier, found {}", token_descr));
|
|
|
|
|
} else {
|
|
|
|
|
err.span_label(self.span, "expected identifier");
|
|
|
|
|
}
|
|
|
|
|
err
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-20 21:00:43 +00:00
|
|
|
|
pub fn parse_ident(&mut self) -> PResult<'a, ast::Ident> {
|
2018-01-06 22:43:20 +00:00
|
|
|
|
self.parse_ident_common(true)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn parse_ident_common(&mut self, recover: bool) -> PResult<'a, ast::Ident> {
|
2013-12-30 23:09:41 +00:00
|
|
|
|
match self.token {
|
2018-03-18 13:47:09 +00:00
|
|
|
|
token::Ident(ident, _) => {
|
2017-06-29 10:16:35 +00:00
|
|
|
|
if self.token.is_reserved_ident() {
|
2018-01-23 03:03:51 +00:00
|
|
|
|
let mut err = self.expected_ident_found();
|
2018-01-06 22:43:20 +00:00
|
|
|
|
if recover {
|
|
|
|
|
err.emit();
|
|
|
|
|
} else {
|
|
|
|
|
return Err(err);
|
|
|
|
|
}
|
2017-06-29 10:16:35 +00:00
|
|
|
|
}
|
2018-03-18 13:47:09 +00:00
|
|
|
|
let span = self.span;
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2018-03-18 13:47:09 +00:00
|
|
|
|
Ok(Ident::new(ident.name, span))
|
2013-06-15 01:21:47 +00:00
|
|
|
|
}
|
|
|
|
|
_ => {
|
2016-09-21 02:16:28 +00:00
|
|
|
|
Err(if self.prev_token_kind == PrevTokenKind::DocComment {
|
2017-02-12 14:18:41 +00:00
|
|
|
|
self.span_fatal_err(self.prev_span, Error::UselessDocComment)
|
2016-09-16 05:46:40 +00:00
|
|
|
|
} else {
|
2018-03-08 11:27:23 +00:00
|
|
|
|
self.expected_ident_found()
|
2016-09-16 05:46:40 +00:00
|
|
|
|
})
|
2013-06-15 01:21:47 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
/// Check if the next token is `tok`, and return `true` if so.
|
|
|
|
|
///
|
2016-01-31 19:39:50 +00:00
|
|
|
|
/// This method will automatically add `tok` to `expected_tokens` if `tok` is not
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
/// encountered.
|
|
|
|
|
pub fn check(&mut self, tok: &token::Token) -> bool {
|
|
|
|
|
let is_present = self.token == *tok;
|
|
|
|
|
if !is_present { self.expected_tokens.push(TokenType::Token(tok.clone())); }
|
|
|
|
|
is_present
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Consume token 'tok' if it exists. Returns true if the given
|
|
|
|
|
/// token was present, false otherwise.
|
2015-12-30 23:11:53 +00:00
|
|
|
|
pub fn eat(&mut self, tok: &token::Token) -> bool {
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
let is_present = self.check(tok);
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if is_present { self.bump() }
|
|
|
|
|
is_present
|
2013-06-15 01:21:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-01-16 03:04:28 +00:00
|
|
|
|
pub fn check_keyword(&mut self, kw: keywords::Keyword) -> bool {
|
|
|
|
|
self.expected_tokens.push(TokenType::Keyword(kw));
|
|
|
|
|
self.token.is_keyword(kw)
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// If the next token is the given keyword, eat it and return
|
|
|
|
|
/// true. Otherwise, return false.
|
2015-12-30 23:11:53 +00:00
|
|
|
|
pub fn eat_keyword(&mut self, kw: keywords::Keyword) -> bool {
|
2015-01-16 03:04:28 +00:00
|
|
|
|
if self.check_keyword(kw) {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
|
|
|
|
true
|
2015-01-16 03:04:28 +00:00
|
|
|
|
} else {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
false
|
2015-01-16 03:04:28 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-30 23:11:53 +00:00
|
|
|
|
pub fn eat_keyword_noexpect(&mut self, kw: keywords::Keyword) -> bool {
|
2014-10-27 12:33:30 +00:00
|
|
|
|
if self.token.is_keyword(kw) {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
|
|
|
|
true
|
2014-08-28 04:34:03 +00:00
|
|
|
|
} else {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
false
|
2014-08-28 04:34:03 +00:00
|
|
|
|
}
|
2013-06-15 01:21:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// If the given word is not a keyword, signal an error.
|
|
|
|
|
/// If the next token is not the given word, signal an error.
|
|
|
|
|
/// Otherwise, eat it.
|
2015-12-20 21:00:43 +00:00
|
|
|
|
pub fn expect_keyword(&mut self, kw: keywords::Keyword) -> PResult<'a, ()> {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if !self.eat_keyword(kw) {
|
|
|
|
|
self.unexpected()
|
2015-03-28 21:58:51 +00:00
|
|
|
|
} else {
|
|
|
|
|
Ok(())
|
2013-06-15 01:21:47 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-18 16:01:04 +00:00
|
|
|
|
fn check_ident(&mut self) -> bool {
|
|
|
|
|
if self.token.is_ident() {
|
|
|
|
|
true
|
|
|
|
|
} else {
|
|
|
|
|
self.expected_tokens.push(TokenType::Ident);
|
|
|
|
|
false
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn check_path(&mut self) -> bool {
|
|
|
|
|
if self.token.is_path_start() {
|
|
|
|
|
true
|
|
|
|
|
} else {
|
|
|
|
|
self.expected_tokens.push(TokenType::Path);
|
|
|
|
|
false
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn check_type(&mut self) -> bool {
|
|
|
|
|
if self.token.can_begin_type() {
|
|
|
|
|
true
|
|
|
|
|
} else {
|
|
|
|
|
self.expected_tokens.push(TokenType::Type);
|
|
|
|
|
false
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-05-25 20:40:16 +00:00
|
|
|
|
/// Expect and consume a `+`. if `+=` is seen, replace it with a `=`
|
|
|
|
|
/// and continue. If a `+` is not seen, return false.
|
|
|
|
|
///
|
2018-05-25 21:36:23 +00:00
|
|
|
|
/// This is using when token splitting += into +.
|
2018-05-25 20:40:16 +00:00
|
|
|
|
/// See issue 47856 for an example of when this may occur.
|
|
|
|
|
fn eat_plus(&mut self) -> bool {
|
|
|
|
|
self.expected_tokens.push(TokenType::Token(token::BinOp(token::Plus)));
|
|
|
|
|
match self.token {
|
|
|
|
|
token::BinOp(token::Plus) => {
|
|
|
|
|
self.bump();
|
|
|
|
|
true
|
|
|
|
|
}
|
|
|
|
|
token::BinOpEq(token::Plus) => {
|
|
|
|
|
let span = self.span.with_lo(self.span.lo() + BytePos(1));
|
|
|
|
|
self.bump_with(token::Eq, span);
|
|
|
|
|
true
|
|
|
|
|
}
|
|
|
|
|
_ => false,
|
|
|
|
|
}
|
|
|
|
|
}
|
2018-05-25 21:36:23 +00:00
|
|
|
|
|
|
|
|
|
|
2018-05-25 21:09:32 +00:00
|
|
|
|
/// Checks to see if the next token is either `+` or `+=`.
|
|
|
|
|
/// Otherwise returns false.
|
|
|
|
|
fn check_plus(&mut self) -> bool {
|
|
|
|
|
if self.token.is_like_plus() {
|
|
|
|
|
true
|
|
|
|
|
}
|
|
|
|
|
else {
|
2018-06-01 13:52:51 +00:00
|
|
|
|
self.expected_tokens.push(TokenType::Token(token::BinOp(token::Plus)));
|
|
|
|
|
false
|
2018-05-25 21:09:32 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2017-01-18 16:01:04 +00:00
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Expect and consume an `&`. If `&&` is seen, replace it with a single
|
|
|
|
|
/// `&` and continue. If an `&` is not seen, signal an error.
|
2015-12-20 21:00:43 +00:00
|
|
|
|
fn expect_and(&mut self) -> PResult<'a, ()> {
|
2015-01-16 03:04:28 +00:00
|
|
|
|
self.expected_tokens.push(TokenType::Token(token::BinOp(token::And)));
|
2014-04-17 08:35:31 +00:00
|
|
|
|
match self.token {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
token::BinOp(token::And) => {
|
|
|
|
|
self.bump();
|
|
|
|
|
Ok(())
|
|
|
|
|
}
|
2014-10-27 08:22:52 +00:00
|
|
|
|
token::AndAnd => {
|
2017-07-31 20:04:34 +00:00
|
|
|
|
let span = self.span.with_lo(self.span.lo() + BytePos(1));
|
|
|
|
|
Ok(self.bump_with(token::BinOp(token::And), span))
|
2014-04-17 08:35:31 +00:00
|
|
|
|
}
|
2015-12-30 23:11:53 +00:00
|
|
|
|
_ => self.unexpected()
|
2014-04-17 08:35:31 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-09-07 06:07:49 +00:00
|
|
|
|
/// Expect and consume an `|`. If `||` is seen, replace it with a single
|
|
|
|
|
/// `|` and continue. If an `|` is not seen, signal an error.
|
|
|
|
|
fn expect_or(&mut self) -> PResult<'a, ()> {
|
|
|
|
|
self.expected_tokens.push(TokenType::Token(token::BinOp(token::Or)));
|
|
|
|
|
match self.token {
|
|
|
|
|
token::BinOp(token::Or) => {
|
|
|
|
|
self.bump();
|
|
|
|
|
Ok(())
|
|
|
|
|
}
|
|
|
|
|
token::OrOr => {
|
|
|
|
|
let span = self.span.with_lo(self.span.lo() + BytePos(1));
|
|
|
|
|
Ok(self.bump_with(token::BinOp(token::Or), span))
|
|
|
|
|
}
|
|
|
|
|
_ => self.unexpected()
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-01-21 11:44:49 +00:00
|
|
|
|
pub fn expect_no_suffix(&self, sp: Span, kind: &str, suffix: Option<ast::Name>) {
|
2014-11-19 04:48:38 +00:00
|
|
|
|
match suffix {
|
|
|
|
|
None => {/* everything ok */}
|
|
|
|
|
Some(suf) => {
|
|
|
|
|
let text = suf.as_str();
|
|
|
|
|
if text.is_empty() {
|
2014-11-19 09:22:54 +00:00
|
|
|
|
self.span_bug(sp, "found empty literal suffix in Some")
|
2014-11-19 04:48:38 +00:00
|
|
|
|
}
|
2016-02-08 22:55:55 +00:00
|
|
|
|
self.span_err(sp, &format!("{} with a suffix is invalid", kind));
|
2014-11-19 04:48:38 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Attempt to consume a `<`. If `<<` is seen, replace it with a single
|
|
|
|
|
/// `<` and continue. If a `<` is not seen, return false.
|
|
|
|
|
///
|
|
|
|
|
/// This is meant to be used when parsing generics on a path to get the
|
2014-12-23 00:13:49 +00:00
|
|
|
|
/// starting token.
|
2015-12-30 23:11:53 +00:00
|
|
|
|
fn eat_lt(&mut self) -> bool {
|
2015-01-16 03:04:28 +00:00
|
|
|
|
self.expected_tokens.push(TokenType::Token(token::Lt));
|
2014-05-11 04:27:44 +00:00
|
|
|
|
match self.token {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
token::Lt => {
|
|
|
|
|
self.bump();
|
|
|
|
|
true
|
|
|
|
|
}
|
2014-10-27 08:22:52 +00:00
|
|
|
|
token::BinOp(token::Shl) => {
|
2017-07-31 20:04:34 +00:00
|
|
|
|
let span = self.span.with_lo(self.span.lo() + BytePos(1));
|
|
|
|
|
self.bump_with(token::Lt, span);
|
2015-12-30 23:11:53 +00:00
|
|
|
|
true
|
2014-05-11 04:27:44 +00:00
|
|
|
|
}
|
2015-12-30 23:11:53 +00:00
|
|
|
|
_ => false,
|
2014-05-11 04:27:44 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-20 21:00:43 +00:00
|
|
|
|
fn expect_lt(&mut self) -> PResult<'a, ()> {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if !self.eat_lt() {
|
|
|
|
|
self.unexpected()
|
2015-03-28 21:58:51 +00:00
|
|
|
|
} else {
|
|
|
|
|
Ok(())
|
2014-05-11 04:27:44 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Expect and consume a GT. if a >> is seen, replace it
|
|
|
|
|
/// with a single > and continue. If a GT is not seen,
|
|
|
|
|
/// signal an error.
|
2015-12-20 21:00:43 +00:00
|
|
|
|
pub fn expect_gt(&mut self) -> PResult<'a, ()> {
|
2015-01-16 03:04:28 +00:00
|
|
|
|
self.expected_tokens.push(TokenType::Token(token::Gt));
|
2013-12-30 23:09:41 +00:00
|
|
|
|
match self.token {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
token::Gt => {
|
|
|
|
|
self.bump();
|
|
|
|
|
Ok(())
|
|
|
|
|
}
|
2014-10-27 08:22:52 +00:00
|
|
|
|
token::BinOp(token::Shr) => {
|
2017-07-31 20:04:34 +00:00
|
|
|
|
let span = self.span.with_lo(self.span.lo() + BytePos(1));
|
|
|
|
|
Ok(self.bump_with(token::Gt, span))
|
2013-12-30 23:17:53 +00:00
|
|
|
|
}
|
2014-10-27 08:22:52 +00:00
|
|
|
|
token::BinOpEq(token::Shr) => {
|
2017-07-31 20:04:34 +00:00
|
|
|
|
let span = self.span.with_lo(self.span.lo() + BytePos(1));
|
|
|
|
|
Ok(self.bump_with(token::Ge, span))
|
2014-06-20 16:53:12 +00:00
|
|
|
|
}
|
2014-10-27 08:22:52 +00:00
|
|
|
|
token::Ge => {
|
2017-07-31 20:04:34 +00:00
|
|
|
|
let span = self.span.with_lo(self.span.lo() + BytePos(1));
|
|
|
|
|
Ok(self.bump_with(token::Eq, span))
|
2014-06-20 16:53:12 +00:00
|
|
|
|
}
|
2017-01-17 18:18:29 +00:00
|
|
|
|
_ => self.unexpected()
|
2013-06-15 01:21:47 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-12-08 18:28:32 +00:00
|
|
|
|
pub fn parse_seq_to_before_gt_or_return<T, F>(&mut self,
|
|
|
|
|
sep: Option<token::Token>,
|
|
|
|
|
mut f: F)
|
2017-01-16 22:54:59 +00:00
|
|
|
|
-> PResult<'a, (Vec<T>, bool)>
|
2015-12-20 21:00:43 +00:00
|
|
|
|
where F: FnMut(&mut Parser<'a>) -> PResult<'a, Option<T>>,
|
2014-12-08 18:28:32 +00:00
|
|
|
|
{
|
2014-03-19 12:16:56 +00:00
|
|
|
|
let mut v = Vec::new();
|
2014-08-21 04:37:15 +00:00
|
|
|
|
// This loop works by alternating back and forth between parsing types
|
|
|
|
|
// and commas. For example, given a string `A, B,>`, the parser would
|
|
|
|
|
// first parse `A`, then a comma, then `B`, then a comma. After that it
|
|
|
|
|
// would encounter a `>` and stop. This lets the parser handle trailing
|
|
|
|
|
// commas in generic parameters, because it can stop either after
|
|
|
|
|
// parsing a type or after parsing a comma.
|
2015-03-13 18:35:53 +00:00
|
|
|
|
for i in 0.. {
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
if self.check(&token::Gt)
|
2014-10-27 08:22:52 +00:00
|
|
|
|
|| self.token == token::BinOp(token::Shr)
|
|
|
|
|
|| self.token == token::Ge
|
|
|
|
|
|| self.token == token::BinOpEq(token::Shr) {
|
2014-08-21 04:37:15 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if i % 2 == 0 {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
match f(self)? {
|
2014-11-29 04:08:30 +00:00
|
|
|
|
Some(result) => v.push(result),
|
2017-01-16 22:54:59 +00:00
|
|
|
|
None => return Ok((v, true))
|
2014-11-29 04:08:30 +00:00
|
|
|
|
}
|
2014-08-21 04:37:15 +00:00
|
|
|
|
} else {
|
2015-03-28 21:58:51 +00:00
|
|
|
|
if let Some(t) = sep.as_ref() {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(t)?;
|
2015-03-28 21:58:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-06-15 01:21:47 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2017-01-16 22:54:59 +00:00
|
|
|
|
return Ok((v, false));
|
2014-11-29 04:08:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Parse a sequence bracketed by '<' and '>', stopping
|
|
|
|
|
/// before the '>'.
|
2014-12-08 18:28:32 +00:00
|
|
|
|
pub fn parse_seq_to_before_gt<T, F>(&mut self,
|
|
|
|
|
sep: Option<token::Token>,
|
|
|
|
|
mut f: F)
|
2017-01-16 22:54:59 +00:00
|
|
|
|
-> PResult<'a, Vec<T>> where
|
2015-12-20 21:00:43 +00:00
|
|
|
|
F: FnMut(&mut Parser<'a>) -> PResult<'a, T>,
|
2014-12-08 18:28:32 +00:00
|
|
|
|
{
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let (result, returned) = self.parse_seq_to_before_gt_or_return(sep,
|
2016-03-22 22:58:45 +00:00
|
|
|
|
|p| Ok(Some(f(p)?)))?;
|
2014-11-29 04:08:30 +00:00
|
|
|
|
assert!(!returned);
|
2015-03-28 21:58:51 +00:00
|
|
|
|
return Ok(result);
|
2013-06-15 01:21:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-12-08 18:28:32 +00:00
|
|
|
|
pub fn parse_seq_to_gt<T, F>(&mut self,
|
|
|
|
|
sep: Option<token::Token>,
|
|
|
|
|
f: F)
|
2017-01-16 22:54:59 +00:00
|
|
|
|
-> PResult<'a, Vec<T>> where
|
2015-12-20 21:00:43 +00:00
|
|
|
|
F: FnMut(&mut Parser<'a>) -> PResult<'a, T>,
|
2014-12-08 18:28:32 +00:00
|
|
|
|
{
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let v = self.parse_seq_to_before_gt(sep, f)?;
|
|
|
|
|
self.expect_gt()?;
|
2015-03-28 21:58:51 +00:00
|
|
|
|
return Ok(v);
|
2013-06-15 01:21:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-12-08 18:28:32 +00:00
|
|
|
|
pub fn parse_seq_to_gt_or_return<T, F>(&mut self,
|
|
|
|
|
sep: Option<token::Token>,
|
|
|
|
|
f: F)
|
2017-01-16 22:54:59 +00:00
|
|
|
|
-> PResult<'a, (Vec<T>, bool)> where
|
2015-12-20 21:00:43 +00:00
|
|
|
|
F: FnMut(&mut Parser<'a>) -> PResult<'a, Option<T>>,
|
2014-12-08 18:28:32 +00:00
|
|
|
|
{
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let (v, returned) = self.parse_seq_to_before_gt_or_return(sep, f)?;
|
2014-11-29 04:08:30 +00:00
|
|
|
|
if !returned {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect_gt()?;
|
2014-11-29 04:08:30 +00:00
|
|
|
|
}
|
2015-03-28 21:58:51 +00:00
|
|
|
|
return Ok((v, returned));
|
2014-11-29 04:08:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-01-31 19:39:50 +00:00
|
|
|
|
/// Eat and discard tokens until one of `kets` is encountered. Respects token trees,
|
|
|
|
|
/// passes through any errors encountered. Used for error recovery.
|
|
|
|
|
pub fn eat_to_tokens(&mut self, kets: &[&token::Token]) {
|
2016-09-15 19:34:21 +00:00
|
|
|
|
let handler = self.diagnostic();
|
|
|
|
|
|
2017-10-22 16:19:30 +00:00
|
|
|
|
if let Err(ref mut err) = self.parse_seq_to_before_tokens(kets,
|
|
|
|
|
SeqSep::none(),
|
|
|
|
|
TokenExpectType::Expect,
|
|
|
|
|
|p| Ok(p.parse_token_tree())) {
|
|
|
|
|
handler.cancel(err);
|
|
|
|
|
}
|
2016-01-31 19:39:50 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse a sequence, including the closing delimiter. The function
|
|
|
|
|
/// f must consume tokens until reaching the next separator or
|
|
|
|
|
/// closing bracket.
|
2014-12-08 18:28:32 +00:00
|
|
|
|
pub fn parse_seq_to_end<T, F>(&mut self,
|
|
|
|
|
ket: &token::Token,
|
|
|
|
|
sep: SeqSep,
|
|
|
|
|
f: F)
|
2015-12-20 21:00:43 +00:00
|
|
|
|
-> PResult<'a, Vec<T>> where
|
|
|
|
|
F: FnMut(&mut Parser<'a>) -> PResult<'a, T>,
|
2014-12-08 18:28:32 +00:00
|
|
|
|
{
|
2017-10-22 16:19:30 +00:00
|
|
|
|
let val = self.parse_seq_to_before_end(ket, sep, f)?;
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(val)
|
2013-06-15 01:21:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse a sequence, not including the closing delimiter. The function
|
|
|
|
|
/// f must consume tokens until reaching the next separator or
|
|
|
|
|
/// closing bracket.
|
2014-12-08 18:28:32 +00:00
|
|
|
|
pub fn parse_seq_to_before_end<T, F>(&mut self,
|
|
|
|
|
ket: &token::Token,
|
|
|
|
|
sep: SeqSep,
|
2016-01-31 19:39:50 +00:00
|
|
|
|
f: F)
|
2017-10-22 16:19:30 +00:00
|
|
|
|
-> PResult<'a, Vec<T>>
|
|
|
|
|
where F: FnMut(&mut Parser<'a>) -> PResult<'a, T>
|
2016-01-31 19:39:50 +00:00
|
|
|
|
{
|
2017-10-22 16:19:30 +00:00
|
|
|
|
self.parse_seq_to_before_tokens(&[ket], sep, TokenExpectType::Expect, f)
|
2016-01-31 19:39:50 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-10-22 16:19:30 +00:00
|
|
|
|
fn parse_seq_to_before_tokens<T, F>(&mut self,
|
2016-01-31 19:39:50 +00:00
|
|
|
|
kets: &[&token::Token],
|
|
|
|
|
sep: SeqSep,
|
2017-09-07 06:07:49 +00:00
|
|
|
|
expect: TokenExpectType,
|
2017-10-22 16:19:30 +00:00
|
|
|
|
mut f: F)
|
|
|
|
|
-> PResult<'a, Vec<T>>
|
|
|
|
|
where F: FnMut(&mut Parser<'a>) -> PResult<'a, T>
|
2014-12-08 18:28:32 +00:00
|
|
|
|
{
|
2013-06-15 01:21:47 +00:00
|
|
|
|
let mut first: bool = true;
|
2016-10-29 21:54:04 +00:00
|
|
|
|
let mut v = vec![];
|
2018-06-01 14:05:46 +00:00
|
|
|
|
while !kets.iter().any(|k| {
|
|
|
|
|
match expect {
|
|
|
|
|
TokenExpectType::Expect => self.check(k),
|
|
|
|
|
TokenExpectType::NoExpect => self.token == **k,
|
|
|
|
|
}
|
|
|
|
|
}) {
|
2017-02-08 23:38:41 +00:00
|
|
|
|
match self.token {
|
|
|
|
|
token::CloseDelim(..) | token::Eof => break,
|
|
|
|
|
_ => {}
|
|
|
|
|
};
|
2017-05-12 18:05:39 +00:00
|
|
|
|
if let Some(ref t) = sep.sep {
|
|
|
|
|
if first {
|
|
|
|
|
first = false;
|
|
|
|
|
} else {
|
2017-10-22 16:19:30 +00:00
|
|
|
|
if let Err(mut e) = self.expect(t) {
|
2017-10-24 13:04:01 +00:00
|
|
|
|
// Attempt to keep parsing if it was a similar separator
|
|
|
|
|
if let Some(ref tokens) = t.similar_tokens() {
|
|
|
|
|
if tokens.contains(&self.token) {
|
|
|
|
|
self.bump();
|
|
|
|
|
}
|
|
|
|
|
}
|
2017-10-22 16:19:30 +00:00
|
|
|
|
e.emit();
|
2017-10-24 13:04:01 +00:00
|
|
|
|
// Attempt to keep parsing if it was an omitted separator
|
|
|
|
|
match f(self) {
|
|
|
|
|
Ok(t) => {
|
|
|
|
|
v.push(t);
|
|
|
|
|
continue;
|
|
|
|
|
},
|
|
|
|
|
Err(mut e) => {
|
|
|
|
|
e.cancel();
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2016-01-29 04:49:59 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2013-06-15 01:21:47 +00:00
|
|
|
|
}
|
2017-09-07 06:07:49 +00:00
|
|
|
|
if sep.trailing_sep_allowed && kets.iter().any(|k| {
|
|
|
|
|
match expect {
|
|
|
|
|
TokenExpectType::Expect => self.check(k),
|
|
|
|
|
TokenExpectType::NoExpect => self.token == **k,
|
|
|
|
|
}
|
|
|
|
|
}) {
|
2016-01-31 19:39:50 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
2016-01-29 04:49:59 +00:00
|
|
|
|
|
2017-10-22 16:19:30 +00:00
|
|
|
|
let t = f(self)?;
|
|
|
|
|
v.push(t);
|
2013-06-15 01:21:47 +00:00
|
|
|
|
}
|
2016-01-29 04:49:59 +00:00
|
|
|
|
|
2017-10-22 16:19:30 +00:00
|
|
|
|
Ok(v)
|
2013-06-15 01:21:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse a sequence, including the closing delimiter. The function
|
|
|
|
|
/// f must consume tokens until reaching the next separator or
|
|
|
|
|
/// closing bracket.
|
2014-12-08 18:28:32 +00:00
|
|
|
|
pub fn parse_unspanned_seq<T, F>(&mut self,
|
|
|
|
|
bra: &token::Token,
|
|
|
|
|
ket: &token::Token,
|
|
|
|
|
sep: SeqSep,
|
|
|
|
|
f: F)
|
2015-12-20 21:00:43 +00:00
|
|
|
|
-> PResult<'a, Vec<T>> where
|
2018-02-19 00:59:33 +00:00
|
|
|
|
F: FnMut(&mut Parser<'a>) -> PResult<'a, T>,
|
2014-12-08 18:28:32 +00:00
|
|
|
|
{
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(bra)?;
|
2017-10-22 16:19:30 +00:00
|
|
|
|
let result = self.parse_seq_to_before_end(ket, sep, f)?;
|
2016-03-26 19:37:53 +00:00
|
|
|
|
if self.token == *ket {
|
|
|
|
|
self.bump();
|
|
|
|
|
}
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(result)
|
2013-06-15 01:21:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// NB: Do not use this function unless you actually plan to place the
|
|
|
|
|
// spanned list in the AST.
|
2014-12-08 18:28:32 +00:00
|
|
|
|
pub fn parse_seq<T, F>(&mut self,
|
|
|
|
|
bra: &token::Token,
|
|
|
|
|
ket: &token::Token,
|
|
|
|
|
sep: SeqSep,
|
|
|
|
|
f: F)
|
2015-12-20 21:00:43 +00:00
|
|
|
|
-> PResult<'a, Spanned<Vec<T>>> where
|
2018-02-19 00:59:33 +00:00
|
|
|
|
F: FnMut(&mut Parser<'a>) -> PResult<'a, T>,
|
2014-12-08 18:28:32 +00:00
|
|
|
|
{
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(bra)?;
|
2017-10-22 16:19:30 +00:00
|
|
|
|
let result = self.parse_seq_to_before_end(ket, sep, f)?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let hi = self.span;
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2017-03-15 00:22:48 +00:00
|
|
|
|
Ok(respan(lo.to(hi), result))
|
2013-06-15 01:21:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Advance the parser by one token
|
2015-12-30 23:11:53 +00:00
|
|
|
|
pub fn bump(&mut self) {
|
2016-09-21 02:16:28 +00:00
|
|
|
|
if self.prev_token_kind == PrevTokenKind::Eof {
|
2016-03-25 22:13:54 +00:00
|
|
|
|
// Bumping after EOF is a bad sign, usually an infinite loop.
|
|
|
|
|
self.bug("attempted to bump the parser past EOF (may be stuck in a loop)");
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-29 07:17:18 +00:00
|
|
|
|
self.prev_span = self.meta_var_span.take().unwrap_or(self.span);
|
2016-09-16 05:46:40 +00:00
|
|
|
|
|
|
|
|
|
// Record last token kind for possible error recovery.
|
2016-09-21 02:16:28 +00:00
|
|
|
|
self.prev_token_kind = match self.token {
|
|
|
|
|
token::DocComment(..) => PrevTokenKind::DocComment,
|
|
|
|
|
token::Comma => PrevTokenKind::Comma,
|
2017-04-04 22:12:53 +00:00
|
|
|
|
token::BinOp(token::Plus) => PrevTokenKind::Plus,
|
2016-09-21 02:16:28 +00:00
|
|
|
|
token::Interpolated(..) => PrevTokenKind::Interpolated,
|
|
|
|
|
token::Eof => PrevTokenKind::Eof,
|
2017-07-04 14:04:34 +00:00
|
|
|
|
token::Ident(..) => PrevTokenKind::Ident,
|
2016-09-21 02:16:28 +00:00
|
|
|
|
_ => PrevTokenKind::Other,
|
2013-08-05 20:18:29 +00:00
|
|
|
|
};
|
2016-09-16 05:46:40 +00:00
|
|
|
|
|
2017-01-14 11:13:45 +00:00
|
|
|
|
let next = self.next_tok();
|
2013-12-30 23:17:53 +00:00
|
|
|
|
self.span = next.sp;
|
2013-12-30 23:09:41 +00:00
|
|
|
|
self.token = next.tok;
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
self.expected_tokens.clear();
|
2015-01-02 22:00:06 +00:00
|
|
|
|
// check after each token
|
2017-03-29 07:17:18 +00:00
|
|
|
|
self.process_potential_macro_variable();
|
2012-01-13 08:56:53 +00:00
|
|
|
|
}
|
2013-07-02 19:47:32 +00:00
|
|
|
|
|
2016-02-06 17:42:17 +00:00
|
|
|
|
/// Advance the parser using provided token as a next one. Use this when
|
|
|
|
|
/// consuming a part of a token. For example a single `<` from `<<`.
|
2017-03-15 00:22:48 +00:00
|
|
|
|
pub fn bump_with(&mut self, next: token::Token, span: Span) {
|
2017-07-31 20:04:34 +00:00
|
|
|
|
self.prev_span = self.span.with_hi(span.lo());
|
2016-09-16 05:46:40 +00:00
|
|
|
|
// It would be incorrect to record the kind of the current token, but
|
|
|
|
|
// fortunately for tokens currently using `bump_with`, the
|
2016-09-21 02:16:28 +00:00
|
|
|
|
// prev_token_kind will be of no use anyway.
|
|
|
|
|
self.prev_token_kind = PrevTokenKind::Other;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
self.span = span;
|
2016-02-06 17:42:17 +00:00
|
|
|
|
self.token = next;
|
|
|
|
|
self.expected_tokens.clear();
|
2012-01-13 08:56:53 +00:00
|
|
|
|
}
|
2016-02-06 17:42:17 +00:00
|
|
|
|
|
2017-03-05 05:15:58 +00:00
|
|
|
|
pub fn look_ahead<R, F>(&self, dist: usize, f: F) -> R where
|
2014-12-08 18:28:32 +00:00
|
|
|
|
F: FnOnce(&token::Token) -> R,
|
|
|
|
|
{
|
2016-10-19 20:33:41 +00:00
|
|
|
|
if dist == 0 {
|
2017-02-20 05:44:06 +00:00
|
|
|
|
return f(&self.token)
|
2012-01-13 08:56:53 +00:00
|
|
|
|
}
|
2017-02-20 05:44:06 +00:00
|
|
|
|
|
|
|
|
|
f(&match self.token_cursor.frame.tree_cursor.look_ahead(dist - 1) {
|
|
|
|
|
Some(tree) => match tree {
|
|
|
|
|
TokenTree::Token(_, tok) => tok,
|
|
|
|
|
TokenTree::Delimited(_, delimited) => token::OpenDelim(delimited.delim),
|
|
|
|
|
},
|
|
|
|
|
None => token::CloseDelim(self.token_cursor.frame.delim),
|
|
|
|
|
})
|
2012-01-13 08:56:53 +00:00
|
|
|
|
}
|
2017-11-21 14:49:15 +00:00
|
|
|
|
|
2017-07-03 23:17:01 +00:00
|
|
|
|
fn look_ahead_span(&self, dist: usize) -> Span {
|
|
|
|
|
if dist == 0 {
|
|
|
|
|
return self.span
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
match self.token_cursor.frame.tree_cursor.look_ahead(dist - 1) {
|
|
|
|
|
Some(TokenTree::Token(span, _)) | Some(TokenTree::Delimited(span, _)) => span,
|
|
|
|
|
None => self.look_ahead_span(dist - 1),
|
|
|
|
|
}
|
|
|
|
|
}
|
2015-12-20 21:00:43 +00:00
|
|
|
|
pub fn fatal(&self, m: &str) -> DiagnosticBuilder<'a> {
|
|
|
|
|
self.sess.span_diagnostic.struct_span_fatal(self.span, m)
|
2012-01-13 08:56:53 +00:00
|
|
|
|
}
|
2018-01-16 05:38:12 +00:00
|
|
|
|
pub fn span_fatal<S: Into<MultiSpan>>(&self, sp: S, m: &str) -> DiagnosticBuilder<'a> {
|
2015-12-20 21:00:43 +00:00
|
|
|
|
self.sess.span_diagnostic.struct_span_fatal(sp, m)
|
2012-01-13 08:56:53 +00:00
|
|
|
|
}
|
2018-01-16 05:38:12 +00:00
|
|
|
|
pub fn span_fatal_err<S: Into<MultiSpan>>(&self, sp: S, err: Error) -> DiagnosticBuilder<'a> {
|
2017-02-12 13:33:17 +00:00
|
|
|
|
err.span_err(sp, self.diagnostic())
|
|
|
|
|
}
|
2018-01-16 05:38:12 +00:00
|
|
|
|
pub fn span_fatal_help<S: Into<MultiSpan>>(&self,
|
|
|
|
|
sp: S,
|
|
|
|
|
m: &str,
|
|
|
|
|
help: &str) -> DiagnosticBuilder<'a> {
|
2015-12-20 21:00:43 +00:00
|
|
|
|
let mut err = self.sess.span_diagnostic.struct_span_fatal(sp, m);
|
2016-04-20 18:49:16 +00:00
|
|
|
|
err.help(help);
|
2015-12-20 21:00:43 +00:00
|
|
|
|
err
|
2015-02-24 14:07:54 +00:00
|
|
|
|
}
|
2015-01-21 11:44:49 +00:00
|
|
|
|
pub fn bug(&self, m: &str) -> ! {
|
2013-12-30 23:17:53 +00:00
|
|
|
|
self.sess.span_diagnostic.span_bug(self.span, m)
|
2012-04-19 23:44:24 +00:00
|
|
|
|
}
|
2015-01-21 11:44:49 +00:00
|
|
|
|
pub fn warn(&self, m: &str) {
|
2013-12-30 23:17:53 +00:00
|
|
|
|
self.sess.span_diagnostic.span_warn(self.span, m)
|
2012-01-13 08:56:53 +00:00
|
|
|
|
}
|
2018-01-16 05:38:12 +00:00
|
|
|
|
pub fn span_warn<S: Into<MultiSpan>>(&self, sp: S, m: &str) {
|
2014-03-22 01:05:05 +00:00
|
|
|
|
self.sess.span_diagnostic.span_warn(sp, m)
|
|
|
|
|
}
|
2018-01-16 05:38:12 +00:00
|
|
|
|
pub fn span_err<S: Into<MultiSpan>>(&self, sp: S, m: &str) {
|
2012-09-08 22:50:29 +00:00
|
|
|
|
self.sess.span_diagnostic.span_err(sp, m)
|
|
|
|
|
}
|
2018-01-16 05:38:12 +00:00
|
|
|
|
pub fn struct_span_err<S: Into<MultiSpan>>(&self, sp: S, m: &str) -> DiagnosticBuilder<'a> {
|
2017-12-16 08:58:19 +00:00
|
|
|
|
self.sess.span_diagnostic.struct_span_err(sp, m)
|
|
|
|
|
}
|
2018-01-16 05:38:12 +00:00
|
|
|
|
pub fn span_err_help<S: Into<MultiSpan>>(&self, sp: S, m: &str, h: &str) {
|
2016-05-28 02:05:22 +00:00
|
|
|
|
let mut err = self.sess.span_diagnostic.mut_span_err(sp, m);
|
|
|
|
|
err.help(h);
|
|
|
|
|
err.emit();
|
|
|
|
|
}
|
2018-01-16 05:38:12 +00:00
|
|
|
|
pub fn span_bug<S: Into<MultiSpan>>(&self, sp: S, m: &str) -> ! {
|
2014-11-19 04:48:38 +00:00
|
|
|
|
self.sess.span_diagnostic.span_bug(sp, m)
|
|
|
|
|
}
|
2015-01-21 11:44:49 +00:00
|
|
|
|
pub fn abort_if_errors(&self) {
|
2015-12-13 22:17:55 +00:00
|
|
|
|
self.sess.span_diagnostic.abort_if_errors();
|
2012-09-08 22:50:29 +00:00
|
|
|
|
}
|
2011-03-18 00:39:47 +00:00
|
|
|
|
|
2016-09-15 19:34:21 +00:00
|
|
|
|
fn cancel(&self, err: &mut DiagnosticBuilder) {
|
|
|
|
|
self.sess.span_diagnostic.cancel(err)
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-20 21:00:43 +00:00
|
|
|
|
pub fn diagnostic(&self) -> &'a errors::Handler {
|
|
|
|
|
&self.sess.span_diagnostic
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Is the current token one of the keywords that signals a bare function
|
|
|
|
|
/// type?
|
2013-12-30 22:04:00 +00:00
|
|
|
|
pub fn token_is_bare_fn_keyword(&mut self) -> bool {
|
2015-01-16 03:04:28 +00:00
|
|
|
|
self.check_keyword(keywords::Fn) ||
|
|
|
|
|
self.check_keyword(keywords::Unsafe) ||
|
2018-02-22 21:54:30 +00:00
|
|
|
|
self.check_keyword(keywords::Extern) && self.is_extern_non_path()
|
2013-10-29 22:06:13 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-02-08 15:53:21 +00:00
|
|
|
|
/// parse a TyKind::BareFn type:
|
2017-10-16 19:07:26 +00:00
|
|
|
|
pub fn parse_ty_bare_fn(&mut self, generic_params: Vec<GenericParam>)
|
2016-02-08 15:53:21 +00:00
|
|
|
|
-> PResult<'a, TyKind> {
|
2012-11-05 04:41:00 +00:00
|
|
|
|
/*
|
|
|
|
|
|
2016-04-04 14:24:57 +00:00
|
|
|
|
[unsafe] [extern "ABI"] fn (S) -> T
|
|
|
|
|
^~~~^ ^~~~^ ^~^ ^
|
|
|
|
|
| | | |
|
|
|
|
|
| | | Return type
|
|
|
|
|
| | Argument types
|
|
|
|
|
| |
|
2014-05-07 01:43:56 +00:00
|
|
|
|
| ABI
|
|
|
|
|
Function Style
|
2013-02-01 01:12:29 +00:00
|
|
|
|
*/
|
|
|
|
|
|
2017-12-02 19:15:03 +00:00
|
|
|
|
let unsafety = self.parse_unsafety();
|
2015-12-30 23:11:53 +00:00
|
|
|
|
let abi = if self.eat_keyword(keywords::Extern) {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.parse_opt_abi()?.unwrap_or(Abi::C)
|
2014-02-14 04:23:01 +00:00
|
|
|
|
} else {
|
2016-02-05 12:13:36 +00:00
|
|
|
|
Abi::Rust
|
2014-02-14 04:23:01 +00:00
|
|
|
|
};
|
2014-02-02 22:52:06 +00:00
|
|
|
|
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect_keyword(keywords::Fn)?;
|
|
|
|
|
let (inputs, variadic) = self.parse_fn_args(false, true)?;
|
2018-01-18 17:59:28 +00:00
|
|
|
|
let ret_ty = self.parse_ret_ty(false)?;
|
2014-11-07 11:53:45 +00:00
|
|
|
|
let decl = P(FnDecl {
|
2017-08-07 05:54:09 +00:00
|
|
|
|
inputs,
|
2014-11-07 11:53:45 +00:00
|
|
|
|
output: ret_ty,
|
2017-08-07 05:54:09 +00:00
|
|
|
|
variadic,
|
2014-11-07 11:53:45 +00:00
|
|
|
|
});
|
2016-02-08 15:53:21 +00:00
|
|
|
|
Ok(TyKind::BareFn(P(BareFnTy {
|
2017-08-07 05:54:09 +00:00
|
|
|
|
abi,
|
|
|
|
|
unsafety,
|
2017-10-16 19:07:26 +00:00
|
|
|
|
generic_params,
|
2017-08-07 05:54:09 +00:00
|
|
|
|
decl,
|
2015-03-28 21:58:51 +00:00
|
|
|
|
})))
|
2013-02-01 01:12:29 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-12-02 19:15:03 +00:00
|
|
|
|
/// Parse unsafety: `unsafe` or nothing.
|
|
|
|
|
fn parse_unsafety(&mut self) -> Unsafety {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::Unsafe) {
|
2017-12-02 19:15:03 +00:00
|
|
|
|
Unsafety::Unsafe
|
2013-02-01 01:12:29 +00:00
|
|
|
|
} else {
|
2017-12-02 19:15:03 +00:00
|
|
|
|
Unsafety::Normal
|
2013-02-01 01:12:29 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2012-11-05 04:41:00 +00:00
|
|
|
|
|
2014-08-06 02:44:21 +00:00
|
|
|
|
/// Parse the items in a trait declaration
|
2017-04-13 19:37:05 +00:00
|
|
|
|
pub fn parse_trait_item(&mut self, at_end: &mut bool) -> PResult<'a, TraitItem> {
|
2016-11-02 03:03:55 +00:00
|
|
|
|
maybe_whole!(self, NtTraitItem, |x| x);
|
2017-07-12 16:50:05 +00:00
|
|
|
|
let attrs = self.parse_outer_attributes()?;
|
|
|
|
|
let (mut item, tokens) = self.collect_tokens(|this| {
|
|
|
|
|
this.parse_trait_item_(at_end, attrs)
|
|
|
|
|
})?;
|
|
|
|
|
// See `parse_item` for why this clause is here.
|
|
|
|
|
if !item.attrs.iter().any(|attr| attr.style == AttrStyle::Inner) {
|
|
|
|
|
item.tokens = Some(tokens);
|
|
|
|
|
}
|
|
|
|
|
Ok(item)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn parse_trait_item_(&mut self,
|
|
|
|
|
at_end: &mut bool,
|
|
|
|
|
mut attrs: Vec<Attribute>) -> PResult<'a, TraitItem> {
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
2016-06-11 01:00:07 +00:00
|
|
|
|
|
2017-09-22 02:18:47 +00:00
|
|
|
|
let (name, node, generics) = if self.eat_keyword(keywords::Type) {
|
2017-11-05 21:14:22 +00:00
|
|
|
|
let (generics, TyParam {ident, bounds, default, ..}) =
|
|
|
|
|
self.parse_trait_item_assoc_ty(vec![])?;
|
|
|
|
|
(ident, TraitItemKind::Type(bounds, default), generics)
|
2016-06-11 01:00:07 +00:00
|
|
|
|
} else if self.is_const_item() {
|
2017-04-13 19:37:05 +00:00
|
|
|
|
self.expect_keyword(keywords::Const)?;
|
2016-06-11 01:00:07 +00:00
|
|
|
|
let ident = self.parse_ident()?;
|
|
|
|
|
self.expect(&token::Colon)?;
|
2017-01-16 23:13:41 +00:00
|
|
|
|
let ty = self.parse_ty()?;
|
2016-06-11 01:00:07 +00:00
|
|
|
|
let default = if self.check(&token::Eq) {
|
|
|
|
|
self.bump();
|
|
|
|
|
let expr = self.parse_expr()?;
|
2016-07-01 23:40:45 +00:00
|
|
|
|
self.expect(&token::Semi)?;
|
2016-06-11 01:00:07 +00:00
|
|
|
|
Some(expr)
|
2014-05-29 05:26:56 +00:00
|
|
|
|
} else {
|
2016-06-11 01:00:07 +00:00
|
|
|
|
self.expect(&token::Semi)?;
|
|
|
|
|
None
|
|
|
|
|
};
|
2017-09-22 02:18:47 +00:00
|
|
|
|
(ident, TraitItemKind::Const(ty, default), ast::Generics::default())
|
2018-03-11 02:16:26 +00:00
|
|
|
|
} else if let Some(mac) = self.parse_assoc_macro_invoc("trait", None, &mut false)? {
|
2016-09-22 22:44:59 +00:00
|
|
|
|
// trait item macro.
|
2017-09-22 02:18:47 +00:00
|
|
|
|
(keywords::Invalid.ident(), ast::TraitItemKind::Macro(mac), ast::Generics::default())
|
2016-09-22 22:44:59 +00:00
|
|
|
|
} else {
|
2017-06-04 05:10:14 +00:00
|
|
|
|
let (constness, unsafety, abi) = self.parse_fn_front_matter()?;
|
2013-03-13 02:32:14 +00:00
|
|
|
|
|
2016-09-22 22:44:59 +00:00
|
|
|
|
let ident = self.parse_ident()?;
|
|
|
|
|
let mut generics = self.parse_generics()?;
|
2014-08-11 16:32:26 +00:00
|
|
|
|
|
2016-09-22 22:44:59 +00:00
|
|
|
|
let d = self.parse_fn_decl_with_self(|p: &mut Parser<'a>|{
|
|
|
|
|
// This is somewhat dubious; We don't want to allow
|
|
|
|
|
// argument names to be left off if there is a
|
|
|
|
|
// definition...
|
|
|
|
|
p.parse_arg_general(false)
|
|
|
|
|
})?;
|
|
|
|
|
generics.where_clause = self.parse_where_clause()?;
|
2017-09-22 02:18:47 +00:00
|
|
|
|
|
2016-09-22 22:44:59 +00:00
|
|
|
|
let sig = ast::MethodSig {
|
2017-08-07 05:54:09 +00:00
|
|
|
|
unsafety,
|
|
|
|
|
constness,
|
2016-09-22 22:44:59 +00:00
|
|
|
|
decl: d,
|
2017-08-07 05:54:09 +00:00
|
|
|
|
abi,
|
2016-09-22 22:44:59 +00:00
|
|
|
|
};
|
2012-07-10 20:44:20 +00:00
|
|
|
|
|
2016-09-22 22:44:59 +00:00
|
|
|
|
let body = match self.token {
|
|
|
|
|
token::Semi => {
|
|
|
|
|
self.bump();
|
2017-04-13 19:37:05 +00:00
|
|
|
|
*at_end = true;
|
2016-09-22 22:44:59 +00:00
|
|
|
|
debug!("parse_trait_methods(): parsing required method");
|
|
|
|
|
None
|
|
|
|
|
}
|
|
|
|
|
token::OpenDelim(token::Brace) => {
|
|
|
|
|
debug!("parse_trait_methods(): parsing provided method");
|
2017-04-13 19:37:05 +00:00
|
|
|
|
*at_end = true;
|
2016-09-22 22:44:59 +00:00
|
|
|
|
let (inner_attrs, body) = self.parse_inner_attrs_and_block()?;
|
|
|
|
|
attrs.extend(inner_attrs.iter().cloned());
|
|
|
|
|
Some(body)
|
|
|
|
|
}
|
|
|
|
|
_ => {
|
|
|
|
|
let token_str = self.this_token_to_string();
|
2018-02-19 07:08:23 +00:00
|
|
|
|
let mut err = self.fatal(&format!("expected `;` or `{{`, found `{}`",
|
|
|
|
|
token_str));
|
|
|
|
|
err.span_label(self.span, "expected `;` or `{`");
|
|
|
|
|
return Err(err);
|
2016-09-22 22:44:59 +00:00
|
|
|
|
}
|
2015-03-13 09:34:51 +00:00
|
|
|
|
};
|
2017-09-22 02:18:47 +00:00
|
|
|
|
(ident, ast::TraitItemKind::Method(sig, body), generics)
|
2016-09-22 22:44:59 +00:00
|
|
|
|
};
|
|
|
|
|
|
2016-06-11 01:00:07 +00:00
|
|
|
|
Ok(TraitItem {
|
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
|
|
|
|
ident: name,
|
2017-08-07 05:54:09 +00:00
|
|
|
|
attrs,
|
2017-09-22 02:18:47 +00:00
|
|
|
|
generics,
|
2017-08-07 05:54:09 +00:00
|
|
|
|
node,
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span: lo.to(self.prev_span),
|
2017-07-12 16:50:05 +00:00
|
|
|
|
tokens: None,
|
2016-06-11 01:00:07 +00:00
|
|
|
|
})
|
|
|
|
|
}
|
2015-03-10 10:28:44 +00:00
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse optional return type [ -> TY ] in function decl
|
2018-01-18 17:59:28 +00:00
|
|
|
|
fn parse_ret_ty(&mut self, allow_plus: bool) -> PResult<'a, FunctionRetTy> {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat(&token::RArrow) {
|
2018-01-18 17:59:28 +00:00
|
|
|
|
Ok(FunctionRetTy::Ty(self.parse_ty_common(allow_plus, true)?))
|
2012-03-12 23:26:31 +00:00
|
|
|
|
} else {
|
2018-03-10 14:45:47 +00:00
|
|
|
|
Ok(FunctionRetTy::Default(self.span.shrink_to_lo()))
|
2012-03-12 23:26:31 +00:00
|
|
|
|
}
|
2011-05-15 02:02:30 +00:00
|
|
|
|
}
|
2012-04-10 00:32:49 +00:00
|
|
|
|
|
2017-03-16 21:47:32 +00:00
|
|
|
|
// Parse a type
|
2017-01-16 23:13:41 +00:00
|
|
|
|
pub fn parse_ty(&mut self) -> PResult<'a, P<Ty>> {
|
2017-12-18 20:59:31 +00:00
|
|
|
|
self.parse_ty_common(true, true)
|
2014-11-20 20:05:29 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-01-16 23:13:41 +00:00
|
|
|
|
/// Parse a type in restricted contexts where `+` is not permitted.
|
|
|
|
|
/// Example 1: `&'a TYPE`
|
|
|
|
|
/// `+` is prohibited to maintain operator priority (P(+) < P(&)).
|
|
|
|
|
/// Example 2: `value1 as TYPE + value2`
|
|
|
|
|
/// `+` is prohibited to avoid interactions with expression grammar.
|
2017-03-16 21:47:32 +00:00
|
|
|
|
fn parse_ty_no_plus(&mut self) -> PResult<'a, P<Ty>> {
|
2017-12-18 20:59:31 +00:00
|
|
|
|
self.parse_ty_common(false, true)
|
2017-03-16 21:47:32 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-12-18 20:59:31 +00:00
|
|
|
|
fn parse_ty_common(&mut self, allow_plus: bool, allow_qpath_recovery: bool)
|
|
|
|
|
-> PResult<'a, P<Ty>> {
|
2016-11-02 03:03:55 +00:00
|
|
|
|
maybe_whole!(self, NtTy, |x| x);
|
2012-08-01 21:34:35 +00:00
|
|
|
|
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
2018-01-27 19:37:17 +00:00
|
|
|
|
let mut impl_dyn_multi = false;
|
2017-03-16 21:47:32 +00:00
|
|
|
|
let node = if self.eat(&token::OpenDelim(token::Paren)) {
|
|
|
|
|
// `(TYPE)` is a parenthesized type.
|
|
|
|
|
// `(TYPE,)` is a tuple with a single field of type TYPE.
|
2014-11-09 15:14:15 +00:00
|
|
|
|
let mut ts = vec![];
|
|
|
|
|
let mut last_comma = false;
|
|
|
|
|
while self.token != token::CloseDelim(token::Paren) {
|
2017-01-16 23:13:41 +00:00
|
|
|
|
ts.push(self.parse_ty()?);
|
2017-01-17 18:18:29 +00:00
|
|
|
|
if self.eat(&token::Comma) {
|
2014-11-09 15:14:15 +00:00
|
|
|
|
last_comma = true;
|
2014-06-11 19:14:38 +00:00
|
|
|
|
} else {
|
2014-11-09 15:14:15 +00:00
|
|
|
|
last_comma = false;
|
|
|
|
|
break;
|
2013-07-02 19:47:32 +00:00
|
|
|
|
}
|
2011-08-15 10:18:27 +00:00
|
|
|
|
}
|
2017-04-04 22:12:53 +00:00
|
|
|
|
let trailing_plus = self.prev_token_kind == PrevTokenKind::Plus;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::CloseDelim(token::Paren))?;
|
2017-03-16 21:47:32 +00:00
|
|
|
|
|
2014-11-09 15:14:15 +00:00
|
|
|
|
if ts.len() == 1 && !last_comma {
|
2017-12-16 23:21:29 +00:00
|
|
|
|
let ty = ts.into_iter().nth(0).unwrap().into_inner();
|
2018-05-25 22:27:37 +00:00
|
|
|
|
let maybe_bounds = allow_plus && self.token.is_like_plus();
|
2017-03-16 21:47:32 +00:00
|
|
|
|
match ty.node {
|
2017-04-04 22:12:53 +00:00
|
|
|
|
// `(TY_BOUND_NOPAREN) + BOUND + ...`.
|
|
|
|
|
TyKind::Path(None, ref path) if maybe_bounds => {
|
2017-04-21 18:32:11 +00:00
|
|
|
|
self.parse_remaining_bounds(Vec::new(), path.clone(), lo, true)?
|
2017-03-16 21:47:32 +00:00
|
|
|
|
}
|
2017-10-10 14:33:19 +00:00
|
|
|
|
TyKind::TraitObject(ref bounds, TraitObjectSyntax::None)
|
2017-04-04 22:12:53 +00:00
|
|
|
|
if maybe_bounds && bounds.len() == 1 && !trailing_plus => {
|
2017-04-21 18:32:11 +00:00
|
|
|
|
let path = match bounds[0] {
|
|
|
|
|
TraitTyParamBound(ref pt, ..) => pt.trait_ref.path.clone(),
|
|
|
|
|
_ => self.bug("unexpected lifetime bound"),
|
|
|
|
|
};
|
|
|
|
|
self.parse_remaining_bounds(Vec::new(), path, lo, true)?
|
2017-04-04 22:12:53 +00:00
|
|
|
|
}
|
|
|
|
|
// `(TYPE)`
|
2017-03-16 21:47:32 +00:00
|
|
|
|
_ => TyKind::Paren(P(ty))
|
|
|
|
|
}
|
2014-11-09 15:14:15 +00:00
|
|
|
|
} else {
|
2016-02-08 15:53:21 +00:00
|
|
|
|
TyKind::Tup(ts)
|
2014-11-09 15:14:15 +00:00
|
|
|
|
}
|
2016-06-22 06:02:26 +00:00
|
|
|
|
} else if self.eat(&token::Not) {
|
2017-03-16 21:47:32 +00:00
|
|
|
|
// Never type `!`
|
2016-08-02 07:56:20 +00:00
|
|
|
|
TyKind::Never
|
2017-01-17 18:18:29 +00:00
|
|
|
|
} else if self.eat(&token::BinOp(token::Star)) {
|
2017-03-16 21:47:32 +00:00
|
|
|
|
// Raw pointer
|
2016-03-23 03:01:37 +00:00
|
|
|
|
TyKind::Ptr(self.parse_ptr()?)
|
2017-01-17 18:18:29 +00:00
|
|
|
|
} else if self.eat(&token::OpenDelim(token::Bracket)) {
|
2017-03-16 21:47:32 +00:00
|
|
|
|
// Array or slice
|
2017-01-16 23:13:41 +00:00
|
|
|
|
let t = self.parse_ty()?;
|
2017-03-16 21:47:32 +00:00
|
|
|
|
// Parse optional `; EXPR` in `[TYPE; EXPR]`
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let t = match self.maybe_parse_fixed_length_of_vec()? {
|
2016-09-20 14:54:24 +00:00
|
|
|
|
None => TyKind::Slice(t),
|
2018-05-17 18:28:50 +00:00
|
|
|
|
Some(length) => TyKind::Array(t, AnonConst {
|
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
|
|
|
|
value: length,
|
|
|
|
|
}),
|
2012-11-05 04:41:00 +00:00
|
|
|
|
};
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::CloseDelim(token::Bracket))?;
|
2012-02-06 14:29:56 +00:00
|
|
|
|
t
|
2017-03-16 21:47:32 +00:00
|
|
|
|
} else if self.check(&token::BinOp(token::And)) || self.check(&token::AndAnd) {
|
|
|
|
|
// Reference
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect_and()?;
|
|
|
|
|
self.parse_borrowed_pointee()?
|
2015-12-30 23:11:53 +00:00
|
|
|
|
} else if self.eat_keyword_noexpect(keywords::Typeof) {
|
2017-03-16 21:47:32 +00:00
|
|
|
|
// `typeof(EXPR)`
|
2013-08-22 21:00:02 +00:00
|
|
|
|
// In order to not be ambiguous, the type must be surrounded by parens.
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::OpenDelim(token::Paren))?;
|
2018-05-17 18:28:50 +00:00
|
|
|
|
let e = AnonConst {
|
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
|
|
|
|
value: self.parse_expr()?,
|
|
|
|
|
};
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::CloseDelim(token::Paren))?;
|
2016-02-08 15:53:21 +00:00
|
|
|
|
TyKind::Typeof(e)
|
2018-03-08 11:27:23 +00:00
|
|
|
|
} else if self.eat_keyword(keywords::Underscore) {
|
2017-03-16 21:47:32 +00:00
|
|
|
|
// A type to be inferred `_`
|
|
|
|
|
TyKind::Infer
|
|
|
|
|
} else if self.token_is_bare_fn_keyword() {
|
|
|
|
|
// Function pointer type
|
|
|
|
|
self.parse_ty_bare_fn(Vec::new())?
|
|
|
|
|
} else if self.check_keyword(keywords::For) {
|
|
|
|
|
// Function pointer type or bound list (trait object type) starting with a poly-trait.
|
|
|
|
|
// `for<'lt> [unsafe] [extern "ABI"] fn (&'lt S) -> T`
|
|
|
|
|
// `for<'lt> Trait1<'lt> + Trait2 + 'a`
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
2017-03-16 21:47:32 +00:00
|
|
|
|
let lifetime_defs = self.parse_late_bound_lifetime_defs()?;
|
|
|
|
|
if self.token_is_bare_fn_keyword() {
|
|
|
|
|
self.parse_ty_bare_fn(lifetime_defs)?
|
2015-07-26 04:40:57 +00:00
|
|
|
|
} else {
|
2017-03-16 21:47:32 +00:00
|
|
|
|
let path = self.parse_path(PathStyle::Type)?;
|
2018-05-25 21:09:32 +00:00
|
|
|
|
let parse_plus = allow_plus && self.check_plus();
|
2017-04-21 18:32:11 +00:00
|
|
|
|
self.parse_remaining_bounds(lifetime_defs, path, lo, parse_plus)?
|
2015-07-26 04:40:57 +00:00
|
|
|
|
}
|
2017-03-16 21:47:32 +00:00
|
|
|
|
} else if self.eat_keyword(keywords::Impl) {
|
2018-01-27 19:37:17 +00:00
|
|
|
|
// Always parse bounds greedily for better error recovery.
|
|
|
|
|
let bounds = self.parse_ty_param_bounds()?;
|
|
|
|
|
impl_dyn_multi = bounds.len() > 1 || self.prev_token_kind == PrevTokenKind::Plus;
|
|
|
|
|
TyKind::ImplTrait(bounds)
|
2017-10-10 14:33:19 +00:00
|
|
|
|
} else if self.check_keyword(keywords::Dyn) &&
|
2018-02-23 20:39:51 +00:00
|
|
|
|
self.look_ahead(1, |t| t.can_begin_bound() &&
|
|
|
|
|
!can_continue_type_after_non_fn_ident(t)) {
|
2017-10-10 14:33:19 +00:00
|
|
|
|
self.bump(); // `dyn`
|
2018-01-27 19:37:17 +00:00
|
|
|
|
// Always parse bounds greedily for better error recovery.
|
|
|
|
|
let bounds = self.parse_ty_param_bounds()?;
|
|
|
|
|
impl_dyn_multi = bounds.len() > 1 || self.prev_token_kind == PrevTokenKind::Plus;
|
|
|
|
|
TyKind::TraitObject(bounds, TraitObjectSyntax::Dyn)
|
2017-02-22 20:59:40 +00:00
|
|
|
|
} else if self.check(&token::Question) ||
|
2018-05-25 21:09:32 +00:00
|
|
|
|
self.check_lifetime() && self.look_ahead(1, |t| t.is_like_plus()) {
|
2017-03-16 21:47:32 +00:00
|
|
|
|
// Bound list (trait object type)
|
2017-10-10 14:33:19 +00:00
|
|
|
|
TyKind::TraitObject(self.parse_ty_param_bounds_common(allow_plus)?,
|
|
|
|
|
TraitObjectSyntax::None)
|
|
|
|
|
} else if self.eat_lt() {
|
|
|
|
|
// Qualified path
|
|
|
|
|
let (qself, path) = self.parse_qpath(PathStyle::Type)?;
|
|
|
|
|
TyKind::Path(Some(qself), path)
|
|
|
|
|
} else if self.token.is_path_start() {
|
|
|
|
|
// Simple path
|
|
|
|
|
let path = self.parse_path(PathStyle::Type)?;
|
|
|
|
|
if self.eat(&token::Not) {
|
|
|
|
|
// Macro invocation in type position
|
2018-05-22 15:01:21 +00:00
|
|
|
|
let (delim, tts) = self.expect_delimited_token_tree()?;
|
|
|
|
|
let node = Mac_ { path, tts, delim };
|
|
|
|
|
TyKind::Mac(respan(lo.to(self.prev_span), node))
|
2017-10-10 14:33:19 +00:00
|
|
|
|
} else {
|
|
|
|
|
// Just a type path or bound list (trait object type) starting with a trait.
|
|
|
|
|
// `Type`
|
|
|
|
|
// `Trait1 + Trait2 + 'a`
|
2018-05-25 21:09:32 +00:00
|
|
|
|
if allow_plus && self.check_plus() {
|
2017-10-10 14:33:19 +00:00
|
|
|
|
self.parse_remaining_bounds(Vec::new(), path, lo, true)?
|
|
|
|
|
} else {
|
|
|
|
|
TyKind::Path(None, path)
|
|
|
|
|
}
|
|
|
|
|
}
|
2013-02-24 17:39:29 +00:00
|
|
|
|
} else {
|
2016-04-20 23:03:29 +00:00
|
|
|
|
let msg = format!("expected type, found {}", self.this_token_descr());
|
|
|
|
|
return Err(self.fatal(&msg));
|
2013-02-24 17:39:29 +00:00
|
|
|
|
};
|
2012-05-23 22:06:11 +00:00
|
|
|
|
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let span = lo.to(self.prev_span);
|
2017-10-22 16:19:30 +00:00
|
|
|
|
let ty = Ty { node, span, id: ast::DUMMY_NODE_ID };
|
2017-03-16 21:47:32 +00:00
|
|
|
|
|
|
|
|
|
// Try to recover from use of `+` with incorrect priority.
|
2018-01-27 19:37:17 +00:00
|
|
|
|
self.maybe_report_ambiguous_plus(allow_plus, impl_dyn_multi, &ty);
|
2017-03-16 21:47:32 +00:00
|
|
|
|
self.maybe_recover_from_bad_type_plus(allow_plus, &ty)?;
|
2017-12-18 20:59:31 +00:00
|
|
|
|
let ty = self.maybe_recover_from_bad_qpath(ty, allow_qpath_recovery)?;
|
2017-03-16 21:47:32 +00:00
|
|
|
|
|
|
|
|
|
Ok(P(ty))
|
2012-11-05 04:41:00 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-10-16 19:07:26 +00:00
|
|
|
|
fn parse_remaining_bounds(&mut self, generic_params: Vec<GenericParam>, path: ast::Path,
|
2017-04-21 18:32:11 +00:00
|
|
|
|
lo: Span, parse_plus: bool) -> PResult<'a, TyKind> {
|
2017-10-16 19:07:26 +00:00
|
|
|
|
let poly_trait_ref = PolyTraitRef::new(generic_params, path, lo.to(self.prev_span));
|
2017-04-21 18:32:11 +00:00
|
|
|
|
let mut bounds = vec![TraitTyParamBound(poly_trait_ref, TraitBoundModifier::None)];
|
|
|
|
|
if parse_plus {
|
2018-05-25 21:36:23 +00:00
|
|
|
|
self.eat_plus(); // `+`, or `+=` gets split and `+` is discarded
|
2017-04-21 18:32:11 +00:00
|
|
|
|
bounds.append(&mut self.parse_ty_param_bounds()?);
|
|
|
|
|
}
|
2017-10-10 14:33:19 +00:00
|
|
|
|
Ok(TyKind::TraitObject(bounds, TraitObjectSyntax::None))
|
2017-04-21 18:32:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2018-01-27 19:37:17 +00:00
|
|
|
|
fn maybe_report_ambiguous_plus(&mut self, allow_plus: bool, impl_dyn_multi: bool, ty: &Ty) {
|
|
|
|
|
if !allow_plus && impl_dyn_multi {
|
|
|
|
|
let sum_with_parens = format!("({})", pprust::ty_to_string(&ty));
|
|
|
|
|
self.struct_span_err(ty.span, "ambiguous `+` in a type")
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
.span_suggestion_with_applicability(
|
|
|
|
|
ty.span,
|
|
|
|
|
"use parentheses to disambiguate",
|
|
|
|
|
sum_with_parens,
|
|
|
|
|
Applicability::MachineApplicable
|
|
|
|
|
).emit();
|
2018-01-27 19:37:17 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-16 21:47:32 +00:00
|
|
|
|
fn maybe_recover_from_bad_type_plus(&mut self, allow_plus: bool, ty: &Ty) -> PResult<'a, ()> {
|
|
|
|
|
// Do not add `+` to expected tokens.
|
2018-05-25 21:09:32 +00:00
|
|
|
|
if !allow_plus || !self.token.is_like_plus() {
|
2017-03-16 21:47:32 +00:00
|
|
|
|
return Ok(())
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
self.bump(); // `+`
|
|
|
|
|
let bounds = self.parse_ty_param_bounds()?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let sum_span = ty.span.to(self.prev_span);
|
2017-03-16 21:47:32 +00:00
|
|
|
|
|
2017-03-28 12:10:16 +00:00
|
|
|
|
let mut err = struct_span_err!(self.sess.span_diagnostic, sum_span, E0178,
|
2017-05-12 18:05:39 +00:00
|
|
|
|
"expected a path on the left-hand side of `+`, not `{}`", pprust::ty_to_string(ty));
|
2017-03-16 21:47:32 +00:00
|
|
|
|
|
|
|
|
|
match ty.node {
|
|
|
|
|
TyKind::Rptr(ref lifetime, ref mut_ty) => {
|
|
|
|
|
let sum_with_parens = pprust::to_string(|s| {
|
|
|
|
|
use print::pprust::PrintState;
|
|
|
|
|
|
2017-06-25 03:22:42 +00:00
|
|
|
|
s.s.word("&")?;
|
2017-03-16 21:47:32 +00:00
|
|
|
|
s.print_opt_lifetime(lifetime)?;
|
|
|
|
|
s.print_mutability(mut_ty.mutbl)?;
|
|
|
|
|
s.popen()?;
|
|
|
|
|
s.print_type(&mut_ty.ty)?;
|
|
|
|
|
s.print_bounds(" +", &bounds)?;
|
|
|
|
|
s.pclose()
|
|
|
|
|
});
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
err.span_suggestion_with_applicability(
|
|
|
|
|
sum_span,
|
|
|
|
|
"try adding parentheses",
|
|
|
|
|
sum_with_parens,
|
|
|
|
|
Applicability::MachineApplicable
|
|
|
|
|
);
|
2017-03-16 21:47:32 +00:00
|
|
|
|
}
|
|
|
|
|
TyKind::Ptr(..) | TyKind::BareFn(..) => {
|
2017-05-04 12:17:23 +00:00
|
|
|
|
err.span_label(sum_span, "perhaps you forgot parentheses?");
|
2017-03-16 21:47:32 +00:00
|
|
|
|
}
|
2017-03-28 12:10:16 +00:00
|
|
|
|
_ => {
|
2017-05-04 12:17:23 +00:00
|
|
|
|
err.span_label(sum_span, "expected a path");
|
2017-03-28 12:10:16 +00:00
|
|
|
|
},
|
2017-03-16 21:47:32 +00:00
|
|
|
|
}
|
|
|
|
|
err.emit();
|
|
|
|
|
Ok(())
|
|
|
|
|
}
|
|
|
|
|
|
2017-12-16 22:53:11 +00:00
|
|
|
|
// Try to recover from associated item paths like `[T]::AssocItem`/`(T, U)::AssocItem`.
|
2017-12-18 20:59:31 +00:00
|
|
|
|
fn maybe_recover_from_bad_qpath<T: RecoverQPath>(&mut self, base: T, allow_recovery: bool)
|
|
|
|
|
-> PResult<'a, T> {
|
2017-12-16 22:53:11 +00:00
|
|
|
|
// Do not add `::` to expected tokens.
|
2017-12-18 20:59:31 +00:00
|
|
|
|
if !allow_recovery || self.token != token::ModSep {
|
2017-12-16 22:53:11 +00:00
|
|
|
|
return Ok(base);
|
|
|
|
|
}
|
|
|
|
|
let ty = match base.to_ty() {
|
|
|
|
|
Some(ty) => ty,
|
|
|
|
|
None => return Ok(base),
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
self.bump(); // `::`
|
|
|
|
|
let mut segments = Vec::new();
|
|
|
|
|
self.parse_path_segments(&mut segments, T::PATH_STYLE, true)?;
|
|
|
|
|
|
|
|
|
|
let span = ty.span.to(self.prev_span);
|
2018-05-22 19:26:35 +00:00
|
|
|
|
let path_span = span.to(span); // use an empty path since `position` == 0
|
|
|
|
|
let recovered = base.to_recovered(
|
|
|
|
|
Some(QSelf { ty, path_span, position: 0 }),
|
|
|
|
|
ast::Path { segments, span },
|
|
|
|
|
);
|
2017-12-16 22:53:11 +00:00
|
|
|
|
|
|
|
|
|
self.diagnostic()
|
|
|
|
|
.struct_span_err(span, "missing angle brackets in associated item path")
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
.span_suggestion_with_applicability( // this is a best-effort recovery
|
|
|
|
|
span, "try", recovered.to_string(), Applicability::MaybeIncorrect
|
|
|
|
|
).emit();
|
2017-12-16 22:53:11 +00:00
|
|
|
|
|
|
|
|
|
Ok(recovered)
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-16 21:47:32 +00:00
|
|
|
|
fn parse_borrowed_pointee(&mut self) -> PResult<'a, TyKind> {
|
|
|
|
|
let opt_lifetime = if self.check_lifetime() { Some(self.expect_lifetime()) } else { None };
|
|
|
|
|
let mutbl = self.parse_mutability();
|
2017-01-17 18:18:29 +00:00
|
|
|
|
let ty = self.parse_ty_no_plus()?;
|
|
|
|
|
return Ok(TyKind::Rptr(opt_lifetime, MutTy { ty: ty, mutbl: mutbl }));
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-12-20 21:00:43 +00:00
|
|
|
|
pub fn parse_ptr(&mut self) -> PResult<'a, MutTy> {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
let mutbl = if self.eat_keyword(keywords::Mut) {
|
2016-02-09 16:44:47 +00:00
|
|
|
|
Mutability::Mutable
|
2015-12-30 23:11:53 +00:00
|
|
|
|
} else if self.eat_keyword(keywords::Const) {
|
2016-02-09 16:44:47 +00:00
|
|
|
|
Mutability::Immutable
|
2014-06-16 23:58:17 +00:00
|
|
|
|
} else {
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let span = self.prev_span;
|
2014-06-25 19:00:27 +00:00
|
|
|
|
self.span_err(span,
|
2016-04-14 16:46:27 +00:00
|
|
|
|
"expected mut or const in raw pointer type (use \
|
|
|
|
|
`*mut T` or `*const T` as appropriate)");
|
2016-02-09 16:44:47 +00:00
|
|
|
|
Mutability::Immutable
|
2014-06-16 23:58:17 +00:00
|
|
|
|
};
|
2017-01-16 23:13:41 +00:00
|
|
|
|
let t = self.parse_ty_no_plus()?;
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(MutTy { ty: t, mutbl: mutbl })
|
2014-06-16 23:58:17 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-11-05 01:22:18 +00:00
|
|
|
|
fn is_named_argument(&mut self) -> bool {
|
2013-12-30 23:09:41 +00:00
|
|
|
|
let offset = match self.token {
|
2017-11-05 01:22:18 +00:00
|
|
|
|
token::Interpolated(ref nt) => match nt.0 {
|
|
|
|
|
token::NtPat(..) => return self.look_ahead(1, |t| t == &token::Colon),
|
|
|
|
|
_ => 0,
|
|
|
|
|
}
|
|
|
|
|
token::BinOp(token::And) | token::AndAnd => 1,
|
2014-10-27 12:33:30 +00:00
|
|
|
|
_ if self.token.is_keyword(keywords::Mut) => 1,
|
2017-11-05 01:22:18 +00:00
|
|
|
|
_ => 0,
|
2013-07-18 03:04:37 +00:00
|
|
|
|
};
|
|
|
|
|
|
2018-03-08 11:27:23 +00:00
|
|
|
|
self.look_ahead(offset, |t| t.is_ident()) &&
|
2017-11-05 01:22:18 +00:00
|
|
|
|
self.look_ahead(offset + 1, |t| t == &token::Colon)
|
2012-09-26 08:47:21 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// This version of parse arg doesn't necessarily require
|
|
|
|
|
/// identifier names.
|
2015-12-20 21:00:43 +00:00
|
|
|
|
pub fn parse_arg_general(&mut self, require_name: bool) -> PResult<'a, Arg> {
|
2016-11-02 03:03:55 +00:00
|
|
|
|
maybe_whole!(self, NtArg, |x| x);
|
2015-11-11 20:19:01 +00:00
|
|
|
|
|
2018-05-22 20:29:28 +00:00
|
|
|
|
let (pat, ty) = if require_name || self.is_named_argument() {
|
2014-10-15 01:59:41 +00:00
|
|
|
|
debug!("parse_arg_general parse_pat (require_name:{})",
|
2013-09-02 23:58:12 +00:00
|
|
|
|
require_name);
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let pat = self.parse_pat()?;
|
2013-06-07 01:54:14 +00:00
|
|
|
|
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::Colon)?;
|
2018-05-22 20:29:28 +00:00
|
|
|
|
(pat, self.parse_ty()?)
|
2012-08-17 22:25:35 +00:00
|
|
|
|
} else {
|
2013-10-21 20:08:31 +00:00
|
|
|
|
debug!("parse_arg_general ident_to_pat");
|
2018-03-18 13:47:09 +00:00
|
|
|
|
let ident = Ident::new(keywords::Invalid.name(), self.prev_span);
|
2018-05-22 20:29:28 +00:00
|
|
|
|
let ty = self.parse_ty()?;
|
|
|
|
|
let pat = P(Pat {
|
2016-03-29 09:12:01 +00:00
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2018-03-18 13:47:09 +00:00
|
|
|
|
node: PatKind::Ident(BindingMode::ByValue(Mutability::Immutable), ident, None),
|
2018-05-22 20:29:28 +00:00
|
|
|
|
span: ty.span,
|
|
|
|
|
});
|
|
|
|
|
(pat, ty)
|
2012-08-17 22:25:35 +00:00
|
|
|
|
};
|
|
|
|
|
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(Arg {
|
2018-05-22 20:29:28 +00:00
|
|
|
|
ty,
|
2017-08-07 05:54:09 +00:00
|
|
|
|
pat,
|
2013-09-07 02:11:55 +00:00
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2015-03-28 21:58:51 +00:00
|
|
|
|
})
|
2012-08-17 22:25:35 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse a single function argument
|
2015-12-20 21:00:43 +00:00
|
|
|
|
pub fn parse_arg(&mut self) -> PResult<'a, Arg> {
|
2013-09-14 02:07:43 +00:00
|
|
|
|
self.parse_arg_general(true)
|
2012-05-04 19:33:04 +00:00
|
|
|
|
}
|
2011-08-12 19:58:37 +00:00
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse an argument in a lambda header e.g. |arg, arg|
|
2015-12-20 21:00:43 +00:00
|
|
|
|
pub fn parse_fn_block_arg(&mut self) -> PResult<'a, Arg> {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let pat = self.parse_pat()?;
|
2015-12-30 23:11:53 +00:00
|
|
|
|
let t = if self.eat(&token::Colon) {
|
2017-01-16 23:13:41 +00:00
|
|
|
|
self.parse_ty()?
|
2013-02-26 00:49:28 +00:00
|
|
|
|
} else {
|
2013-11-30 22:00:39 +00:00
|
|
|
|
P(Ty {
|
2013-09-07 02:11:55 +00:00
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2016-02-08 15:53:21 +00:00
|
|
|
|
node: TyKind::Infer,
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span: self.span,
|
2013-11-30 22:00:39 +00:00
|
|
|
|
})
|
2013-02-26 00:49:28 +00:00
|
|
|
|
};
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(Arg {
|
2013-02-26 00:49:28 +00:00
|
|
|
|
ty: t,
|
2017-08-07 05:54:09 +00:00
|
|
|
|
pat,
|
2013-09-07 02:11:55 +00:00
|
|
|
|
id: ast::DUMMY_NODE_ID
|
2015-03-28 21:58:51 +00:00
|
|
|
|
})
|
2012-05-04 19:33:04 +00:00
|
|
|
|
}
|
2010-09-21 23:22:32 +00:00
|
|
|
|
|
2015-12-20 21:00:43 +00:00
|
|
|
|
pub fn maybe_parse_fixed_length_of_vec(&mut self) -> PResult<'a, Option<P<ast::Expr>>> {
|
2017-01-17 18:18:29 +00:00
|
|
|
|
if self.eat(&token::Semi) {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
Ok(Some(self.parse_expr()?))
|
2012-08-14 02:59:32 +00:00
|
|
|
|
} else {
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(None)
|
2012-08-14 02:59:32 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-18 17:44:20 +00:00
|
|
|
|
/// Matches token_lit = LIT_INTEGER | ...
|
2016-04-20 23:03:29 +00:00
|
|
|
|
pub fn parse_lit_token(&mut self) -> PResult<'a, LitKind> {
|
|
|
|
|
let out = match self.token {
|
2017-03-29 01:55:01 +00:00
|
|
|
|
token::Interpolated(ref nt) => match nt.0 {
|
2018-04-09 23:08:47 +00:00
|
|
|
|
token::NtExpr(ref v) | token::NtLiteral(ref v) => match v.node {
|
2016-04-20 23:03:29 +00:00
|
|
|
|
ExprKind::Lit(ref lit) => { lit.node.clone() }
|
|
|
|
|
_ => { return self.unexpected_last(&self.token); }
|
2016-11-02 03:03:55 +00:00
|
|
|
|
},
|
|
|
|
|
_ => { return self.unexpected_last(&self.token); }
|
|
|
|
|
},
|
2014-11-19 04:48:38 +00:00
|
|
|
|
token::Literal(lit, suf) => {
|
2017-03-03 09:23:59 +00:00
|
|
|
|
let diag = Some((self.span, &self.sess.span_diagnostic));
|
|
|
|
|
let (suffix_illegal, result) = parse::lit_token(lit, suf, diag);
|
2014-11-19 04:48:38 +00:00
|
|
|
|
|
|
|
|
|
if suffix_illegal {
|
2016-04-20 23:03:29 +00:00
|
|
|
|
let sp = self.span;
|
2016-02-08 22:55:55 +00:00
|
|
|
|
self.expect_no_suffix(sp, &format!("{} literal", lit.short_name()), suf)
|
2014-11-19 04:48:38 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-03-03 09:23:59 +00:00
|
|
|
|
result.unwrap()
|
2014-01-10 22:02:36 +00:00
|
|
|
|
}
|
2016-04-20 23:03:29 +00:00
|
|
|
|
_ => { return self.unexpected_last(&self.token); }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
self.bump();
|
|
|
|
|
Ok(out)
|
2011-10-07 14:22:53 +00:00
|
|
|
|
}
|
2011-07-06 00:57:34 +00:00
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Matches lit = true | false | token_lit
|
2015-12-20 21:00:43 +00:00
|
|
|
|
pub fn parse_lit(&mut self) -> PResult<'a, Lit> {
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
2015-12-30 23:11:53 +00:00
|
|
|
|
let lit = if self.eat_keyword(keywords::True) {
|
2016-02-08 16:06:20 +00:00
|
|
|
|
LitKind::Bool(true)
|
2015-12-30 23:11:53 +00:00
|
|
|
|
} else if self.eat_keyword(keywords::False) {
|
2016-02-08 16:06:20 +00:00
|
|
|
|
LitKind::Bool(false)
|
2012-04-27 19:22:42 +00:00
|
|
|
|
} else {
|
2016-04-20 23:03:29 +00:00
|
|
|
|
let lit = self.parse_lit_token()?;
|
2013-07-02 19:47:32 +00:00
|
|
|
|
lit
|
2012-05-23 22:06:11 +00:00
|
|
|
|
};
|
2017-03-15 00:22:48 +00:00
|
|
|
|
Ok(codemap::Spanned { node: lit, span: lo.to(self.prev_span) })
|
2012-04-27 19:22:42 +00:00
|
|
|
|
}
|
2011-07-27 12:19:39 +00:00
|
|
|
|
|
2017-06-24 18:26:04 +00:00
|
|
|
|
/// matches '-' lit | lit (cf. ast_validation::AstValidator::check_expr_within_pat)
|
2018-04-09 23:08:47 +00:00
|
|
|
|
pub fn parse_literal_maybe_minus(&mut self) -> PResult<'a, P<Expr>> {
|
2017-06-24 18:26:04 +00:00
|
|
|
|
maybe_whole_expr!(self);
|
|
|
|
|
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let minus_lo = self.span;
|
2015-12-30 23:11:53 +00:00
|
|
|
|
let minus_present = self.eat(&token::BinOp(token::Minus));
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let literal = P(self.parse_lit()?);
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let hi = self.prev_span;
|
|
|
|
|
let expr = self.mk_expr(lo.to(hi), ExprKind::Lit(literal), ThinVec::new());
|
2013-05-11 01:19:58 +00:00
|
|
|
|
|
|
|
|
|
if minus_present {
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let minus_hi = self.prev_span;
|
2016-02-08 12:21:29 +00:00
|
|
|
|
let unary = self.mk_unary(UnOp::Neg, expr);
|
2017-03-15 00:22:48 +00:00
|
|
|
|
Ok(self.mk_expr(minus_lo.to(minus_hi), unary, ThinVec::new()))
|
2013-05-11 01:19:58 +00:00
|
|
|
|
} else {
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(expr)
|
2013-05-11 01:19:58 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-04-16 01:10:59 +00:00
|
|
|
|
pub fn parse_path_segment_ident(&mut self) -> PResult<'a, ast::Ident> {
|
|
|
|
|
match self.token {
|
2018-03-18 13:47:09 +00:00
|
|
|
|
token::Ident(ident, _) if self.token.is_path_segment_keyword() => {
|
|
|
|
|
let span = self.span;
|
2016-04-16 01:10:59 +00:00
|
|
|
|
self.bump();
|
2018-03-18 13:47:09 +00:00
|
|
|
|
Ok(Ident::new(ident.name, span))
|
2016-04-16 01:10:59 +00:00
|
|
|
|
}
|
|
|
|
|
_ => self.parse_ident(),
|
2018-03-18 13:47:09 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2016-04-16 01:10:59 +00:00
|
|
|
|
|
2015-10-22 23:17:03 +00:00
|
|
|
|
/// Parses qualified path.
|
|
|
|
|
/// Assumes that the leading `<` has been parsed already.
|
|
|
|
|
///
|
|
|
|
|
/// `qualified_path = <type [as trait_ref]>::path`
|
|
|
|
|
///
|
2017-07-19 23:39:34 +00:00
|
|
|
|
/// # Examples
|
2018-05-22 19:26:35 +00:00
|
|
|
|
/// `<T>::default`
|
2015-10-22 23:17:03 +00:00
|
|
|
|
/// `<T as U>::a`
|
2017-07-19 23:39:34 +00:00
|
|
|
|
/// `<T as U>::F::a<S>` (without disambiguator)
|
|
|
|
|
/// `<T as U>::F::a::<S>` (with disambiguator)
|
|
|
|
|
fn parse_qpath(&mut self, style: PathStyle) -> PResult<'a, (QSelf, ast::Path)> {
|
|
|
|
|
let lo = self.prev_span;
|
|
|
|
|
let ty = self.parse_ty()?;
|
2018-05-22 19:26:35 +00:00
|
|
|
|
|
|
|
|
|
// `path` will contain the prefix of the path up to the `>`,
|
|
|
|
|
// if any (e.g., `U` in the `<T as U>::*` examples
|
|
|
|
|
// above). `path_span` has the span of that path, or an empty
|
|
|
|
|
// span in the case of something like `<T>::Bar`.
|
|
|
|
|
let (mut path, path_span);
|
|
|
|
|
if self.eat_keyword(keywords::As) {
|
|
|
|
|
let path_lo = self.span;
|
|
|
|
|
path = self.parse_path(PathStyle::Type)?;
|
|
|
|
|
path_span = path_lo.to(self.prev_span);
|
2015-03-25 16:53:28 +00:00
|
|
|
|
} else {
|
2018-05-22 19:26:35 +00:00
|
|
|
|
path = ast::Path { segments: Vec::new(), span: syntax_pos::DUMMY_SP };
|
|
|
|
|
path_span = self.span.to(self.span);
|
|
|
|
|
}
|
|
|
|
|
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::Gt)?;
|
|
|
|
|
self.expect(&token::ModSep)?;
|
2015-03-25 16:53:28 +00:00
|
|
|
|
|
2018-05-22 19:26:35 +00:00
|
|
|
|
let qself = QSelf { ty, path_span, position: path.segments.len() };
|
2017-08-10 23:30:08 +00:00
|
|
|
|
self.parse_path_segments(&mut path.segments, style, true)?;
|
2017-06-10 03:30:33 +00:00
|
|
|
|
|
2017-07-19 23:39:34 +00:00
|
|
|
|
Ok((qself, ast::Path { segments: path.segments, span: lo.to(self.prev_span) }))
|
2017-06-10 03:30:33 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-07-19 23:39:34 +00:00
|
|
|
|
/// Parses simple paths.
|
|
|
|
|
///
|
|
|
|
|
/// `path = [::] segment+`
|
|
|
|
|
/// `segment = ident | ident[::]<args> | ident[::](args) [-> type]`
|
|
|
|
|
///
|
|
|
|
|
/// # Examples
|
|
|
|
|
/// `a::b::C<D>` (without disambiguator)
|
|
|
|
|
/// `a::b::C::<D>` (with disambiguator)
|
|
|
|
|
/// `Fn(Args)` (without disambiguator)
|
|
|
|
|
/// `Fn::(Args)` (with disambiguator)
|
2017-08-10 23:30:08 +00:00
|
|
|
|
pub fn parse_path(&mut self, style: PathStyle) -> PResult<'a, ast::Path> {
|
|
|
|
|
self.parse_path_common(style, true)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn parse_path_common(&mut self, style: PathStyle, enable_warning: bool)
|
|
|
|
|
-> PResult<'a, ast::Path> {
|
2017-08-17 18:44:28 +00:00
|
|
|
|
maybe_whole!(self, NtPath, |path| {
|
|
|
|
|
if style == PathStyle::Mod &&
|
|
|
|
|
path.segments.iter().any(|segment| segment.parameters.is_some()) {
|
|
|
|
|
self.diagnostic().span_err(path.span, "unexpected generic arguments in path");
|
|
|
|
|
}
|
|
|
|
|
path
|
|
|
|
|
});
|
2013-08-07 16:47:28 +00:00
|
|
|
|
|
2017-03-29 07:17:18 +00:00
|
|
|
|
let lo = self.meta_var_span.unwrap_or(self.span);
|
2017-07-19 23:39:34 +00:00
|
|
|
|
let mut segments = Vec::new();
|
|
|
|
|
if self.eat(&token::ModSep) {
|
2018-03-10 15:44:44 +00:00
|
|
|
|
segments.push(PathSegment::crate_root(lo.shrink_to_lo()));
|
2016-12-05 03:51:11 +00:00
|
|
|
|
}
|
2017-08-10 23:30:08 +00:00
|
|
|
|
self.parse_path_segments(&mut segments, style, enable_warning)?;
|
2016-12-05 03:51:11 +00:00
|
|
|
|
|
2017-07-19 23:39:34 +00:00
|
|
|
|
Ok(ast::Path { segments, span: lo.to(self.prev_span) })
|
2013-06-17 19:16:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-04-03 22:23:32 +00:00
|
|
|
|
/// Like `parse_path`, but also supports parsing `Word` meta items into paths for back-compat.
|
|
|
|
|
/// This is used when parsing derive macro paths in `#[derive]` attributes.
|
2017-07-19 23:39:34 +00:00
|
|
|
|
pub fn parse_path_allowing_meta(&mut self, style: PathStyle) -> PResult<'a, ast::Path> {
|
2018-04-17 13:33:39 +00:00
|
|
|
|
let meta_ident = match self.token {
|
2017-03-29 01:55:01 +00:00
|
|
|
|
token::Interpolated(ref nt) => match nt.0 {
|
2017-04-03 22:23:32 +00:00
|
|
|
|
token::NtMeta(ref meta) => match meta.node {
|
2018-04-17 13:33:39 +00:00
|
|
|
|
ast::MetaItemKind::Word => Some(meta.ident.clone()),
|
2017-04-03 22:23:32 +00:00
|
|
|
|
_ => None,
|
|
|
|
|
},
|
|
|
|
|
_ => None,
|
|
|
|
|
},
|
|
|
|
|
_ => None,
|
|
|
|
|
};
|
2018-04-17 13:33:39 +00:00
|
|
|
|
if let Some(path) = meta_ident {
|
2017-04-03 22:23:32 +00:00
|
|
|
|
self.bump();
|
2018-01-30 05:53:01 +00:00
|
|
|
|
return Ok(path);
|
2017-04-03 22:23:32 +00:00
|
|
|
|
}
|
2017-07-19 23:39:34 +00:00
|
|
|
|
self.parse_path(style)
|
2017-04-03 22:23:32 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-10-22 16:19:30 +00:00
|
|
|
|
fn parse_path_segments(&mut self,
|
|
|
|
|
segments: &mut Vec<PathSegment>,
|
|
|
|
|
style: PathStyle,
|
|
|
|
|
enable_warning: bool)
|
|
|
|
|
-> PResult<'a, ()> {
|
2014-10-29 22:03:40 +00:00
|
|
|
|
loop {
|
2017-08-10 23:30:08 +00:00
|
|
|
|
segments.push(self.parse_path_segment(style, enable_warning)?);
|
2014-10-29 22:03:40 +00:00
|
|
|
|
|
2018-03-10 15:44:44 +00:00
|
|
|
|
if self.is_import_coupler() || !self.eat(&token::ModSep) {
|
2017-07-19 23:39:34 +00:00
|
|
|
|
return Ok(());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2016-09-01 23:58:44 +00:00
|
|
|
|
|
2017-08-10 23:30:08 +00:00
|
|
|
|
fn parse_path_segment(&mut self, style: PathStyle, enable_warning: bool)
|
|
|
|
|
-> PResult<'a, PathSegment> {
|
2017-07-19 23:39:34 +00:00
|
|
|
|
let ident = self.parse_path_segment_ident()?;
|
|
|
|
|
|
|
|
|
|
let is_args_start = |token: &token::Token| match *token {
|
|
|
|
|
token::Lt | token::BinOp(token::Shl) | token::OpenDelim(token::Paren) => true,
|
|
|
|
|
_ => false,
|
|
|
|
|
};
|
|
|
|
|
let check_args_start = |this: &mut Self| {
|
|
|
|
|
this.expected_tokens.extend_from_slice(
|
|
|
|
|
&[TokenType::Token(token::Lt), TokenType::Token(token::OpenDelim(token::Paren))]
|
|
|
|
|
);
|
|
|
|
|
is_args_start(&this.token)
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
Ok(if style == PathStyle::Type && check_args_start(self) ||
|
|
|
|
|
style != PathStyle::Mod && self.check(&token::ModSep)
|
|
|
|
|
&& self.look_ahead(1, |t| is_args_start(t)) {
|
|
|
|
|
// Generic arguments are found - `<`, `(`, `::<` or `::(`.
|
|
|
|
|
let lo = self.span;
|
2017-08-10 23:30:08 +00:00
|
|
|
|
if self.eat(&token::ModSep) && style == PathStyle::Type && enable_warning {
|
|
|
|
|
self.diagnostic().struct_span_warn(self.prev_span, "unnecessary path disambiguator")
|
|
|
|
|
.span_label(self.prev_span, "try removing `::`").emit();
|
2016-09-01 23:58:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-07-19 23:39:34 +00:00
|
|
|
|
let parameters = if self.eat_lt() {
|
|
|
|
|
// `<'a, T, A = U>`
|
2017-01-17 18:18:29 +00:00
|
|
|
|
let (lifetimes, types, bindings) = self.parse_generic_args()?;
|
|
|
|
|
self.expect_gt()?;
|
2017-07-23 17:50:56 +00:00
|
|
|
|
let span = lo.to(self.prev_span);
|
|
|
|
|
AngleBracketedParameterData { lifetimes, types, bindings, span }.into()
|
2017-07-19 23:39:34 +00:00
|
|
|
|
} else {
|
|
|
|
|
// `(T, U) -> R`
|
|
|
|
|
self.bump(); // `(`
|
2017-10-22 16:19:30 +00:00
|
|
|
|
let inputs = self.parse_seq_to_before_tokens(
|
|
|
|
|
&[&token::CloseDelim(token::Paren)],
|
|
|
|
|
SeqSep::trailing_allowed(token::Comma),
|
|
|
|
|
TokenExpectType::Expect,
|
|
|
|
|
|p| p.parse_ty())?;
|
|
|
|
|
self.bump(); // `)`
|
2017-07-19 23:39:34 +00:00
|
|
|
|
let output = if self.eat(&token::RArrow) {
|
2017-12-18 20:59:31 +00:00
|
|
|
|
Some(self.parse_ty_common(false, false)?)
|
2014-11-04 02:52:52 +00:00
|
|
|
|
} else {
|
|
|
|
|
None
|
|
|
|
|
};
|
2017-07-19 23:39:34 +00:00
|
|
|
|
let span = lo.to(self.prev_span);
|
|
|
|
|
ParenthesizedParameterData { inputs, output, span }.into()
|
2014-10-29 22:03:40 +00:00
|
|
|
|
};
|
|
|
|
|
|
2018-03-19 00:54:56 +00:00
|
|
|
|
PathSegment { ident, parameters }
|
2017-07-19 23:39:34 +00:00
|
|
|
|
} else {
|
|
|
|
|
// Generic arguments are not found.
|
2018-03-19 00:54:56 +00:00
|
|
|
|
PathSegment::from_ident(ident)
|
2017-07-19 23:39:34 +00:00
|
|
|
|
})
|
2014-10-29 22:03:40 +00:00
|
|
|
|
}
|
|
|
|
|
|
2018-05-03 11:09:34 +00:00
|
|
|
|
pub fn check_lifetime(&mut self) -> bool {
|
2017-03-16 21:47:32 +00:00
|
|
|
|
self.expected_tokens.push(TokenType::Lifetime);
|
|
|
|
|
self.token.is_lifetime()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Parse single lifetime 'a or panic.
|
2017-05-11 22:59:48 +00:00
|
|
|
|
pub fn expect_lifetime(&mut self) -> Lifetime {
|
2018-03-24 16:49:50 +00:00
|
|
|
|
if let Some(ident) = self.token.lifetime() {
|
|
|
|
|
let span = self.span;
|
2017-12-31 02:47:45 +00:00
|
|
|
|
self.bump();
|
2018-03-24 16:49:50 +00:00
|
|
|
|
Lifetime { ident: Ident::new(ident.name, span), id: ast::DUMMY_NODE_ID }
|
2017-12-31 02:47:45 +00:00
|
|
|
|
} else {
|
|
|
|
|
self.span_bug(self.span, "not a lifetime")
|
2014-08-06 02:59:24 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-03-19 00:54:56 +00:00
|
|
|
|
fn eat_label(&mut self) -> Option<Label> {
|
2018-03-24 16:49:50 +00:00
|
|
|
|
if let Some(ident) = self.token.lifetime() {
|
|
|
|
|
let span = self.span;
|
2018-03-19 00:54:56 +00:00
|
|
|
|
self.bump();
|
2018-03-24 16:49:50 +00:00
|
|
|
|
Some(Label { ident: Ident::new(ident.name, span) })
|
2018-03-19 00:54:56 +00:00
|
|
|
|
} else {
|
|
|
|
|
None
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-05-08 18:18:21 +00:00
|
|
|
|
/// Parse mutability (`mut` or nothing).
|
2017-03-16 21:47:32 +00:00
|
|
|
|
fn parse_mutability(&mut self) -> Mutability {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::Mut) {
|
2017-03-16 21:47:32 +00:00
|
|
|
|
Mutability::Mutable
|
2012-04-24 22:52:52 +00:00
|
|
|
|
} else {
|
2017-03-16 21:47:32 +00:00
|
|
|
|
Mutability::Immutable
|
2012-04-24 22:52:52 +00:00
|
|
|
|
}
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2012-04-24 22:52:52 +00:00
|
|
|
|
|
2016-07-29 20:47:55 +00:00
|
|
|
|
pub fn parse_field_name(&mut self) -> PResult<'a, Ident> {
|
|
|
|
|
if let token::Literal(token::Integer(name), None) = self.token {
|
|
|
|
|
self.bump();
|
2018-03-18 13:47:09 +00:00
|
|
|
|
Ok(Ident::new(name, self.prev_span))
|
2016-07-29 20:47:55 +00:00
|
|
|
|
} else {
|
2018-01-06 22:43:20 +00:00
|
|
|
|
self.parse_ident_common(false)
|
2016-07-29 20:47:55 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-10-27 00:15:13 +00:00
|
|
|
|
/// Parse ident (COLON expr)?
|
2015-12-20 21:00:43 +00:00
|
|
|
|
pub fn parse_field(&mut self) -> PResult<'a, Field> {
|
2017-01-04 03:13:01 +00:00
|
|
|
|
let attrs = self.parse_outer_attributes()?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
2016-10-27 00:15:13 +00:00
|
|
|
|
|
|
|
|
|
// Check if a colon exists one ahead. This means we're parsing a fieldname.
|
|
|
|
|
let (fieldname, expr, is_shorthand) = if self.look_ahead(1, |t| t == &token::Colon) {
|
|
|
|
|
let fieldname = self.parse_field_name()?;
|
2018-03-18 13:47:09 +00:00
|
|
|
|
self.bump(); // `:`
|
2016-10-27 00:15:13 +00:00
|
|
|
|
(fieldname, self.parse_expr()?, false)
|
|
|
|
|
} else {
|
2018-01-06 22:43:20 +00:00
|
|
|
|
let fieldname = self.parse_ident_common(false)?;
|
2016-10-27 00:15:13 +00:00
|
|
|
|
|
|
|
|
|
// Mimic `x: x` for the `x` field shorthand.
|
2018-03-19 00:54:56 +00:00
|
|
|
|
let path = ast::Path::from_ident(fieldname);
|
2018-03-18 13:47:09 +00:00
|
|
|
|
let expr = self.mk_expr(fieldname.span, ExprKind::Path(None, path), ThinVec::new());
|
|
|
|
|
(fieldname, expr, true)
|
2016-10-27 00:15:13 +00:00
|
|
|
|
};
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(ast::Field {
|
2018-03-18 13:47:09 +00:00
|
|
|
|
ident: fieldname,
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span: lo.to(expr.span),
|
2017-08-07 05:54:09 +00:00
|
|
|
|
expr,
|
|
|
|
|
is_shorthand,
|
2017-01-04 03:13:01 +00:00
|
|
|
|
attrs: attrs.into(),
|
2015-03-28 21:58:51 +00:00
|
|
|
|
})
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2010-09-28 01:25:02 +00:00
|
|
|
|
|
2017-03-15 00:22:48 +00:00
|
|
|
|
pub fn mk_expr(&mut self, span: Span, node: ExprKind, attrs: ThinVec<Attribute>) -> P<Expr> {
|
2017-12-16 22:53:11 +00:00
|
|
|
|
P(Expr { node, span, attrs, id: ast::DUMMY_NODE_ID })
|
2010-10-12 23:30:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-02-08 15:05:05 +00:00
|
|
|
|
pub fn mk_unary(&mut self, unop: ast::UnOp, expr: P<Expr>) -> ast::ExprKind {
|
|
|
|
|
ExprKind::Unary(unop, expr)
|
2013-06-01 22:31:56 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-02-08 15:05:05 +00:00
|
|
|
|
pub fn mk_binary(&mut self, binop: ast::BinOp, lhs: P<Expr>, rhs: P<Expr>) -> ast::ExprKind {
|
|
|
|
|
ExprKind::Binary(binop, lhs, rhs)
|
2013-06-01 22:31:56 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-02-08 15:05:05 +00:00
|
|
|
|
pub fn mk_call(&mut self, f: P<Expr>, args: Vec<P<Expr>>) -> ast::ExprKind {
|
|
|
|
|
ExprKind::Call(f, args)
|
2013-06-01 22:31:56 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-02-08 15:05:05 +00:00
|
|
|
|
pub fn mk_index(&mut self, expr: P<Expr>, idx: P<Expr>) -> ast::ExprKind {
|
|
|
|
|
ExprKind::Index(expr, idx)
|
2013-06-01 22:31:56 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-12-13 05:41:02 +00:00
|
|
|
|
pub fn mk_range(&mut self,
|
2014-12-30 07:07:25 +00:00
|
|
|
|
start: Option<P<Expr>>,
|
2016-01-13 06:23:31 +00:00
|
|
|
|
end: Option<P<Expr>>,
|
|
|
|
|
limits: RangeLimits)
|
2016-03-17 01:35:36 +00:00
|
|
|
|
-> PResult<'a, ast::ExprKind> {
|
|
|
|
|
if end.is_none() && limits == RangeLimits::Closed {
|
2017-02-12 14:18:41 +00:00
|
|
|
|
Err(self.span_fatal_err(self.span, Error::InclusiveRangeWithNoEnd))
|
2016-03-17 01:35:36 +00:00
|
|
|
|
} else {
|
|
|
|
|
Ok(ExprKind::Range(start, end, limits))
|
|
|
|
|
}
|
2014-12-13 05:41:02 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-05-16 07:16:13 +00:00
|
|
|
|
pub fn mk_assign_op(&mut self, binop: ast::BinOp,
|
2016-02-08 15:05:05 +00:00
|
|
|
|
lhs: P<Expr>, rhs: P<Expr>) -> ast::ExprKind {
|
|
|
|
|
ExprKind::AssignOp(binop, lhs, rhs)
|
2013-06-01 22:31:56 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-03-15 00:22:48 +00:00
|
|
|
|
pub fn mk_mac_expr(&mut self, span: Span, m: Mac_, attrs: ThinVec<Attribute>) -> P<Expr> {
|
2014-09-13 16:06:01 +00:00
|
|
|
|
P(Expr {
|
2013-09-07 02:11:55 +00:00
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2017-03-15 00:22:48 +00:00
|
|
|
|
node: ExprKind::Mac(codemap::Spanned {node: m, span: span}),
|
2017-08-07 05:54:09 +00:00
|
|
|
|
span,
|
|
|
|
|
attrs,
|
2014-09-13 16:06:01 +00:00
|
|
|
|
})
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2010-12-14 23:32:13 +00:00
|
|
|
|
|
2016-06-18 04:01:57 +00:00
|
|
|
|
pub fn mk_lit_u32(&mut self, i: u32, attrs: ThinVec<Attribute>) -> P<Expr> {
|
2013-12-30 23:17:53 +00:00
|
|
|
|
let span = &self.span;
|
2014-09-13 16:06:01 +00:00
|
|
|
|
let lv_lit = P(codemap::Spanned {
|
2016-08-23 00:56:52 +00:00
|
|
|
|
node: LitKind::Int(i as u128, ast::LitIntType::Unsigned(UintTy::U32)),
|
2013-02-22 02:12:13 +00:00
|
|
|
|
span: *span
|
2014-09-13 16:06:01 +00:00
|
|
|
|
});
|
2011-06-21 20:16:40 +00:00
|
|
|
|
|
2014-09-13 16:06:01 +00:00
|
|
|
|
P(Expr {
|
2013-09-07 02:11:55 +00:00
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2016-02-08 15:05:05 +00:00
|
|
|
|
node: ExprKind::Lit(lv_lit),
|
2013-02-22 02:12:13 +00:00
|
|
|
|
span: *span,
|
2017-08-07 05:54:09 +00:00
|
|
|
|
attrs,
|
2014-09-13 16:06:01 +00:00
|
|
|
|
})
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2011-07-08 23:35:09 +00:00
|
|
|
|
|
2018-05-22 15:01:21 +00:00
|
|
|
|
fn expect_delimited_token_tree(&mut self) -> PResult<'a, (MacDelimiter, ThinTokenStream)> {
|
|
|
|
|
let delim = match self.token {
|
|
|
|
|
token::OpenDelim(delim) => delim,
|
2018-02-19 07:08:23 +00:00
|
|
|
|
_ => {
|
|
|
|
|
let msg = "expected open delimiter";
|
|
|
|
|
let mut err = self.fatal(msg);
|
|
|
|
|
err.span_label(self.span, msg);
|
2018-05-22 15:01:21 +00:00
|
|
|
|
return Err(err)
|
2018-02-19 07:08:23 +00:00
|
|
|
|
}
|
2018-05-22 15:01:21 +00:00
|
|
|
|
};
|
|
|
|
|
let delimited = match self.parse_token_tree() {
|
|
|
|
|
TokenTree::Delimited(_, delimited) => delimited,
|
|
|
|
|
_ => unreachable!(),
|
|
|
|
|
};
|
|
|
|
|
let delim = match delim {
|
|
|
|
|
token::Paren => MacDelimiter::Parenthesis,
|
|
|
|
|
token::Bracket => MacDelimiter::Bracket,
|
|
|
|
|
token::Brace => MacDelimiter::Brace,
|
|
|
|
|
token::NoDelim => self.bug("unexpected no delimiter"),
|
|
|
|
|
};
|
|
|
|
|
Ok((delim, delimited.stream().into()))
|
2014-10-29 14:47:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// At the bottom (top?) of the precedence hierarchy,
|
|
|
|
|
/// parse things like parenthesized exprs,
|
|
|
|
|
/// macros, return, etc.
|
2015-11-03 16:39:51 +00:00
|
|
|
|
///
|
|
|
|
|
/// NB: This does not parse outer attributes,
|
|
|
|
|
/// and is private because it only works
|
|
|
|
|
/// correctly if called from parse_dot_or_call_expr().
|
2015-12-20 21:00:43 +00:00
|
|
|
|
fn parse_bottom_expr(&mut self) -> PResult<'a, P<Expr>> {
|
2012-08-23 00:24:52 +00:00
|
|
|
|
maybe_whole_expr!(self);
|
2013-03-02 21:02:27 +00:00
|
|
|
|
|
2015-11-03 16:39:51 +00:00
|
|
|
|
// Outer attributes are already parsed and will be
|
|
|
|
|
// added to the return value after the fact.
|
|
|
|
|
//
|
|
|
|
|
// Therefore, prevent sub-parser from parsing
|
|
|
|
|
// attributes by giving them a empty "already parsed" list.
|
2016-06-18 04:01:57 +00:00
|
|
|
|
let mut attrs = ThinVec::new();
|
2015-11-03 16:39:51 +00:00
|
|
|
|
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
|
|
|
|
let mut hi = self.span;
|
2012-01-04 06:03:07 +00:00
|
|
|
|
|
2016-02-08 15:05:05 +00:00
|
|
|
|
let ex: ExprKind;
|
2012-01-04 06:03:07 +00:00
|
|
|
|
|
2015-01-10 23:14:03 +00:00
|
|
|
|
// Note: when adding new syntax here, don't forget to adjust Token::can_begin_expr().
|
2014-07-06 21:29:29 +00:00
|
|
|
|
match self.token {
|
2014-10-29 10:37:54 +00:00
|
|
|
|
token::OpenDelim(token::Paren) => {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2014-11-09 15:14:15 +00:00
|
|
|
|
|
2016-06-18 04:01:57 +00:00
|
|
|
|
attrs.extend(self.parse_inner_attributes()?);
|
2015-11-03 16:39:51 +00:00
|
|
|
|
|
2014-07-06 21:29:29 +00:00
|
|
|
|
// (e) is parenthesized e
|
|
|
|
|
// (e,) is a tuple with only one field, e
|
2014-11-09 15:14:15 +00:00
|
|
|
|
let mut es = vec![];
|
2014-07-06 21:29:29 +00:00
|
|
|
|
let mut trailing_comma = false;
|
2014-11-09 15:14:15 +00:00
|
|
|
|
while self.token != token::CloseDelim(token::Paren) {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
es.push(self.parse_expr()?);
|
2016-07-01 23:40:45 +00:00
|
|
|
|
self.expect_one_of(&[], &[token::Comma, token::CloseDelim(token::Paren)])?;
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
if self.check(&token::Comma) {
|
2014-07-06 21:29:29 +00:00
|
|
|
|
trailing_comma = true;
|
2014-11-09 15:14:15 +00:00
|
|
|
|
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2014-11-09 15:14:15 +00:00
|
|
|
|
} else {
|
|
|
|
|
trailing_comma = false;
|
|
|
|
|
break;
|
2014-07-06 21:29:29 +00:00
|
|
|
|
}
|
2013-02-17 23:41:47 +00:00
|
|
|
|
}
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2013-10-28 22:22:49 +00:00
|
|
|
|
|
2017-03-15 00:22:48 +00:00
|
|
|
|
hi = self.prev_span;
|
2017-12-16 22:53:11 +00:00
|
|
|
|
ex = if es.len() == 1 && !trailing_comma {
|
|
|
|
|
ExprKind::Paren(es.into_iter().nth(0).unwrap())
|
2014-09-13 16:06:01 +00:00
|
|
|
|
} else {
|
2017-12-16 22:53:11 +00:00
|
|
|
|
ExprKind::Tup(es)
|
|
|
|
|
};
|
2017-07-01 23:37:47 +00:00
|
|
|
|
}
|
2014-10-29 10:37:54 +00:00
|
|
|
|
token::OpenDelim(token::Brace) => {
|
2018-04-16 03:44:39 +00:00
|
|
|
|
return self.parse_block_expr(None, lo, BlockCheckMode::Default, attrs);
|
2017-07-01 23:37:47 +00:00
|
|
|
|
}
|
|
|
|
|
token::BinOp(token::Or) | token::OrOr => {
|
2017-10-07 14:36:28 +00:00
|
|
|
|
return self.parse_lambda_expr(attrs);
|
2017-07-01 23:37:47 +00:00
|
|
|
|
}
|
2014-10-29 10:37:54 +00:00
|
|
|
|
token::OpenDelim(token::Bracket) => {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2014-07-06 22:11:44 +00:00
|
|
|
|
|
2016-06-18 04:01:57 +00:00
|
|
|
|
attrs.extend(self.parse_inner_attributes()?);
|
2015-11-03 16:39:51 +00:00
|
|
|
|
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
if self.check(&token::CloseDelim(token::Bracket)) {
|
2014-07-06 21:29:29 +00:00
|
|
|
|
// Empty vector.
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2017-01-16 07:36:10 +00:00
|
|
|
|
ex = ExprKind::Array(Vec::new());
|
2014-07-06 21:29:29 +00:00
|
|
|
|
} else {
|
|
|
|
|
// Nonempty vector.
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let first_expr = self.parse_expr()?;
|
2014-12-30 06:55:06 +00:00
|
|
|
|
if self.check(&token::Semi) {
|
2015-08-11 15:35:22 +00:00
|
|
|
|
// Repeating array syntax: [ 0; 512 ]
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2018-05-17 18:28:50 +00:00
|
|
|
|
let count = AnonConst {
|
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
|
|
|
|
value: self.parse_expr()?,
|
|
|
|
|
};
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::CloseDelim(token::Bracket))?;
|
2016-02-08 15:05:05 +00:00
|
|
|
|
ex = ExprKind::Repeat(first_expr, count);
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
} else if self.check(&token::Comma) {
|
2014-07-06 21:29:29 +00:00
|
|
|
|
// Vector with two or more elements.
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let remaining_exprs = self.parse_seq_to_end(
|
2014-10-29 10:37:54 +00:00
|
|
|
|
&token::CloseDelim(token::Bracket),
|
2016-02-23 04:24:42 +00:00
|
|
|
|
SeqSep::trailing_allowed(token::Comma),
|
2016-03-23 03:01:37 +00:00
|
|
|
|
|p| Ok(p.parse_expr()?)
|
2016-03-22 22:58:45 +00:00
|
|
|
|
)?;
|
2016-10-29 21:54:04 +00:00
|
|
|
|
let mut exprs = vec![first_expr];
|
2015-06-10 16:22:20 +00:00
|
|
|
|
exprs.extend(remaining_exprs);
|
2017-01-16 07:36:10 +00:00
|
|
|
|
ex = ExprKind::Array(exprs);
|
2014-07-06 21:29:29 +00:00
|
|
|
|
} else {
|
|
|
|
|
// Vector with one element.
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::CloseDelim(token::Bracket))?;
|
2017-01-16 07:36:10 +00:00
|
|
|
|
ex = ExprKind::Array(vec![first_expr]);
|
2014-07-06 21:29:29 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2017-03-15 00:22:48 +00:00
|
|
|
|
hi = self.prev_span;
|
2014-08-06 02:44:21 +00:00
|
|
|
|
}
|
librustc: Disallow mutation and assignment in pattern guards, and modify
the CFG for match statements.
There were two bugs in issue #14684. One was simply that the borrow
check didn't know about the correct CFG for match statements: the
pattern must be a predecessor of the guard. This disallows the bad
behavior if there are bindings in the pattern. But it isn't enough to
prevent the memory safety problem, because of wildcards; thus, this
patch introduces a more restrictive rule, which disallows assignments
and mutable borrows inside guards outright.
I discussed this with Niko and we decided this was the best plan of
action.
This breaks code that performs mutable borrows in pattern guards. Most
commonly, the code looks like this:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz if self.f(...) => { ... }
_ => { ... }
}
}
}
Change this code to not use a guard. For example:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz => {
if self.f(...) {
...
} else {
...
}
}
_ => { ... }
}
}
}
Sometimes this can result in code duplication, but often it illustrates
a hidden memory safety problem.
Closes #14684.
[breaking-change]
2014-07-25 22:18:19 +00:00
|
|
|
|
_ => {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_lt() {
|
2017-07-19 23:39:34 +00:00
|
|
|
|
let (qself, path) = self.parse_qpath(PathStyle::Expr)?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
hi = path.span;
|
|
|
|
|
return Ok(self.mk_expr(lo.to(hi), ExprKind::Path(Some(qself), path), attrs));
|
2015-01-13 04:03:12 +00:00
|
|
|
|
}
|
2017-10-07 14:36:28 +00:00
|
|
|
|
if self.check_keyword(keywords::Move) || self.check_keyword(keywords::Static) {
|
|
|
|
|
return self.parse_lambda_expr(attrs);
|
2014-07-23 19:43:29 +00:00
|
|
|
|
}
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::If) {
|
2015-11-03 16:39:51 +00:00
|
|
|
|
return self.parse_if_expr(attrs);
|
librustc: Disallow mutation and assignment in pattern guards, and modify
the CFG for match statements.
There were two bugs in issue #14684. One was simply that the borrow
check didn't know about the correct CFG for match statements: the
pattern must be a predecessor of the guard. This disallows the bad
behavior if there are bindings in the pattern. But it isn't enough to
prevent the memory safety problem, because of wildcards; thus, this
patch introduces a more restrictive rule, which disallows assignments
and mutable borrows inside guards outright.
I discussed this with Niko and we decided this was the best plan of
action.
This breaks code that performs mutable borrows in pattern guards. Most
commonly, the code looks like this:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz if self.f(...) => { ... }
_ => { ... }
}
}
}
Change this code to not use a guard. For example:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz => {
if self.f(...) {
...
} else {
...
}
}
_ => { ... }
}
}
}
Sometimes this can result in code duplication, but often it illustrates
a hidden memory safety problem.
Closes #14684.
[breaking-change]
2014-07-25 22:18:19 +00:00
|
|
|
|
}
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::For) {
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.prev_span;
|
2015-11-03 16:39:51 +00:00
|
|
|
|
return self.parse_for_expr(None, lo, attrs);
|
librustc: Disallow mutation and assignment in pattern guards, and modify
the CFG for match statements.
There were two bugs in issue #14684. One was simply that the borrow
check didn't know about the correct CFG for match statements: the
pattern must be a predecessor of the guard. This disallows the bad
behavior if there are bindings in the pattern. But it isn't enough to
prevent the memory safety problem, because of wildcards; thus, this
patch introduces a more restrictive rule, which disallows assignments
and mutable borrows inside guards outright.
I discussed this with Niko and we decided this was the best plan of
action.
This breaks code that performs mutable borrows in pattern guards. Most
commonly, the code looks like this:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz if self.f(...) => { ... }
_ => { ... }
}
}
}
Change this code to not use a guard. For example:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz => {
if self.f(...) {
...
} else {
...
}
}
_ => { ... }
}
}
}
Sometimes this can result in code duplication, but often it illustrates
a hidden memory safety problem.
Closes #14684.
[breaking-change]
2014-07-25 22:18:19 +00:00
|
|
|
|
}
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::While) {
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.prev_span;
|
2015-11-03 16:39:51 +00:00
|
|
|
|
return self.parse_while_expr(None, lo, attrs);
|
librustc: Disallow mutation and assignment in pattern guards, and modify
the CFG for match statements.
There were two bugs in issue #14684. One was simply that the borrow
check didn't know about the correct CFG for match statements: the
pattern must be a predecessor of the guard. This disallows the bad
behavior if there are bindings in the pattern. But it isn't enough to
prevent the memory safety problem, because of wildcards; thus, this
patch introduces a more restrictive rule, which disallows assignments
and mutable borrows inside guards outright.
I discussed this with Niko and we decided this was the best plan of
action.
This breaks code that performs mutable borrows in pattern guards. Most
commonly, the code looks like this:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz if self.f(...) => { ... }
_ => { ... }
}
}
}
Change this code to not use a guard. For example:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz => {
if self.f(...) {
...
} else {
...
}
}
_ => { ... }
}
}
}
Sometimes this can result in code duplication, but often it illustrates
a hidden memory safety problem.
Closes #14684.
[breaking-change]
2014-07-25 22:18:19 +00:00
|
|
|
|
}
|
2018-01-15 22:44:32 +00:00
|
|
|
|
if let Some(label) = self.eat_label() {
|
2018-03-19 00:54:56 +00:00
|
|
|
|
let lo = label.ident.span;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::Colon)?;
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::While) {
|
2016-05-02 16:22:03 +00:00
|
|
|
|
return self.parse_while_expr(Some(label), lo, attrs)
|
2014-07-26 00:12:51 +00:00
|
|
|
|
}
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::For) {
|
2016-05-02 16:22:03 +00:00
|
|
|
|
return self.parse_for_expr(Some(label), lo, attrs)
|
librustc: Disallow mutation and assignment in pattern guards, and modify
the CFG for match statements.
There were two bugs in issue #14684. One was simply that the borrow
check didn't know about the correct CFG for match statements: the
pattern must be a predecessor of the guard. This disallows the bad
behavior if there are bindings in the pattern. But it isn't enough to
prevent the memory safety problem, because of wildcards; thus, this
patch introduces a more restrictive rule, which disallows assignments
and mutable borrows inside guards outright.
I discussed this with Niko and we decided this was the best plan of
action.
This breaks code that performs mutable borrows in pattern guards. Most
commonly, the code looks like this:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz if self.f(...) => { ... }
_ => { ... }
}
}
}
Change this code to not use a guard. For example:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz => {
if self.f(...) {
...
} else {
...
}
}
_ => { ... }
}
}
}
Sometimes this can result in code duplication, but often it illustrates
a hidden memory safety problem.
Closes #14684.
[breaking-change]
2014-07-25 22:18:19 +00:00
|
|
|
|
}
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::Loop) {
|
2016-05-02 16:22:03 +00:00
|
|
|
|
return self.parse_loop_expr(Some(label), lo, attrs)
|
librustc: Disallow mutation and assignment in pattern guards, and modify
the CFG for match statements.
There were two bugs in issue #14684. One was simply that the borrow
check didn't know about the correct CFG for match statements: the
pattern must be a predecessor of the guard. This disallows the bad
behavior if there are bindings in the pattern. But it isn't enough to
prevent the memory safety problem, because of wildcards; thus, this
patch introduces a more restrictive rule, which disallows assignments
and mutable borrows inside guards outright.
I discussed this with Niko and we decided this was the best plan of
action.
This breaks code that performs mutable borrows in pattern guards. Most
commonly, the code looks like this:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz if self.f(...) => { ... }
_ => { ... }
}
}
}
Change this code to not use a guard. For example:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz => {
if self.f(...) {
...
} else {
...
}
}
_ => { ... }
}
}
}
Sometimes this can result in code duplication, but often it illustrates
a hidden memory safety problem.
Closes #14684.
[breaking-change]
2014-07-25 22:18:19 +00:00
|
|
|
|
}
|
2018-04-16 03:44:39 +00:00
|
|
|
|
if self.token == token::OpenDelim(token::Brace) {
|
|
|
|
|
return self.parse_block_expr(Some(label),
|
|
|
|
|
lo,
|
|
|
|
|
BlockCheckMode::Default,
|
|
|
|
|
attrs);
|
|
|
|
|
}
|
|
|
|
|
let msg = "expected `while`, `for`, `loop` or `{` after a label";
|
2018-02-19 07:08:23 +00:00
|
|
|
|
let mut err = self.fatal(msg);
|
|
|
|
|
err.span_label(self.span, msg);
|
|
|
|
|
return Err(err);
|
2012-08-04 01:01:30 +00:00
|
|
|
|
}
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::Loop) {
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.prev_span;
|
2015-11-03 16:39:51 +00:00
|
|
|
|
return self.parse_loop_expr(None, lo, attrs);
|
librustc: Disallow mutation and assignment in pattern guards, and modify
the CFG for match statements.
There were two bugs in issue #14684. One was simply that the borrow
check didn't know about the correct CFG for match statements: the
pattern must be a predecessor of the guard. This disallows the bad
behavior if there are bindings in the pattern. But it isn't enough to
prevent the memory safety problem, because of wildcards; thus, this
patch introduces a more restrictive rule, which disallows assignments
and mutable borrows inside guards outright.
I discussed this with Niko and we decided this was the best plan of
action.
This breaks code that performs mutable borrows in pattern guards. Most
commonly, the code looks like this:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz if self.f(...) => { ... }
_ => { ... }
}
}
}
Change this code to not use a guard. For example:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz => {
if self.f(...) {
...
} else {
...
}
}
_ => { ... }
}
}
}
Sometimes this can result in code duplication, but often it illustrates
a hidden memory safety problem.
Closes #14684.
[breaking-change]
2014-07-25 22:18:19 +00:00
|
|
|
|
}
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::Continue) {
|
2018-01-15 22:44:32 +00:00
|
|
|
|
let label = self.eat_label();
|
|
|
|
|
let ex = ExprKind::Continue(label);
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let hi = self.prev_span;
|
|
|
|
|
return Ok(self.mk_expr(lo.to(hi), ex, attrs));
|
librustc: Disallow mutation and assignment in pattern guards, and modify
the CFG for match statements.
There were two bugs in issue #14684. One was simply that the borrow
check didn't know about the correct CFG for match statements: the
pattern must be a predecessor of the guard. This disallows the bad
behavior if there are bindings in the pattern. But it isn't enough to
prevent the memory safety problem, because of wildcards; thus, this
patch introduces a more restrictive rule, which disallows assignments
and mutable borrows inside guards outright.
I discussed this with Niko and we decided this was the best plan of
action.
This breaks code that performs mutable borrows in pattern guards. Most
commonly, the code looks like this:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz if self.f(...) => { ... }
_ => { ... }
}
}
}
Change this code to not use a guard. For example:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz => {
if self.f(...) {
...
} else {
...
}
}
_ => { ... }
}
}
}
Sometimes this can result in code duplication, but often it illustrates
a hidden memory safety problem.
Closes #14684.
[breaking-change]
2014-07-25 22:18:19 +00:00
|
|
|
|
}
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::Match) {
|
2015-11-03 16:39:51 +00:00
|
|
|
|
return self.parse_match_expr(attrs);
|
librustc: Disallow mutation and assignment in pattern guards, and modify
the CFG for match statements.
There were two bugs in issue #14684. One was simply that the borrow
check didn't know about the correct CFG for match statements: the
pattern must be a predecessor of the guard. This disallows the bad
behavior if there are bindings in the pattern. But it isn't enough to
prevent the memory safety problem, because of wildcards; thus, this
patch introduces a more restrictive rule, which disallows assignments
and mutable borrows inside guards outright.
I discussed this with Niko and we decided this was the best plan of
action.
This breaks code that performs mutable borrows in pattern guards. Most
commonly, the code looks like this:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz if self.f(...) => { ... }
_ => { ... }
}
}
}
Change this code to not use a guard. For example:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz => {
if self.f(...) {
...
} else {
...
}
}
_ => { ... }
}
}
}
Sometimes this can result in code duplication, but often it illustrates
a hidden memory safety problem.
Closes #14684.
[breaking-change]
2014-07-25 22:18:19 +00:00
|
|
|
|
}
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::Unsafe) {
|
librustc: Disallow mutation and assignment in pattern guards, and modify
the CFG for match statements.
There were two bugs in issue #14684. One was simply that the borrow
check didn't know about the correct CFG for match statements: the
pattern must be a predecessor of the guard. This disallows the bad
behavior if there are bindings in the pattern. But it isn't enough to
prevent the memory safety problem, because of wildcards; thus, this
patch introduces a more restrictive rule, which disallows assignments
and mutable borrows inside guards outright.
I discussed this with Niko and we decided this was the best plan of
action.
This breaks code that performs mutable borrows in pattern guards. Most
commonly, the code looks like this:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz if self.f(...) => { ... }
_ => { ... }
}
}
}
Change this code to not use a guard. For example:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz => {
if self.f(...) {
...
} else {
...
}
}
_ => { ... }
}
}
}
Sometimes this can result in code duplication, but often it illustrates
a hidden memory safety problem.
Closes #14684.
[breaking-change]
2014-07-25 22:18:19 +00:00
|
|
|
|
return self.parse_block_expr(
|
2018-04-16 03:44:39 +00:00
|
|
|
|
None,
|
librustc: Disallow mutation and assignment in pattern guards, and modify
the CFG for match statements.
There were two bugs in issue #14684. One was simply that the borrow
check didn't know about the correct CFG for match statements: the
pattern must be a predecessor of the guard. This disallows the bad
behavior if there are bindings in the pattern. But it isn't enough to
prevent the memory safety problem, because of wildcards; thus, this
patch introduces a more restrictive rule, which disallows assignments
and mutable borrows inside guards outright.
I discussed this with Niko and we decided this was the best plan of
action.
This breaks code that performs mutable borrows in pattern guards. Most
commonly, the code looks like this:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz if self.f(...) => { ... }
_ => { ... }
}
}
}
Change this code to not use a guard. For example:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz => {
if self.f(...) {
...
} else {
...
}
}
_ => { ... }
}
}
}
Sometimes this can result in code duplication, but often it illustrates
a hidden memory safety problem.
Closes #14684.
[breaking-change]
2014-07-25 22:18:19 +00:00
|
|
|
|
lo,
|
2016-02-08 11:44:45 +00:00
|
|
|
|
BlockCheckMode::Unsafe(ast::UserProvided),
|
2015-11-03 16:39:51 +00:00
|
|
|
|
attrs);
|
librustc: Disallow mutation and assignment in pattern guards, and modify
the CFG for match statements.
There were two bugs in issue #14684. One was simply that the borrow
check didn't know about the correct CFG for match statements: the
pattern must be a predecessor of the guard. This disallows the bad
behavior if there are bindings in the pattern. But it isn't enough to
prevent the memory safety problem, because of wildcards; thus, this
patch introduces a more restrictive rule, which disallows assignments
and mutable borrows inside guards outright.
I discussed this with Niko and we decided this was the best plan of
action.
This breaks code that performs mutable borrows in pattern guards. Most
commonly, the code looks like this:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz if self.f(...) => { ... }
_ => { ... }
}
}
}
Change this code to not use a guard. For example:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz => {
if self.f(...) {
...
} else {
...
}
}
_ => { ... }
}
}
}
Sometimes this can result in code duplication, but often it illustrates
a hidden memory safety problem.
Closes #14684.
[breaking-change]
2014-07-25 22:18:19 +00:00
|
|
|
|
}
|
2017-02-17 23:12:47 +00:00
|
|
|
|
if self.is_catch_expr() {
|
2017-07-24 23:39:41 +00:00
|
|
|
|
let lo = self.span;
|
2017-03-03 22:41:07 +00:00
|
|
|
|
assert!(self.eat_keyword(keywords::Do));
|
2017-02-17 23:12:47 +00:00
|
|
|
|
assert!(self.eat_keyword(keywords::Catch));
|
|
|
|
|
return self.parse_catch_expr(lo, attrs);
|
|
|
|
|
}
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::Return) {
|
2014-10-27 12:33:30 +00:00
|
|
|
|
if self.token.can_begin_expr() {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let e = self.parse_expr()?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
hi = e.span;
|
2016-02-08 15:05:05 +00:00
|
|
|
|
ex = ExprKind::Ret(Some(e));
|
librustc: Disallow mutation and assignment in pattern guards, and modify
the CFG for match statements.
There were two bugs in issue #14684. One was simply that the borrow
check didn't know about the correct CFG for match statements: the
pattern must be a predecessor of the guard. This disallows the bad
behavior if there are bindings in the pattern. But it isn't enough to
prevent the memory safety problem, because of wildcards; thus, this
patch introduces a more restrictive rule, which disallows assignments
and mutable borrows inside guards outright.
I discussed this with Niko and we decided this was the best plan of
action.
This breaks code that performs mutable borrows in pattern guards. Most
commonly, the code looks like this:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz if self.f(...) => { ... }
_ => { ... }
}
}
}
Change this code to not use a guard. For example:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz => {
if self.f(...) {
...
} else {
...
}
}
_ => { ... }
}
}
}
Sometimes this can result in code duplication, but often it illustrates
a hidden memory safety problem.
Closes #14684.
[breaking-change]
2014-07-25 22:18:19 +00:00
|
|
|
|
} else {
|
2016-02-08 15:05:05 +00:00
|
|
|
|
ex = ExprKind::Ret(None);
|
librustc: Disallow mutation and assignment in pattern guards, and modify
the CFG for match statements.
There were two bugs in issue #14684. One was simply that the borrow
check didn't know about the correct CFG for match statements: the
pattern must be a predecessor of the guard. This disallows the bad
behavior if there are bindings in the pattern. But it isn't enough to
prevent the memory safety problem, because of wildcards; thus, this
patch introduces a more restrictive rule, which disallows assignments
and mutable borrows inside guards outright.
I discussed this with Niko and we decided this was the best plan of
action.
This breaks code that performs mutable borrows in pattern guards. Most
commonly, the code looks like this:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz if self.f(...) => { ... }
_ => { ... }
}
}
}
Change this code to not use a guard. For example:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz => {
if self.f(...) {
...
} else {
...
}
}
_ => { ... }
}
}
}
Sometimes this can result in code duplication, but often it illustrates
a hidden memory safety problem.
Closes #14684.
[breaking-change]
2014-07-25 22:18:19 +00:00
|
|
|
|
}
|
2015-12-30 23:11:53 +00:00
|
|
|
|
} else if self.eat_keyword(keywords::Break) {
|
2018-01-15 22:44:32 +00:00
|
|
|
|
let label = self.eat_label();
|
Implement the `loop_break_value` feature.
This implements RFC 1624, tracking issue #37339.
- `FnCtxt` (in typeck) gets a stack of `LoopCtxt`s, which store the
currently deduced type of that loop, the desired type, and a list of
break expressions currently seen. `loop` loops get a fresh type
variable as their initial type (this logic is stolen from that for
arrays). `while` loops get `()`.
- `break {expr}` looks up the broken loop, and unifies the type of
`expr` with the type of the loop.
- `break` with no expr unifies the loop's type with `()`.
- When building MIR, `loop` loops no longer construct a `()` value at
termination of the loop; rather, the `break` expression assigns the
result of the loop. `while` loops are unchanged.
- `break` respects contexts in which expressions may not end with braced
blocks. That is, `while break { break-value } { while-body }` is
illegal; this preserves backwards compatibility.
- The RFC did not make it clear, but I chose to make `break ()` inside
of a `while` loop illegal, just in case we wanted to do anything with
that design space in the future.
This is my first time dealing with this part of rustc so I'm sure
there's plenty of problems to pick on here ^_^
2016-10-29 22:15:06 +00:00
|
|
|
|
let e = if self.token.can_begin_expr()
|
|
|
|
|
&& !(self.token == token::OpenDelim(token::Brace)
|
|
|
|
|
&& self.restrictions.contains(
|
2017-09-08 19:08:01 +00:00
|
|
|
|
Restrictions::NO_STRUCT_LITERAL)) {
|
Implement the `loop_break_value` feature.
This implements RFC 1624, tracking issue #37339.
- `FnCtxt` (in typeck) gets a stack of `LoopCtxt`s, which store the
currently deduced type of that loop, the desired type, and a list of
break expressions currently seen. `loop` loops get a fresh type
variable as their initial type (this logic is stolen from that for
arrays). `while` loops get `()`.
- `break {expr}` looks up the broken loop, and unifies the type of
`expr` with the type of the loop.
- `break` with no expr unifies the loop's type with `()`.
- When building MIR, `loop` loops no longer construct a `()` value at
termination of the loop; rather, the `break` expression assigns the
result of the loop. `while` loops are unchanged.
- `break` respects contexts in which expressions may not end with braced
blocks. That is, `while break { break-value } { while-body }` is
illegal; this preserves backwards compatibility.
- The RFC did not make it clear, but I chose to make `break ()` inside
of a `while` loop illegal, just in case we wanted to do anything with
that design space in the future.
This is my first time dealing with this part of rustc so I'm sure
there's plenty of problems to pick on here ^_^
2016-10-29 22:15:06 +00:00
|
|
|
|
Some(self.parse_expr()?)
|
|
|
|
|
} else {
|
|
|
|
|
None
|
|
|
|
|
};
|
2018-01-15 22:44:32 +00:00
|
|
|
|
ex = ExprKind::Break(label, e);
|
2017-03-15 00:22:48 +00:00
|
|
|
|
hi = self.prev_span;
|
2016-12-26 13:34:03 +00:00
|
|
|
|
} else if self.eat_keyword(keywords::Yield) {
|
|
|
|
|
if self.token.can_begin_expr() {
|
|
|
|
|
let e = self.parse_expr()?;
|
|
|
|
|
hi = e.span;
|
|
|
|
|
ex = ExprKind::Yield(Some(e));
|
|
|
|
|
} else {
|
|
|
|
|
ex = ExprKind::Yield(None);
|
|
|
|
|
}
|
2016-01-14 15:52:24 +00:00
|
|
|
|
} else if self.token.is_keyword(keywords::Let) {
|
2017-06-29 10:16:35 +00:00
|
|
|
|
// Catch this syntax error here, instead of in `parse_ident`, so
|
2016-01-14 15:52:24 +00:00
|
|
|
|
// that we can explicitly mention that let is not to be used as an expression
|
2016-01-26 08:23:28 +00:00
|
|
|
|
let mut db = self.fatal("expected expression, found statement (`let`)");
|
2018-02-19 07:08:23 +00:00
|
|
|
|
db.span_label(self.span, "expected expression");
|
2016-01-26 08:23:28 +00:00
|
|
|
|
db.note("variable declaration using `let` is a statement");
|
|
|
|
|
return Err(db);
|
2016-04-20 23:03:29 +00:00
|
|
|
|
} else if self.token.is_path_start() {
|
2016-04-18 21:42:18 +00:00
|
|
|
|
let pth = self.parse_path(PathStyle::Expr)?;
|
librustc: Disallow mutation and assignment in pattern guards, and modify
the CFG for match statements.
There were two bugs in issue #14684. One was simply that the borrow
check didn't know about the correct CFG for match statements: the
pattern must be a predecessor of the guard. This disallows the bad
behavior if there are bindings in the pattern. But it isn't enough to
prevent the memory safety problem, because of wildcards; thus, this
patch introduces a more restrictive rule, which disallows assignments
and mutable borrows inside guards outright.
I discussed this with Niko and we decided this was the best plan of
action.
This breaks code that performs mutable borrows in pattern guards. Most
commonly, the code looks like this:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz if self.f(...) => { ... }
_ => { ... }
}
}
}
Change this code to not use a guard. For example:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz => {
if self.f(...) {
...
} else {
...
}
}
_ => { ... }
}
}
}
Sometimes this can result in code duplication, but often it illustrates
a hidden memory safety problem.
Closes #14684.
[breaking-change]
2014-07-25 22:18:19 +00:00
|
|
|
|
|
|
|
|
|
// `!`, as an operator, is prefix, so we know this isn't that
|
2016-09-22 22:26:35 +00:00
|
|
|
|
if self.eat(&token::Not) {
|
librustc: Disallow mutation and assignment in pattern guards, and modify
the CFG for match statements.
There were two bugs in issue #14684. One was simply that the borrow
check didn't know about the correct CFG for match statements: the
pattern must be a predecessor of the guard. This disallows the bad
behavior if there are bindings in the pattern. But it isn't enough to
prevent the memory safety problem, because of wildcards; thus, this
patch introduces a more restrictive rule, which disallows assignments
and mutable borrows inside guards outright.
I discussed this with Niko and we decided this was the best plan of
action.
This breaks code that performs mutable borrows in pattern guards. Most
commonly, the code looks like this:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz if self.f(...) => { ... }
_ => { ... }
}
}
}
Change this code to not use a guard. For example:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz => {
if self.f(...) {
...
} else {
...
}
}
_ => { ... }
}
}
}
Sometimes this can result in code duplication, but often it illustrates
a hidden memory safety problem.
Closes #14684.
[breaking-change]
2014-07-25 22:18:19 +00:00
|
|
|
|
// MACRO INVOCATION expression
|
2018-05-22 15:01:21 +00:00
|
|
|
|
let (delim, tts) = self.expect_delimited_token_tree()?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let hi = self.prev_span;
|
2018-05-22 15:01:21 +00:00
|
|
|
|
let node = Mac_ { path: pth, tts, delim };
|
|
|
|
|
return Ok(self.mk_mac_expr(lo.to(hi), node, attrs))
|
librustc: Disallow mutation and assignment in pattern guards, and modify
the CFG for match statements.
There were two bugs in issue #14684. One was simply that the borrow
check didn't know about the correct CFG for match statements: the
pattern must be a predecessor of the guard. This disallows the bad
behavior if there are bindings in the pattern. But it isn't enough to
prevent the memory safety problem, because of wildcards; thus, this
patch introduces a more restrictive rule, which disallows assignments
and mutable borrows inside guards outright.
I discussed this with Niko and we decided this was the best plan of
action.
This breaks code that performs mutable borrows in pattern guards. Most
commonly, the code looks like this:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz if self.f(...) => { ... }
_ => { ... }
}
}
}
Change this code to not use a guard. For example:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz => {
if self.f(...) {
...
} else {
...
}
}
_ => { ... }
}
}
}
Sometimes this can result in code duplication, but often it illustrates
a hidden memory safety problem.
Closes #14684.
[breaking-change]
2014-07-25 22:18:19 +00:00
|
|
|
|
}
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
if self.check(&token::OpenDelim(token::Brace)) {
|
librustc: Disallow mutation and assignment in pattern guards, and modify
the CFG for match statements.
There were two bugs in issue #14684. One was simply that the borrow
check didn't know about the correct CFG for match statements: the
pattern must be a predecessor of the guard. This disallows the bad
behavior if there are bindings in the pattern. But it isn't enough to
prevent the memory safety problem, because of wildcards; thus, this
patch introduces a more restrictive rule, which disallows assignments
and mutable borrows inside guards outright.
I discussed this with Niko and we decided this was the best plan of
action.
This breaks code that performs mutable borrows in pattern guards. Most
commonly, the code looks like this:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz if self.f(...) => { ... }
_ => { ... }
}
}
}
Change this code to not use a guard. For example:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz => {
if self.f(...) {
...
} else {
...
}
}
_ => { ... }
}
}
}
Sometimes this can result in code duplication, but often it illustrates
a hidden memory safety problem.
Closes #14684.
[breaking-change]
2014-07-25 22:18:19 +00:00
|
|
|
|
// This is a struct literal, unless we're prohibited
|
|
|
|
|
// from parsing struct literals here.
|
2015-04-28 23:36:22 +00:00
|
|
|
|
let prohibited = self.restrictions.contains(
|
2017-09-08 19:08:01 +00:00
|
|
|
|
Restrictions::NO_STRUCT_LITERAL
|
2015-04-28 23:36:22 +00:00
|
|
|
|
);
|
|
|
|
|
if !prohibited {
|
2016-09-22 04:45:29 +00:00
|
|
|
|
return self.parse_struct_expr(lo, pth, attrs);
|
2014-07-06 21:29:29 +00:00
|
|
|
|
}
|
2014-06-14 02:09:12 +00:00
|
|
|
|
}
|
2012-07-23 23:39:18 +00:00
|
|
|
|
|
2017-03-15 00:22:48 +00:00
|
|
|
|
hi = pth.span;
|
2016-02-08 15:05:05 +00:00
|
|
|
|
ex = ExprKind::Path(None, pth);
|
librustc: Disallow mutation and assignment in pattern guards, and modify
the CFG for match statements.
There were two bugs in issue #14684. One was simply that the borrow
check didn't know about the correct CFG for match statements: the
pattern must be a predecessor of the guard. This disallows the bad
behavior if there are bindings in the pattern. But it isn't enough to
prevent the memory safety problem, because of wildcards; thus, this
patch introduces a more restrictive rule, which disallows assignments
and mutable borrows inside guards outright.
I discussed this with Niko and we decided this was the best plan of
action.
This breaks code that performs mutable borrows in pattern guards. Most
commonly, the code looks like this:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz if self.f(...) => { ... }
_ => { ... }
}
}
}
Change this code to not use a guard. For example:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz => {
if self.f(...) {
...
} else {
...
}
}
_ => { ... }
}
}
}
Sometimes this can result in code duplication, but often it illustrates
a hidden memory safety problem.
Closes #14684.
[breaking-change]
2014-07-25 22:18:19 +00:00
|
|
|
|
} else {
|
2018-04-09 23:08:47 +00:00
|
|
|
|
match self.parse_literal_maybe_minus() {
|
|
|
|
|
Ok(expr) => {
|
|
|
|
|
hi = expr.span;
|
|
|
|
|
ex = expr.node.clone();
|
2016-04-20 23:03:29 +00:00
|
|
|
|
}
|
|
|
|
|
Err(mut err) => {
|
2016-09-15 19:34:21 +00:00
|
|
|
|
self.cancel(&mut err);
|
2016-04-20 23:03:29 +00:00
|
|
|
|
let msg = format!("expected expression, found {}",
|
|
|
|
|
self.this_token_descr());
|
2018-02-19 07:08:23 +00:00
|
|
|
|
let mut err = self.fatal(&msg);
|
|
|
|
|
err.span_label(self.span, "expected expression");
|
|
|
|
|
return Err(err);
|
2016-04-20 23:03:29 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
librustc: Disallow mutation and assignment in pattern guards, and modify
the CFG for match statements.
There were two bugs in issue #14684. One was simply that the borrow
check didn't know about the correct CFG for match statements: the
pattern must be a predecessor of the guard. This disallows the bad
behavior if there are bindings in the pattern. But it isn't enough to
prevent the memory safety problem, because of wildcards; thus, this
patch introduces a more restrictive rule, which disallows assignments
and mutable borrows inside guards outright.
I discussed this with Niko and we decided this was the best plan of
action.
This breaks code that performs mutable borrows in pattern guards. Most
commonly, the code looks like this:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz if self.f(...) => { ... }
_ => { ... }
}
}
}
Change this code to not use a guard. For example:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz => {
if self.f(...) {
...
} else {
...
}
}
_ => { ... }
}
}
}
Sometimes this can result in code duplication, but often it illustrates
a hidden memory safety problem.
Closes #14684.
[breaking-change]
2014-07-25 22:18:19 +00:00
|
|
|
|
}
|
2014-07-06 21:29:29 +00:00
|
|
|
|
}
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-12-16 22:53:11 +00:00
|
|
|
|
let expr = Expr { node: ex, span: lo.to(hi), id: ast::DUMMY_NODE_ID, attrs };
|
2017-12-18 20:59:31 +00:00
|
|
|
|
let expr = self.maybe_recover_from_bad_qpath(expr, true)?;
|
2017-12-16 22:53:11 +00:00
|
|
|
|
|
|
|
|
|
return Ok(P(expr));
|
2015-11-03 16:39:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-03-15 00:22:48 +00:00
|
|
|
|
fn parse_struct_expr(&mut self, lo: Span, pth: ast::Path, mut attrs: ThinVec<Attribute>)
|
2016-09-22 04:45:29 +00:00
|
|
|
|
-> PResult<'a, P<Expr>> {
|
2018-01-06 22:43:20 +00:00
|
|
|
|
let struct_sp = lo.to(self.prev_span);
|
2016-09-22 04:45:29 +00:00
|
|
|
|
self.bump();
|
|
|
|
|
let mut fields = Vec::new();
|
|
|
|
|
let mut base = None;
|
|
|
|
|
|
|
|
|
|
attrs.extend(self.parse_inner_attributes()?);
|
|
|
|
|
|
|
|
|
|
while self.token != token::CloseDelim(token::Brace) {
|
|
|
|
|
if self.eat(&token::DotDot) {
|
2017-10-10 02:11:22 +00:00
|
|
|
|
let exp_span = self.prev_span;
|
2016-09-22 04:45:29 +00:00
|
|
|
|
match self.parse_expr() {
|
|
|
|
|
Ok(e) => {
|
|
|
|
|
base = Some(e);
|
|
|
|
|
}
|
|
|
|
|
Err(mut e) => {
|
|
|
|
|
e.emit();
|
|
|
|
|
self.recover_stmt();
|
|
|
|
|
}
|
|
|
|
|
}
|
2017-10-10 02:11:22 +00:00
|
|
|
|
if self.token == token::Comma {
|
|
|
|
|
let mut err = self.sess.span_diagnostic.mut_span_err(
|
|
|
|
|
exp_span.to(self.prev_span),
|
|
|
|
|
"cannot use a comma after the base struct",
|
|
|
|
|
);
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
err.span_suggestion_short_with_applicability(
|
|
|
|
|
self.span,
|
|
|
|
|
"remove this comma",
|
|
|
|
|
"".to_owned(),
|
|
|
|
|
Applicability::MachineApplicable
|
|
|
|
|
);
|
2017-10-10 02:11:22 +00:00
|
|
|
|
err.note("the base struct must always be the last field");
|
|
|
|
|
err.emit();
|
|
|
|
|
self.recover_stmt();
|
|
|
|
|
}
|
2016-09-22 04:45:29 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
match self.parse_field() {
|
|
|
|
|
Ok(f) => fields.push(f),
|
|
|
|
|
Err(mut e) => {
|
2018-01-06 22:43:20 +00:00
|
|
|
|
e.span_label(struct_sp, "while parsing this struct");
|
2016-09-22 04:45:29 +00:00
|
|
|
|
e.emit();
|
|
|
|
|
self.recover_stmt();
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
match self.expect_one_of(&[token::Comma],
|
|
|
|
|
&[token::CloseDelim(token::Brace)]) {
|
|
|
|
|
Ok(()) => {}
|
|
|
|
|
Err(mut e) => {
|
|
|
|
|
e.emit();
|
|
|
|
|
self.recover_stmt();
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let span = lo.to(self.span);
|
2016-09-22 04:45:29 +00:00
|
|
|
|
self.expect(&token::CloseDelim(token::Brace))?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
return Ok(self.mk_expr(span, ExprKind::Struct(pth, fields, base), attrs));
|
2016-09-22 04:45:29 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-11-03 16:39:51 +00:00
|
|
|
|
fn parse_or_use_outer_attributes(&mut self,
|
2016-06-18 04:01:57 +00:00
|
|
|
|
already_parsed_attrs: Option<ThinVec<Attribute>>)
|
|
|
|
|
-> PResult<'a, ThinVec<Attribute>> {
|
2015-11-03 16:39:51 +00:00
|
|
|
|
if let Some(attrs) = already_parsed_attrs {
|
|
|
|
|
Ok(attrs)
|
|
|
|
|
} else {
|
2016-06-18 04:01:57 +00:00
|
|
|
|
self.parse_outer_attributes().map(|a| a.into())
|
2015-11-03 16:39:51 +00:00
|
|
|
|
}
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2010-09-28 01:25:02 +00:00
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse a block or unsafe block
|
2018-04-16 03:44:39 +00:00
|
|
|
|
pub fn parse_block_expr(&mut self, opt_label: Option<Label>,
|
|
|
|
|
lo: Span, blk_mode: BlockCheckMode,
|
2016-06-18 04:01:57 +00:00
|
|
|
|
outer_attrs: ThinVec<Attribute>)
|
2015-12-20 21:00:43 +00:00
|
|
|
|
-> PResult<'a, P<Expr>> {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::OpenDelim(token::Brace))?;
|
2015-11-03 16:39:51 +00:00
|
|
|
|
|
2016-06-18 04:01:57 +00:00
|
|
|
|
let mut attrs = outer_attrs;
|
|
|
|
|
attrs.extend(self.parse_inner_attributes()?);
|
2015-11-03 16:39:51 +00:00
|
|
|
|
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let blk = self.parse_block_tail(lo, blk_mode)?;
|
2018-04-16 03:44:39 +00:00
|
|
|
|
return Ok(self.mk_expr(blk.span, ExprKind::Block(blk, opt_label), attrs));
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2011-10-06 23:42:27 +00:00
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// parse a.b or a(13) or a[4] or just a
|
2015-11-03 16:39:51 +00:00
|
|
|
|
pub fn parse_dot_or_call_expr(&mut self,
|
2016-06-18 04:01:57 +00:00
|
|
|
|
already_parsed_attrs: Option<ThinVec<Attribute>>)
|
2015-12-20 21:00:43 +00:00
|
|
|
|
-> PResult<'a, P<Expr>> {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let attrs = self.parse_or_use_outer_attributes(already_parsed_attrs)?;
|
2015-11-03 16:39:51 +00:00
|
|
|
|
|
2016-01-27 09:47:33 +00:00
|
|
|
|
let b = self.parse_bottom_expr();
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let (span, b) = self.interpolated_or_expr_span(b)?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
self.parse_dot_or_call_expr_with(b, span, attrs)
|
2015-11-03 16:39:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn parse_dot_or_call_expr_with(&mut self,
|
|
|
|
|
e0: P<Expr>,
|
2017-03-15 00:22:48 +00:00
|
|
|
|
lo: Span,
|
2016-06-18 04:01:57 +00:00
|
|
|
|
mut attrs: ThinVec<Attribute>)
|
2015-12-20 21:00:43 +00:00
|
|
|
|
-> PResult<'a, P<Expr>> {
|
2015-11-03 16:39:51 +00:00
|
|
|
|
// Stitch the list of outer attributes onto the return value.
|
|
|
|
|
// A little bit ugly, but the best way given the current code
|
|
|
|
|
// structure
|
2016-01-23 23:52:43 +00:00
|
|
|
|
self.parse_dot_or_call_expr_with_(e0, lo)
|
2015-11-03 16:39:51 +00:00
|
|
|
|
.map(|expr|
|
|
|
|
|
expr.map(|mut expr| {
|
2016-06-18 04:01:57 +00:00
|
|
|
|
attrs.extend::<Vec<_>>(expr.attrs.into());
|
|
|
|
|
expr.attrs = attrs;
|
2015-11-03 16:39:51 +00:00
|
|
|
|
match expr.node {
|
2016-02-08 15:05:05 +00:00
|
|
|
|
ExprKind::If(..) | ExprKind::IfLet(..) => {
|
2016-06-18 04:01:57 +00:00
|
|
|
|
if !expr.attrs.is_empty() {
|
2015-11-03 16:39:51 +00:00
|
|
|
|
// Just point to the first attribute in there...
|
2016-06-18 04:01:57 +00:00
|
|
|
|
let span = expr.attrs[0].span;
|
2015-11-03 16:39:51 +00:00
|
|
|
|
|
|
|
|
|
self.span_err(span,
|
|
|
|
|
"attributes are not yet allowed on `if` \
|
|
|
|
|
expressions");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
_ => {}
|
|
|
|
|
}
|
|
|
|
|
expr
|
|
|
|
|
})
|
|
|
|
|
)
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2011-12-21 04:12:52 +00:00
|
|
|
|
|
2017-07-19 23:39:34 +00:00
|
|
|
|
// Assuming we have just parsed `.`, continue parsing into an expression.
|
|
|
|
|
fn parse_dot_suffix(&mut self, self_arg: P<Expr>, lo: Span) -> PResult<'a, P<Expr>> {
|
2017-08-10 23:30:08 +00:00
|
|
|
|
let segment = self.parse_path_segment(PathStyle::Expr, true)?;
|
2016-01-20 04:15:03 +00:00
|
|
|
|
Ok(match self.token {
|
|
|
|
|
token::OpenDelim(token::Paren) => {
|
2017-07-19 23:39:34 +00:00
|
|
|
|
// Method call `expr.f()`
|
|
|
|
|
let mut args = self.parse_unspanned_seq(
|
2016-01-20 04:15:03 +00:00
|
|
|
|
&token::OpenDelim(token::Paren),
|
|
|
|
|
&token::CloseDelim(token::Paren),
|
2016-02-23 04:24:42 +00:00
|
|
|
|
SeqSep::trailing_allowed(token::Comma),
|
2016-03-23 03:01:37 +00:00
|
|
|
|
|p| Ok(p.parse_expr()?)
|
|
|
|
|
)?;
|
2017-07-19 23:39:34 +00:00
|
|
|
|
args.insert(0, self_arg);
|
2016-01-20 04:15:03 +00:00
|
|
|
|
|
2017-07-19 23:39:34 +00:00
|
|
|
|
let span = lo.to(self.prev_span);
|
|
|
|
|
self.mk_expr(span, ExprKind::MethodCall(segment, args), ThinVec::new())
|
2016-01-20 04:15:03 +00:00
|
|
|
|
}
|
|
|
|
|
_ => {
|
2017-07-19 23:39:34 +00:00
|
|
|
|
// Field access `expr.f`
|
|
|
|
|
if let Some(parameters) = segment.parameters {
|
2017-07-23 17:50:56 +00:00
|
|
|
|
self.span_err(parameters.span(),
|
2017-07-06 23:39:55 +00:00
|
|
|
|
"field expressions may not have generic arguments");
|
2016-01-20 04:15:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-07-19 23:39:34 +00:00
|
|
|
|
let span = lo.to(self.prev_span);
|
2018-03-18 13:47:09 +00:00
|
|
|
|
self.mk_expr(span, ExprKind::Field(self_arg, segment.ident), ThinVec::new())
|
2016-01-20 04:15:03 +00:00
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-15 00:22:48 +00:00
|
|
|
|
fn parse_dot_or_call_expr_with_(&mut self, e0: P<Expr>, lo: Span) -> PResult<'a, P<Expr>> {
|
2012-05-23 22:06:11 +00:00
|
|
|
|
let mut e = e0;
|
2012-05-24 20:35:57 +00:00
|
|
|
|
let mut hi;
|
2012-05-23 22:06:11 +00:00
|
|
|
|
loop {
|
2016-02-28 22:38:48 +00:00
|
|
|
|
// expr?
|
|
|
|
|
while self.eat(&token::Question) {
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let hi = self.prev_span;
|
|
|
|
|
e = self.mk_expr(lo.to(hi), ExprKind::Try(e), ThinVec::new());
|
2016-02-28 22:38:48 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-05-23 22:06:11 +00:00
|
|
|
|
// expr.f
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat(&token::Dot) {
|
2013-12-30 23:09:41 +00:00
|
|
|
|
match self.token {
|
2017-07-19 23:39:34 +00:00
|
|
|
|
token::Ident(..) => {
|
|
|
|
|
e = self.parse_dot_suffix(e, lo)?;
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2018-04-01 18:48:39 +00:00
|
|
|
|
token::Literal(token::Integer(name), _) => {
|
|
|
|
|
let span = self.span;
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2018-04-05 00:20:21 +00:00
|
|
|
|
let field = ExprKind::Field(e, Ident::new(name, span));
|
2018-04-01 18:48:39 +00:00
|
|
|
|
e = self.mk_expr(lo.to(span), field, ThinVec::new());
|
2014-08-10 03:54:33 +00:00
|
|
|
|
}
|
2014-11-19 04:48:38 +00:00
|
|
|
|
token::Literal(token::Float(n), _suf) => {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2014-10-18 02:39:44 +00:00
|
|
|
|
let fstr = n.as_str();
|
2017-04-05 16:50:04 +00:00
|
|
|
|
let mut err = self.diagnostic().struct_span_err(self.prev_span,
|
2016-11-17 14:04:20 +00:00
|
|
|
|
&format!("unexpected token: `{}`", n));
|
2017-05-04 12:17:23 +00:00
|
|
|
|
err.span_label(self.prev_span, "unexpected token");
|
2015-02-19 13:36:58 +00:00
|
|
|
|
if fstr.chars().all(|x| "0123456789.".contains(x)) {
|
2015-01-28 06:52:32 +00:00
|
|
|
|
let float = match fstr.parse::<f64>().ok() {
|
2014-10-18 02:39:44 +00:00
|
|
|
|
Some(f) => f,
|
|
|
|
|
None => continue,
|
|
|
|
|
};
|
2017-01-31 13:45:08 +00:00
|
|
|
|
let sugg = pprust::to_string(|s| {
|
|
|
|
|
use print::pprust::PrintState;
|
|
|
|
|
s.popen()?;
|
|
|
|
|
s.print_expr(&e)?;
|
2017-06-25 03:22:42 +00:00
|
|
|
|
s.s.word( ".")?;
|
2017-01-31 13:45:08 +00:00
|
|
|
|
s.print_usize(float.trunc() as usize)?;
|
|
|
|
|
s.pclose()?;
|
2017-06-25 03:22:42 +00:00
|
|
|
|
s.s.word(".")?;
|
|
|
|
|
s.s.word(fstr.splitn(2, ".").last().unwrap())
|
2017-01-31 13:45:08 +00:00
|
|
|
|
});
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
err.span_suggestion_with_applicability(
|
2017-04-05 16:50:04 +00:00
|
|
|
|
lo.to(self.prev_span),
|
2017-01-31 13:45:08 +00:00
|
|
|
|
"try parenthesizing the first index",
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
sugg,
|
|
|
|
|
Applicability::MachineApplicable
|
|
|
|
|
);
|
2014-10-18 02:39:44 +00:00
|
|
|
|
}
|
2016-01-27 06:01:01 +00:00
|
|
|
|
return Err(err);
|
2014-08-10 03:54:33 +00:00
|
|
|
|
|
|
|
|
|
}
|
2016-01-20 04:15:03 +00:00
|
|
|
|
_ => {
|
|
|
|
|
// FIXME Could factor this out into non_fatal_unexpected or something.
|
|
|
|
|
let actual = self.this_token_to_string();
|
|
|
|
|
self.span_err(self.span, &format!("unexpected token: `{}`", actual));
|
|
|
|
|
}
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2013-10-01 21:31:03 +00:00
|
|
|
|
continue;
|
2012-01-31 12:31:02 +00:00
|
|
|
|
}
|
2016-02-08 22:55:55 +00:00
|
|
|
|
if self.expr_is_complete(&e) { break; }
|
2013-12-30 23:09:41 +00:00
|
|
|
|
match self.token {
|
2012-05-23 22:06:11 +00:00
|
|
|
|
// expr(...)
|
2014-10-29 10:37:54 +00:00
|
|
|
|
token::OpenDelim(token::Paren) => {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let es = self.parse_unspanned_seq(
|
2014-10-29 10:37:54 +00:00
|
|
|
|
&token::OpenDelim(token::Paren),
|
|
|
|
|
&token::CloseDelim(token::Paren),
|
2016-02-23 04:24:42 +00:00
|
|
|
|
SeqSep::trailing_allowed(token::Comma),
|
2016-03-23 03:01:37 +00:00
|
|
|
|
|p| Ok(p.parse_expr()?)
|
|
|
|
|
)?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
hi = self.prev_span;
|
2012-05-23 22:06:11 +00:00
|
|
|
|
|
2014-02-14 08:28:32 +00:00
|
|
|
|
let nd = self.mk_call(e, es);
|
2017-03-15 00:22:48 +00:00
|
|
|
|
e = self.mk_expr(lo.to(hi), nd, ThinVec::new());
|
2011-12-21 04:12:52 +00:00
|
|
|
|
}
|
2012-05-31 01:14:40 +00:00
|
|
|
|
|
|
|
|
|
// expr[...]
|
2015-01-07 19:30:33 +00:00
|
|
|
|
// Could be either an index expression or a slicing expression.
|
2014-10-29 10:37:54 +00:00
|
|
|
|
token::OpenDelim(token::Bracket) => {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let ix = self.parse_expr()?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
hi = self.span;
|
2016-07-01 23:40:45 +00:00
|
|
|
|
self.expect(&token::CloseDelim(token::Bracket))?;
|
2015-03-26 16:57:58 +00:00
|
|
|
|
let index = self.mk_index(e, ix);
|
2017-03-15 00:22:48 +00:00
|
|
|
|
e = self.mk_expr(lo.to(hi), index, ThinVec::new())
|
2012-05-31 01:14:40 +00:00
|
|
|
|
}
|
2015-03-28 21:58:51 +00:00
|
|
|
|
_ => return Ok(e)
|
2012-05-31 01:14:40 +00:00
|
|
|
|
}
|
2010-09-28 17:30:34 +00:00
|
|
|
|
}
|
2015-03-28 21:58:51 +00:00
|
|
|
|
return Ok(e);
|
2010-09-28 17:30:34 +00:00
|
|
|
|
}
|
2010-09-28 01:25:02 +00:00
|
|
|
|
|
2017-03-29 07:17:18 +00:00
|
|
|
|
pub fn process_potential_macro_variable(&mut self) {
|
2018-03-24 16:49:50 +00:00
|
|
|
|
let (token, span) = match self.token {
|
2017-07-31 20:04:34 +00:00
|
|
|
|
token::Dollar if self.span.ctxt() != syntax_pos::hygiene::SyntaxContext::empty() &&
|
2017-03-28 05:32:43 +00:00
|
|
|
|
self.look_ahead(1, |t| t.is_ident()) => {
|
|
|
|
|
self.bump();
|
2018-03-10 05:56:40 +00:00
|
|
|
|
let name = match self.token {
|
|
|
|
|
token::Ident(ident, _) => ident,
|
|
|
|
|
_ => unreachable!()
|
|
|
|
|
};
|
2018-02-19 07:08:23 +00:00
|
|
|
|
let mut err = self.fatal(&format!("unknown macro variable `{}`", name));
|
|
|
|
|
err.span_label(self.span, "unknown macro variable");
|
|
|
|
|
err.emit();
|
2017-03-29 07:17:18 +00:00
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
token::Interpolated(ref nt) => {
|
|
|
|
|
self.meta_var_span = Some(self.span);
|
2018-03-24 16:49:50 +00:00
|
|
|
|
// Interpolated identifier and lifetime tokens are replaced with usual identifier
|
|
|
|
|
// and lifetime tokens, so the former are never encountered during normal parsing.
|
2017-03-29 01:55:01 +00:00
|
|
|
|
match nt.0 {
|
2018-03-24 16:49:50 +00:00
|
|
|
|
token::NtIdent(ident, is_raw) => (token::Ident(ident, is_raw), ident.span),
|
|
|
|
|
token::NtLifetime(ident) => (token::Lifetime(ident), ident.span),
|
2017-03-29 07:17:18 +00:00
|
|
|
|
_ => return,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
_ => return,
|
|
|
|
|
};
|
2018-03-24 16:49:50 +00:00
|
|
|
|
self.token = token;
|
|
|
|
|
self.span = span;
|
2012-07-05 21:30:56 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// parse a single token tree from the input.
|
2017-03-06 06:45:28 +00:00
|
|
|
|
pub fn parse_token_tree(&mut self) -> TokenTree {
|
2014-10-29 10:37:54 +00:00
|
|
|
|
match self.token {
|
2017-01-29 08:38:44 +00:00
|
|
|
|
token::OpenDelim(..) => {
|
2017-02-20 05:44:06 +00:00
|
|
|
|
let frame = mem::replace(&mut self.token_cursor.frame,
|
|
|
|
|
self.token_cursor.stack.pop().unwrap());
|
|
|
|
|
self.span = frame.span;
|
2017-01-13 04:49:20 +00:00
|
|
|
|
self.bump();
|
2017-03-06 06:45:28 +00:00
|
|
|
|
TokenTree::Delimited(frame.span, Delimited {
|
2017-02-20 05:44:06 +00:00
|
|
|
|
delim: frame.delim,
|
2017-02-21 05:05:59 +00:00
|
|
|
|
tts: frame.tree_cursor.original_stream().into(),
|
2017-03-06 06:45:28 +00:00
|
|
|
|
})
|
2014-10-29 10:37:54 +00:00
|
|
|
|
},
|
2017-01-29 08:38:44 +00:00
|
|
|
|
token::CloseDelim(_) | token::Eof => unreachable!(),
|
2017-03-04 19:37:45 +00:00
|
|
|
|
_ => {
|
2018-03-08 11:27:23 +00:00
|
|
|
|
let (token, span) = (mem::replace(&mut self.token, token::Whitespace), self.span);
|
2017-03-04 19:37:45 +00:00
|
|
|
|
self.bump();
|
2017-03-29 07:17:18 +00:00
|
|
|
|
TokenTree::Token(span, token)
|
2017-03-04 19:37:45 +00:00
|
|
|
|
}
|
2013-02-04 21:15:17 +00:00
|
|
|
|
}
|
2012-05-21 17:45:56 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-01-09 13:05:33 +00:00
|
|
|
|
// parse a stream of tokens into a list of TokenTree's,
|
2013-04-15 23:13:42 +00:00
|
|
|
|
// up to EOF.
|
2015-12-20 21:00:43 +00:00
|
|
|
|
pub fn parse_all_token_trees(&mut self) -> PResult<'a, Vec<TokenTree>> {
|
2014-02-28 21:09:09 +00:00
|
|
|
|
let mut tts = Vec::new();
|
2014-10-27 08:22:52 +00:00
|
|
|
|
while self.token != token::Eof {
|
2017-03-06 06:45:28 +00:00
|
|
|
|
tts.push(self.parse_token_tree());
|
2012-11-21 00:07:57 +00:00
|
|
|
|
}
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(tts)
|
2012-11-21 00:07:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-03-08 23:13:35 +00:00
|
|
|
|
pub fn parse_tokens(&mut self) -> TokenStream {
|
|
|
|
|
let mut result = Vec::new();
|
|
|
|
|
loop {
|
|
|
|
|
match self.token {
|
|
|
|
|
token::Eof | token::CloseDelim(..) => break,
|
|
|
|
|
_ => result.push(self.parse_token_tree().into()),
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
TokenStream::concat(result)
|
|
|
|
|
}
|
|
|
|
|
|
2015-10-15 12:51:30 +00:00
|
|
|
|
/// Parse a prefix-unary-operator expr
|
2015-11-03 16:39:51 +00:00
|
|
|
|
pub fn parse_prefix_expr(&mut self,
|
2016-06-18 04:01:57 +00:00
|
|
|
|
already_parsed_attrs: Option<ThinVec<Attribute>>)
|
2015-12-20 21:00:43 +00:00
|
|
|
|
-> PResult<'a, P<Expr>> {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let attrs = self.parse_or_use_outer_attributes(already_parsed_attrs)?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
2015-01-10 23:14:03 +00:00
|
|
|
|
// Note: when adding new unary operators, don't forget to adjust Token::can_begin_expr()
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let (hi, ex) = match self.token {
|
2015-10-15 18:37:21 +00:00
|
|
|
|
token::Not => {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2016-01-27 09:47:33 +00:00
|
|
|
|
let e = self.parse_prefix_expr(None);
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let (span, e) = self.interpolated_or_expr_span(e)?;
|
2017-09-21 16:19:34 +00:00
|
|
|
|
(lo.to(span), self.mk_unary(UnOp::Not, e))
|
2015-10-15 18:37:21 +00:00
|
|
|
|
}
|
2017-05-03 06:31:47 +00:00
|
|
|
|
// Suggest `!` for bitwise negation when encountering a `~`
|
|
|
|
|
token::Tilde => {
|
|
|
|
|
self.bump();
|
|
|
|
|
let e = self.parse_prefix_expr(None);
|
|
|
|
|
let (span, e) = self.interpolated_or_expr_span(e)?;
|
|
|
|
|
let span_of_tilde = lo;
|
|
|
|
|
let mut err = self.diagnostic().struct_span_err(span_of_tilde,
|
2018-03-11 08:04:15 +00:00
|
|
|
|
"`~` cannot be used as a unary operator");
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
err.span_suggestion_short_with_applicability(
|
|
|
|
|
span_of_tilde,
|
|
|
|
|
"use `!` to perform bitwise negation",
|
|
|
|
|
"!".to_owned(),
|
|
|
|
|
Applicability::MachineApplicable
|
|
|
|
|
);
|
2017-05-03 06:31:47 +00:00
|
|
|
|
err.emit();
|
2017-09-21 16:19:34 +00:00
|
|
|
|
(lo.to(span), self.mk_unary(UnOp::Not, e))
|
2017-05-03 06:31:47 +00:00
|
|
|
|
}
|
2015-10-15 18:37:21 +00:00
|
|
|
|
token::BinOp(token::Minus) => {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2016-01-27 09:47:33 +00:00
|
|
|
|
let e = self.parse_prefix_expr(None);
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let (span, e) = self.interpolated_or_expr_span(e)?;
|
2017-09-21 16:19:34 +00:00
|
|
|
|
(lo.to(span), self.mk_unary(UnOp::Neg, e))
|
2015-10-15 18:37:21 +00:00
|
|
|
|
}
|
|
|
|
|
token::BinOp(token::Star) => {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2016-01-27 09:47:33 +00:00
|
|
|
|
let e = self.parse_prefix_expr(None);
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let (span, e) = self.interpolated_or_expr_span(e)?;
|
2017-09-21 16:19:34 +00:00
|
|
|
|
(lo.to(span), self.mk_unary(UnOp::Deref, e))
|
2015-10-15 18:37:21 +00:00
|
|
|
|
}
|
|
|
|
|
token::BinOp(token::And) | token::AndAnd => {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect_and()?;
|
2017-03-16 21:47:32 +00:00
|
|
|
|
let m = self.parse_mutability();
|
2016-01-27 09:47:33 +00:00
|
|
|
|
let e = self.parse_prefix_expr(None);
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let (span, e) = self.interpolated_or_expr_span(e)?;
|
2017-09-21 16:19:34 +00:00
|
|
|
|
(lo.to(span), ExprKind::AddrOf(m, e))
|
2015-10-15 18:37:21 +00:00
|
|
|
|
}
|
2018-05-24 21:34:09 +00:00
|
|
|
|
token::Ident(..) if self.token.is_keyword(keywords::In) => {
|
|
|
|
|
self.bump();
|
|
|
|
|
let place = self.parse_expr_res(
|
|
|
|
|
Restrictions::NO_STRUCT_LITERAL,
|
|
|
|
|
None,
|
|
|
|
|
)?;
|
|
|
|
|
let blk = self.parse_block()?;
|
|
|
|
|
let span = blk.span;
|
|
|
|
|
let blk_expr = self.mk_expr(span, ExprKind::Block(blk, None), ThinVec::new());
|
|
|
|
|
(lo.to(span), ExprKind::ObsoleteInPlace(place, blk_expr))
|
|
|
|
|
}
|
2015-10-15 18:37:21 +00:00
|
|
|
|
token::Ident(..) if self.token.is_keyword(keywords::Box) => {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2016-01-27 09:47:33 +00:00
|
|
|
|
let e = self.parse_prefix_expr(None);
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let (span, e) = self.interpolated_or_expr_span(e)?;
|
2017-09-21 16:19:34 +00:00
|
|
|
|
(lo.to(span), ExprKind::Box(e))
|
2015-10-15 18:37:21 +00:00
|
|
|
|
}
|
2018-03-22 05:38:24 +00:00
|
|
|
|
token::Ident(..) if self.token.is_ident_named("not") => {
|
|
|
|
|
// `not` is just an ordinary identifier in Rust-the-language,
|
|
|
|
|
// but as `rustc`-the-compiler, we can issue clever diagnostics
|
|
|
|
|
// for confused users who really want to say `!`
|
|
|
|
|
let token_cannot_continue_expr = |t: &token::Token| match *t {
|
|
|
|
|
// These tokens can start an expression after `!`, but
|
|
|
|
|
// can't continue an expression after an ident
|
|
|
|
|
token::Ident(ident, is_raw) => token::ident_can_begin_expr(ident, is_raw),
|
|
|
|
|
token::Literal(..) | token::Pound => true,
|
|
|
|
|
token::Interpolated(ref nt) => match nt.0 {
|
|
|
|
|
token::NtIdent(..) | token::NtExpr(..) |
|
|
|
|
|
token::NtBlock(..) | token::NtPath(..) => true,
|
|
|
|
|
_ => false,
|
|
|
|
|
},
|
|
|
|
|
_ => false
|
|
|
|
|
};
|
|
|
|
|
let cannot_continue_expr = self.look_ahead(1, token_cannot_continue_expr);
|
|
|
|
|
if cannot_continue_expr {
|
|
|
|
|
self.bump();
|
|
|
|
|
// Emit the error ...
|
|
|
|
|
let mut err = self.diagnostic()
|
|
|
|
|
.struct_span_err(self.span,
|
|
|
|
|
&format!("unexpected {} after identifier",
|
|
|
|
|
self.this_token_descr()));
|
|
|
|
|
// span the `not` plus trailing whitespace to avoid
|
|
|
|
|
// trailing whitespace after the `!` in our suggestion
|
|
|
|
|
let to_replace = self.sess.codemap()
|
|
|
|
|
.span_until_non_whitespace(lo.to(self.span));
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
err.span_suggestion_short_with_applicability(
|
|
|
|
|
to_replace,
|
|
|
|
|
"use `!` to perform logical negation",
|
|
|
|
|
"!".to_owned(),
|
|
|
|
|
Applicability::MachineApplicable
|
|
|
|
|
);
|
2018-03-22 05:38:24 +00:00
|
|
|
|
err.emit();
|
|
|
|
|
// —and recover! (just as if we were in the block
|
|
|
|
|
// for the `token::Not` arm)
|
|
|
|
|
let e = self.parse_prefix_expr(None);
|
|
|
|
|
let (span, e) = self.interpolated_or_expr_span(e)?;
|
|
|
|
|
(lo.to(span), self.mk_unary(UnOp::Not, e))
|
|
|
|
|
} else {
|
|
|
|
|
return self.parse_dot_or_call_expr(Some(attrs));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
_ => { return self.parse_dot_or_call_expr(Some(attrs)); }
|
2015-10-15 18:37:21 +00:00
|
|
|
|
};
|
2017-03-15 00:22:48 +00:00
|
|
|
|
return Ok(self.mk_expr(lo.to(hi), ex, attrs));
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-10-15 12:51:30 +00:00
|
|
|
|
/// Parse an associative expression
|
|
|
|
|
///
|
|
|
|
|
/// This parses an expression accounting for associativity and precedence of the operators in
|
|
|
|
|
/// the expression.
|
2015-11-03 16:39:51 +00:00
|
|
|
|
pub fn parse_assoc_expr(&mut self,
|
2016-06-18 04:01:57 +00:00
|
|
|
|
already_parsed_attrs: Option<ThinVec<Attribute>>)
|
2015-12-20 21:00:43 +00:00
|
|
|
|
-> PResult<'a, P<Expr>> {
|
2015-11-03 16:39:51 +00:00
|
|
|
|
self.parse_assoc_expr_with(0, already_parsed_attrs.into())
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-10-15 12:51:30 +00:00
|
|
|
|
/// Parse an associative expression with operators of at least `min_prec` precedence
|
2015-10-16 21:06:25 +00:00
|
|
|
|
pub fn parse_assoc_expr_with(&mut self,
|
|
|
|
|
min_prec: usize,
|
2015-11-03 16:39:51 +00:00
|
|
|
|
lhs: LhsExpr)
|
2015-12-20 21:00:43 +00:00
|
|
|
|
-> PResult<'a, P<Expr>> {
|
2015-11-03 16:39:51 +00:00
|
|
|
|
let mut lhs = if let LhsExpr::AlreadyParsed(expr) = lhs {
|
|
|
|
|
expr
|
2015-10-15 12:51:30 +00:00
|
|
|
|
} else {
|
2015-11-03 16:39:51 +00:00
|
|
|
|
let attrs = match lhs {
|
|
|
|
|
LhsExpr::AttributesParsed(attrs) => Some(attrs),
|
|
|
|
|
_ => None,
|
|
|
|
|
};
|
2017-09-19 05:40:04 +00:00
|
|
|
|
if [token::DotDot, token::DotDotDot, token::DotDotEq].contains(&self.token) {
|
2015-11-03 16:39:51 +00:00
|
|
|
|
return self.parse_prefix_range_expr(attrs);
|
|
|
|
|
} else {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.parse_prefix_expr(attrs)?
|
2015-11-03 16:39:51 +00:00
|
|
|
|
}
|
2015-10-15 12:51:30 +00:00
|
|
|
|
};
|
2016-01-24 21:46:39 +00:00
|
|
|
|
|
2016-02-08 22:55:55 +00:00
|
|
|
|
if self.expr_is_complete(&lhs) {
|
2015-10-15 12:51:30 +00:00
|
|
|
|
// Semi-statement forms are odd. See https://github.com/rust-lang/rust/issues/29071
|
|
|
|
|
return Ok(lhs);
|
|
|
|
|
}
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
self.expected_tokens.push(TokenType::Operator);
|
2015-10-15 12:51:30 +00:00
|
|
|
|
while let Some(op) = AssocOp::from_token(&self.token) {
|
2016-01-24 21:46:39 +00:00
|
|
|
|
|
2017-07-04 14:04:34 +00:00
|
|
|
|
// Adjust the span for interpolated LHS to point to the `$lhs` token and not to what
|
|
|
|
|
// it refers to. Interpolated identifiers are unwrapped early and never show up here
|
|
|
|
|
// as `PrevTokenKind::Interpolated` so if LHS is a single identifier we always process
|
|
|
|
|
// it as "interpolated", it doesn't change the answer for non-interpolated idents.
|
|
|
|
|
let lhs_span = match (self.prev_token_kind, &lhs.node) {
|
|
|
|
|
(PrevTokenKind::Interpolated, _) => self.prev_span,
|
|
|
|
|
(PrevTokenKind::Ident, &ExprKind::Path(None, ref path))
|
|
|
|
|
if path.segments.len() == 1 => self.prev_span,
|
|
|
|
|
_ => lhs.span,
|
2016-01-24 21:46:39 +00:00
|
|
|
|
};
|
|
|
|
|
|
2015-11-12 20:34:41 +00:00
|
|
|
|
let cur_op_span = self.span;
|
2015-10-16 19:42:06 +00:00
|
|
|
|
let restrictions = if op.is_assign_like() {
|
2017-09-08 19:08:01 +00:00
|
|
|
|
self.restrictions & Restrictions::NO_STRUCT_LITERAL
|
2015-10-16 19:42:06 +00:00
|
|
|
|
} else {
|
|
|
|
|
self.restrictions
|
|
|
|
|
};
|
2015-10-15 12:51:30 +00:00
|
|
|
|
if op.precedence() < min_prec {
|
|
|
|
|
break;
|
|
|
|
|
}
|
2017-11-04 23:46:41 +00:00
|
|
|
|
// Check for deprecated `...` syntax
|
|
|
|
|
if self.token == token::DotDotDot && op == AssocOp::DotDotEq {
|
|
|
|
|
self.err_dotdotdot_syntax(self.span);
|
2017-09-19 05:40:04 +00:00
|
|
|
|
}
|
2017-11-04 23:46:41 +00:00
|
|
|
|
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2015-10-15 12:51:30 +00:00
|
|
|
|
if op.is_comparison() {
|
2016-02-08 22:55:55 +00:00
|
|
|
|
self.check_no_chained_comparison(&lhs, &op);
|
2015-10-15 12:51:30 +00:00
|
|
|
|
}
|
|
|
|
|
// Special cases:
|
|
|
|
|
if op == AssocOp::As {
|
2017-07-03 23:17:01 +00:00
|
|
|
|
lhs = self.parse_assoc_op_cast(lhs, lhs_span, ExprKind::Cast)?;
|
2015-10-15 12:51:30 +00:00
|
|
|
|
continue
|
2015-12-03 02:37:48 +00:00
|
|
|
|
} else if op == AssocOp::Colon {
|
2017-07-06 21:29:55 +00:00
|
|
|
|
lhs = match self.parse_assoc_op_cast(lhs, lhs_span, ExprKind::Type) {
|
|
|
|
|
Ok(lhs) => lhs,
|
|
|
|
|
Err(mut err) => {
|
|
|
|
|
err.span_label(self.span,
|
|
|
|
|
"expecting a type here because of type ascription");
|
|
|
|
|
let cm = self.sess.codemap();
|
2017-07-31 20:04:34 +00:00
|
|
|
|
let cur_pos = cm.lookup_char_pos(self.span.lo());
|
|
|
|
|
let op_pos = cm.lookup_char_pos(cur_op_span.hi());
|
2017-07-06 21:29:55 +00:00
|
|
|
|
if cur_pos.line != op_pos.line {
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
err.span_suggestion_with_applicability(
|
|
|
|
|
cur_op_span,
|
|
|
|
|
"try using a semicolon",
|
|
|
|
|
";".to_string(),
|
|
|
|
|
Applicability::MaybeIncorrect // speculative
|
|
|
|
|
);
|
2017-07-06 21:29:55 +00:00
|
|
|
|
}
|
|
|
|
|
return Err(err);
|
|
|
|
|
}
|
|
|
|
|
};
|
2015-12-03 02:37:48 +00:00
|
|
|
|
continue
|
2017-09-19 05:40:04 +00:00
|
|
|
|
} else if op == AssocOp::DotDot || op == AssocOp::DotDotEq {
|
|
|
|
|
// If we didn’t have to handle `x..`/`x..=`, it would be pretty easy to
|
2016-03-17 01:35:36 +00:00
|
|
|
|
// generalise it to the Fixity::None code.
|
2016-01-13 06:23:31 +00:00
|
|
|
|
//
|
2017-09-19 05:40:04 +00:00
|
|
|
|
// We have 2 alternatives here: `x..y`/`x..=y` and `x..`/`x..=` The other
|
2016-03-17 01:35:36 +00:00
|
|
|
|
// two variants are handled with `parse_prefix_range_expr` call above.
|
2016-01-13 06:23:31 +00:00
|
|
|
|
let rhs = if self.is_at_start_of_range_notation_rhs() {
|
2016-05-01 16:43:27 +00:00
|
|
|
|
Some(self.parse_assoc_expr_with(op.precedence() + 1,
|
|
|
|
|
LhsExpr::NotYetParsed)?)
|
2016-01-13 06:23:31 +00:00
|
|
|
|
} else {
|
|
|
|
|
None
|
|
|
|
|
};
|
|
|
|
|
let (lhs_span, rhs_span) = (lhs.span, if let Some(ref x) = rhs {
|
|
|
|
|
x.span
|
|
|
|
|
} else {
|
|
|
|
|
cur_op_span
|
|
|
|
|
});
|
2016-03-17 01:35:36 +00:00
|
|
|
|
let limits = if op == AssocOp::DotDot {
|
|
|
|
|
RangeLimits::HalfOpen
|
|
|
|
|
} else {
|
|
|
|
|
RangeLimits::Closed
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let r = try!(self.mk_range(Some(lhs), rhs, limits));
|
2017-03-15 00:22:48 +00:00
|
|
|
|
lhs = self.mk_expr(lhs_span.to(rhs_span), r, ThinVec::new());
|
2016-01-13 06:23:31 +00:00
|
|
|
|
break
|
2015-10-15 12:51:30 +00:00
|
|
|
|
}
|
2013-07-18 03:04:37 +00:00
|
|
|
|
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let rhs = match op.fixity() {
|
2015-12-14 20:32:16 +00:00
|
|
|
|
Fixity::Right => self.with_res(
|
2017-09-08 19:08:01 +00:00
|
|
|
|
restrictions - Restrictions::STMT_EXPR,
|
2015-12-16 10:53:36 +00:00
|
|
|
|
|this| {
|
2015-12-14 20:32:16 +00:00
|
|
|
|
this.parse_assoc_expr_with(op.precedence(),
|
2015-12-16 10:53:36 +00:00
|
|
|
|
LhsExpr::NotYetParsed)
|
2015-10-16 19:42:06 +00:00
|
|
|
|
}),
|
2015-12-14 20:32:16 +00:00
|
|
|
|
Fixity::Left => self.with_res(
|
2017-09-08 19:08:01 +00:00
|
|
|
|
restrictions - Restrictions::STMT_EXPR,
|
2015-12-16 10:53:36 +00:00
|
|
|
|
|this| {
|
2015-12-14 20:32:16 +00:00
|
|
|
|
this.parse_assoc_expr_with(op.precedence() + 1,
|
|
|
|
|
LhsExpr::NotYetParsed)
|
2015-10-16 19:42:06 +00:00
|
|
|
|
}),
|
2016-03-18 23:04:43 +00:00
|
|
|
|
// We currently have no non-associative operators that are not handled above by
|
|
|
|
|
// the special cases. The code is here only for future convenience.
|
2015-12-14 20:32:16 +00:00
|
|
|
|
Fixity::None => self.with_res(
|
2017-09-08 19:08:01 +00:00
|
|
|
|
restrictions - Restrictions::STMT_EXPR,
|
2015-12-16 10:53:36 +00:00
|
|
|
|
|this| {
|
2015-12-14 20:32:16 +00:00
|
|
|
|
this.parse_assoc_expr_with(op.precedence() + 1,
|
|
|
|
|
LhsExpr::NotYetParsed)
|
2015-10-16 19:42:06 +00:00
|
|
|
|
}),
|
2016-03-23 03:01:37 +00:00
|
|
|
|
}?;
|
2015-10-15 12:51:30 +00:00
|
|
|
|
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let span = lhs_span.to(rhs.span);
|
2015-10-15 12:51:30 +00:00
|
|
|
|
lhs = match op {
|
|
|
|
|
AssocOp::Add | AssocOp::Subtract | AssocOp::Multiply | AssocOp::Divide |
|
|
|
|
|
AssocOp::Modulus | AssocOp::LAnd | AssocOp::LOr | AssocOp::BitXor |
|
|
|
|
|
AssocOp::BitAnd | AssocOp::BitOr | AssocOp::ShiftLeft | AssocOp::ShiftRight |
|
|
|
|
|
AssocOp::Equal | AssocOp::Less | AssocOp::LessEqual | AssocOp::NotEqual |
|
|
|
|
|
AssocOp::Greater | AssocOp::GreaterEqual => {
|
|
|
|
|
let ast_op = op.to_ast_binop().unwrap();
|
|
|
|
|
let binary = self.mk_binary(codemap::respan(cur_op_span, ast_op), lhs, rhs);
|
2017-03-15 00:22:48 +00:00
|
|
|
|
self.mk_expr(span, binary, ThinVec::new())
|
2013-01-31 18:32:57 +00:00
|
|
|
|
}
|
2015-10-15 12:51:30 +00:00
|
|
|
|
AssocOp::Assign =>
|
2017-03-15 00:22:48 +00:00
|
|
|
|
self.mk_expr(span, ExprKind::Assign(lhs, rhs), ThinVec::new()),
|
2018-05-24 21:34:09 +00:00
|
|
|
|
AssocOp::ObsoleteInPlace =>
|
|
|
|
|
self.mk_expr(span, ExprKind::ObsoleteInPlace(lhs, rhs), ThinVec::new()),
|
2015-10-15 12:51:30 +00:00
|
|
|
|
AssocOp::AssignOp(k) => {
|
|
|
|
|
let aop = match k {
|
2016-02-08 12:16:12 +00:00
|
|
|
|
token::Plus => BinOpKind::Add,
|
|
|
|
|
token::Minus => BinOpKind::Sub,
|
|
|
|
|
token::Star => BinOpKind::Mul,
|
|
|
|
|
token::Slash => BinOpKind::Div,
|
|
|
|
|
token::Percent => BinOpKind::Rem,
|
|
|
|
|
token::Caret => BinOpKind::BitXor,
|
|
|
|
|
token::And => BinOpKind::BitAnd,
|
|
|
|
|
token::Or => BinOpKind::BitOr,
|
|
|
|
|
token::Shl => BinOpKind::Shl,
|
|
|
|
|
token::Shr => BinOpKind::Shr,
|
2015-10-15 12:51:30 +00:00
|
|
|
|
};
|
|
|
|
|
let aopexpr = self.mk_assign_op(codemap::respan(cur_op_span, aop), lhs, rhs);
|
2017-03-15 00:22:48 +00:00
|
|
|
|
self.mk_expr(span, aopexpr, ThinVec::new())
|
2013-01-31 18:32:57 +00:00
|
|
|
|
}
|
2017-09-19 05:40:04 +00:00
|
|
|
|
AssocOp::As | AssocOp::Colon | AssocOp::DotDot | AssocOp::DotDotEq => {
|
|
|
|
|
self.bug("AssocOp should have been handled by special case")
|
2015-12-03 02:37:48 +00:00
|
|
|
|
}
|
2015-10-15 12:51:30 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
if op.fixity() == Fixity::None { break }
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2015-10-15 12:51:30 +00:00
|
|
|
|
Ok(lhs)
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2010-09-28 17:30:34 +00:00
|
|
|
|
|
2017-07-03 23:17:01 +00:00
|
|
|
|
fn parse_assoc_op_cast(&mut self, lhs: P<Expr>, lhs_span: Span,
|
|
|
|
|
expr_kind: fn(P<Expr>, P<Ty>) -> ExprKind)
|
|
|
|
|
-> PResult<'a, P<Expr>> {
|
|
|
|
|
let mk_expr = |this: &mut Self, rhs: P<Ty>| {
|
|
|
|
|
this.mk_expr(lhs_span.to(rhs.span), expr_kind(lhs, rhs), ThinVec::new())
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// Save the state of the parser before parsing type normally, in case there is a
|
|
|
|
|
// LessThan comparison after this cast.
|
|
|
|
|
let parser_snapshot_before_type = self.clone();
|
2017-06-15 03:42:24 +00:00
|
|
|
|
match self.parse_ty_no_plus() {
|
|
|
|
|
Ok(rhs) => {
|
2017-07-03 23:17:01 +00:00
|
|
|
|
Ok(mk_expr(self, rhs))
|
2017-06-15 03:42:24 +00:00
|
|
|
|
}
|
2017-07-03 23:17:01 +00:00
|
|
|
|
Err(mut type_err) => {
|
|
|
|
|
// Rewind to before attempting to parse the type with generics, to recover
|
|
|
|
|
// from situations like `x as usize < y` in which we first tried to parse
|
|
|
|
|
// `usize < y` as a type with generic arguments.
|
|
|
|
|
let parser_snapshot_after_type = self.clone();
|
|
|
|
|
mem::replace(self, parser_snapshot_before_type);
|
2017-06-15 03:42:24 +00:00
|
|
|
|
|
2017-07-19 23:39:34 +00:00
|
|
|
|
match self.parse_path(PathStyle::Expr) {
|
2017-06-15 03:42:24 +00:00
|
|
|
|
Ok(path) => {
|
2017-10-09 17:02:17 +00:00
|
|
|
|
let (op_noun, op_verb) = match self.token {
|
|
|
|
|
token::Lt => ("comparison", "comparing"),
|
|
|
|
|
token::BinOp(token::Shl) => ("shift", "shifting"),
|
|
|
|
|
_ => {
|
|
|
|
|
// We can end up here even without `<` being the next token, for
|
|
|
|
|
// example because `parse_ty_no_plus` returns `Err` on keywords,
|
|
|
|
|
// but `parse_path` returns `Ok` on them due to error recovery.
|
|
|
|
|
// Return original error and parser state.
|
|
|
|
|
mem::replace(self, parser_snapshot_after_type);
|
|
|
|
|
return Err(type_err);
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
2017-07-03 23:17:01 +00:00
|
|
|
|
// Successfully parsed the type path leaving a `<` yet to parse.
|
|
|
|
|
type_err.cancel();
|
|
|
|
|
|
|
|
|
|
// Report non-fatal diagnostics, keep `x as usize` as an expression
|
|
|
|
|
// in AST and continue parsing.
|
2017-06-15 03:42:24 +00:00
|
|
|
|
let msg = format!("`<` is interpreted as a start of generic \
|
2017-10-09 17:02:17 +00:00
|
|
|
|
arguments for `{}`, not a {}", path, op_noun);
|
2017-07-03 23:17:01 +00:00
|
|
|
|
let mut err = self.sess.span_diagnostic.struct_span_err(self.span, &msg);
|
|
|
|
|
err.span_label(self.look_ahead_span(1).to(parser_snapshot_after_type.span),
|
|
|
|
|
"interpreted as generic arguments");
|
2017-10-09 17:02:17 +00:00
|
|
|
|
err.span_label(self.span, format!("not interpreted as {}", op_noun));
|
2017-07-03 23:17:01 +00:00
|
|
|
|
|
|
|
|
|
let expr = mk_expr(self, P(Ty {
|
|
|
|
|
span: path.span,
|
|
|
|
|
node: TyKind::Path(None, path),
|
|
|
|
|
id: ast::DUMMY_NODE_ID
|
|
|
|
|
}));
|
|
|
|
|
|
|
|
|
|
let expr_str = self.sess.codemap().span_to_snippet(expr.span)
|
|
|
|
|
.unwrap_or(pprust::expr_to_string(&expr));
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
err.span_suggestion_with_applicability(
|
|
|
|
|
expr.span,
|
|
|
|
|
&format!("try {} the cast value", op_verb),
|
|
|
|
|
format!("({})", expr_str),
|
|
|
|
|
Applicability::MachineApplicable
|
|
|
|
|
);
|
2017-06-15 03:42:24 +00:00
|
|
|
|
err.emit();
|
|
|
|
|
|
2017-07-03 23:17:01 +00:00
|
|
|
|
Ok(expr)
|
2017-06-15 03:42:24 +00:00
|
|
|
|
}
|
|
|
|
|
Err(mut path_err) => {
|
2017-07-03 23:17:01 +00:00
|
|
|
|
// Couldn't parse as a path, return original error and parser state.
|
2017-06-15 03:42:24 +00:00
|
|
|
|
path_err.cancel();
|
2017-07-03 23:17:01 +00:00
|
|
|
|
mem::replace(self, parser_snapshot_after_type);
|
|
|
|
|
Err(type_err)
|
2017-06-15 03:42:24 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-01-08 00:44:01 +00:00
|
|
|
|
/// Produce an error if comparison operators are chained (RFC #558).
|
|
|
|
|
/// We only need to check lhs, not rhs, because all comparison ops
|
|
|
|
|
/// have same precedence and are left-associative
|
2015-10-15 12:51:30 +00:00
|
|
|
|
fn check_no_chained_comparison(&mut self, lhs: &Expr, outer_op: &AssocOp) {
|
2017-06-10 03:30:33 +00:00
|
|
|
|
debug_assert!(outer_op.is_comparison(),
|
|
|
|
|
"check_no_chained_comparison: {:?} is not comparison",
|
|
|
|
|
outer_op);
|
2015-01-08 00:44:01 +00:00
|
|
|
|
match lhs.node {
|
2016-02-08 15:05:05 +00:00
|
|
|
|
ExprKind::Binary(op, _, _) if op.node.is_comparison() => {
|
2015-01-13 04:18:55 +00:00
|
|
|
|
// respan to include both operators
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let op_span = op.span.to(self.span);
|
2015-12-20 21:00:43 +00:00
|
|
|
|
let mut err = self.diagnostic().struct_span_err(op_span,
|
2015-01-13 04:18:55 +00:00
|
|
|
|
"chained comparison operators require parentheses");
|
2017-03-14 02:07:47 +00:00
|
|
|
|
if op.node == BinOpKind::Lt &&
|
|
|
|
|
*outer_op == AssocOp::Less || // Include `<` to provide this recommendation
|
|
|
|
|
*outer_op == AssocOp::Greater // even in a case like the following:
|
|
|
|
|
{ // Foo<Bar<Baz<Qux, ()>>>
|
2016-04-20 18:49:16 +00:00
|
|
|
|
err.help(
|
2015-01-13 04:18:55 +00:00
|
|
|
|
"use `::<...>` instead of `<...>` if you meant to specify type arguments");
|
2017-10-08 18:01:44 +00:00
|
|
|
|
err.help("or use `(...)` if you meant to specify fn arguments");
|
2015-01-08 00:44:01 +00:00
|
|
|
|
}
|
2015-12-20 21:00:43 +00:00
|
|
|
|
err.emit();
|
2015-01-08 00:44:01 +00:00
|
|
|
|
}
|
|
|
|
|
_ => {}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-11-04 23:46:41 +00:00
|
|
|
|
/// Parse prefix-forms of range notation: `..expr`, `..`, `..=expr`
|
2015-11-03 16:39:51 +00:00
|
|
|
|
fn parse_prefix_range_expr(&mut self,
|
2016-06-18 04:01:57 +00:00
|
|
|
|
already_parsed_attrs: Option<ThinVec<Attribute>>)
|
2015-12-20 21:00:43 +00:00
|
|
|
|
-> PResult<'a, P<Expr>> {
|
2017-11-04 23:46:41 +00:00
|
|
|
|
// Check for deprecated `...` syntax
|
|
|
|
|
if self.token == token::DotDotDot {
|
|
|
|
|
self.err_dotdotdot_syntax(self.span);
|
|
|
|
|
}
|
|
|
|
|
|
2017-09-19 05:40:04 +00:00
|
|
|
|
debug_assert!([token::DotDot, token::DotDotDot, token::DotDotEq].contains(&self.token),
|
2017-11-04 23:46:41 +00:00
|
|
|
|
"parse_prefix_range_expr: token {:?} is not DotDot/DotDotEq",
|
2017-06-10 03:30:33 +00:00
|
|
|
|
self.token);
|
2016-01-13 06:23:31 +00:00
|
|
|
|
let tok = self.token.clone();
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let attrs = self.parse_or_use_outer_attributes(already_parsed_attrs)?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
|
|
|
|
let mut hi = self.span;
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2015-10-15 18:37:21 +00:00
|
|
|
|
let opt_end = if self.is_at_start_of_range_notation_rhs() {
|
2016-01-13 06:23:31 +00:00
|
|
|
|
// RHS must be parsed with more associativity than the dots.
|
|
|
|
|
let next_prec = AssocOp::from_token(&tok).unwrap().precedence() + 1;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
Some(self.parse_assoc_expr_with(next_prec,
|
2016-03-17 01:35:36 +00:00
|
|
|
|
LhsExpr::NotYetParsed)
|
|
|
|
|
.map(|x|{
|
2017-03-15 00:22:48 +00:00
|
|
|
|
hi = x.span;
|
2016-03-17 01:35:36 +00:00
|
|
|
|
x
|
|
|
|
|
})?)
|
2015-10-15 18:37:21 +00:00
|
|
|
|
} else {
|
|
|
|
|
None
|
|
|
|
|
};
|
2016-03-17 01:35:36 +00:00
|
|
|
|
let limits = if tok == token::DotDot {
|
|
|
|
|
RangeLimits::HalfOpen
|
|
|
|
|
} else {
|
|
|
|
|
RangeLimits::Closed
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let r = try!(self.mk_range(None,
|
|
|
|
|
opt_end,
|
|
|
|
|
limits));
|
2017-03-15 00:22:48 +00:00
|
|
|
|
Ok(self.mk_expr(lo.to(hi), r, attrs))
|
2015-10-15 18:37:21 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-01-18 20:43:03 +00:00
|
|
|
|
fn is_at_start_of_range_notation_rhs(&self) -> bool {
|
|
|
|
|
if self.token.can_begin_expr() {
|
|
|
|
|
// parse `for i in 1.. { }` as infinite loop, not as `for i in (1..{})`.
|
|
|
|
|
if self.token == token::OpenDelim(token::Brace) {
|
2017-09-08 19:08:01 +00:00
|
|
|
|
return !self.restrictions.contains(Restrictions::NO_STRUCT_LITERAL);
|
2015-01-18 20:43:03 +00:00
|
|
|
|
}
|
|
|
|
|
true
|
|
|
|
|
} else {
|
|
|
|
|
false
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-25 01:04:29 +00:00
|
|
|
|
/// Parse an 'if' or 'if let' expression ('if' token already eaten)
|
2016-06-18 04:01:57 +00:00
|
|
|
|
pub fn parse_if_expr(&mut self, attrs: ThinVec<Attribute>) -> PResult<'a, P<Expr>> {
|
2015-01-16 03:04:28 +00:00
|
|
|
|
if self.check_keyword(keywords::Let) {
|
2015-11-03 16:39:51 +00:00
|
|
|
|
return self.parse_if_let_expr(attrs);
|
2014-08-25 01:04:29 +00:00
|
|
|
|
}
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.prev_span;
|
2017-09-08 19:08:01 +00:00
|
|
|
|
let cond = self.parse_expr_res(Restrictions::NO_STRUCT_LITERAL, None)?;
|
2017-08-17 23:51:52 +00:00
|
|
|
|
|
|
|
|
|
// Verify that the parsed `if` condition makes sense as a condition. If it is a block, then
|
|
|
|
|
// verify that the last statement is either an implicit return (no `;`) or an explicit
|
|
|
|
|
// return. This won't catch blocks with an explicit `return`, but that would be caught by
|
|
|
|
|
// the dead code lint.
|
|
|
|
|
if self.eat_keyword(keywords::Else) || !cond.returns() {
|
2018-01-14 17:29:07 +00:00
|
|
|
|
let sp = self.sess.codemap().next_point(lo);
|
2017-08-17 19:14:35 +00:00
|
|
|
|
let mut err = self.diagnostic()
|
|
|
|
|
.struct_span_err(sp, "missing condition for `if` statemement");
|
|
|
|
|
err.span_label(sp, "expected if condition here");
|
|
|
|
|
return Err(err)
|
|
|
|
|
}
|
2018-02-19 00:59:33 +00:00
|
|
|
|
let not_block = self.token != token::OpenDelim(token::Brace);
|
|
|
|
|
let thn = self.parse_block().map_err(|mut err| {
|
2018-02-24 03:38:36 +00:00
|
|
|
|
if not_block {
|
2018-02-19 00:59:33 +00:00
|
|
|
|
err.span_label(lo, "this `if` statement has a condition, but no block");
|
|
|
|
|
}
|
|
|
|
|
err
|
|
|
|
|
})?;
|
2014-09-13 16:06:01 +00:00
|
|
|
|
let mut els: Option<P<Expr>> = None;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let mut hi = thn.span;
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::Else) {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let elexpr = self.parse_else_expr()?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
hi = elexpr.span;
|
2014-09-13 16:06:01 +00:00
|
|
|
|
els = Some(elexpr);
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2017-03-15 00:22:48 +00:00
|
|
|
|
Ok(self.mk_expr(lo.to(hi), ExprKind::If(cond, thn, els), attrs))
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2011-12-08 19:47:01 +00:00
|
|
|
|
|
2014-08-25 01:04:29 +00:00
|
|
|
|
/// Parse an 'if let' expression ('if' token already eaten)
|
2016-06-18 04:01:57 +00:00
|
|
|
|
pub fn parse_if_let_expr(&mut self, attrs: ThinVec<Attribute>)
|
2015-12-20 21:00:43 +00:00
|
|
|
|
-> PResult<'a, P<Expr>> {
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.prev_span;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect_keyword(keywords::Let)?;
|
2018-02-24 00:12:35 +00:00
|
|
|
|
let pats = self.parse_pats()?;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::Eq)?;
|
2017-09-08 19:08:01 +00:00
|
|
|
|
let expr = self.parse_expr_res(Restrictions::NO_STRUCT_LITERAL, None)?;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let thn = self.parse_block()?;
|
2015-12-30 23:11:53 +00:00
|
|
|
|
let (hi, els) = if self.eat_keyword(keywords::Else) {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let expr = self.parse_else_expr()?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
(expr.span, Some(expr))
|
2014-08-25 01:04:29 +00:00
|
|
|
|
} else {
|
2017-03-15 00:22:48 +00:00
|
|
|
|
(thn.span, None)
|
2014-08-25 01:04:29 +00:00
|
|
|
|
};
|
2018-02-24 00:12:35 +00:00
|
|
|
|
Ok(self.mk_expr(lo.to(hi), ExprKind::IfLet(pats, expr, thn, els), attrs))
|
2014-08-25 01:04:29 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-04-20 18:44:07 +00:00
|
|
|
|
// `move |args| expr`
|
|
|
|
|
pub fn parse_lambda_expr(&mut self,
|
2016-06-18 04:01:57 +00:00
|
|
|
|
attrs: ThinVec<Attribute>)
|
2015-12-20 21:00:43 +00:00
|
|
|
|
-> PResult<'a, P<Expr>>
|
2014-11-19 16:18:17 +00:00
|
|
|
|
{
|
2017-10-07 14:36:28 +00:00
|
|
|
|
let lo = self.span;
|
|
|
|
|
let movability = if self.eat_keyword(keywords::Static) {
|
|
|
|
|
Movability::Static
|
|
|
|
|
} else {
|
|
|
|
|
Movability::Movable
|
|
|
|
|
};
|
|
|
|
|
let capture_clause = if self.eat_keyword(keywords::Move) {
|
|
|
|
|
CaptureBy::Value
|
|
|
|
|
} else {
|
|
|
|
|
CaptureBy::Ref
|
|
|
|
|
};
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let decl = self.parse_fn_block_decl()?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let decl_hi = self.prev_span;
|
2015-03-18 13:22:38 +00:00
|
|
|
|
let body = match decl.output {
|
2017-07-23 13:20:14 +00:00
|
|
|
|
FunctionRetTy::Default(_) => {
|
2017-09-08 19:08:01 +00:00
|
|
|
|
let restrictions = self.restrictions - Restrictions::STMT_EXPR;
|
2017-07-23 13:20:14 +00:00
|
|
|
|
self.parse_expr_res(restrictions, None)?
|
|
|
|
|
},
|
2015-03-18 13:22:38 +00:00
|
|
|
|
_ => {
|
|
|
|
|
// If an explicit return type is given, require a
|
|
|
|
|
// block to appear (RFC 968).
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let body_lo = self.span;
|
2018-04-16 03:44:39 +00:00
|
|
|
|
self.parse_block_expr(None, body_lo, BlockCheckMode::Default, ThinVec::new())?
|
2015-03-18 13:22:38 +00:00
|
|
|
|
}
|
|
|
|
|
};
|
2013-07-16 18:08:35 +00:00
|
|
|
|
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(self.mk_expr(
|
2017-03-15 00:22:48 +00:00
|
|
|
|
lo.to(body.span),
|
2017-10-07 14:36:28 +00:00
|
|
|
|
ExprKind::Closure(capture_clause, movability, decl, body, lo.to(decl_hi)),
|
2016-04-20 18:44:07 +00:00
|
|
|
|
attrs))
|
2012-06-30 01:09:56 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-11-03 16:39:51 +00:00
|
|
|
|
// `else` token already eaten
|
2015-12-20 21:00:43 +00:00
|
|
|
|
pub fn parse_else_expr(&mut self) -> PResult<'a, P<Expr>> {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::If) {
|
2016-06-18 04:01:57 +00:00
|
|
|
|
return self.parse_if_expr(ThinVec::new());
|
2012-05-23 22:06:11 +00:00
|
|
|
|
} else {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let blk = self.parse_block()?;
|
2018-04-16 03:44:39 +00:00
|
|
|
|
return Ok(self.mk_expr(blk.span, ExprKind::Block(blk, None), ThinVec::new()));
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2010-11-03 18:05:15 +00:00
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse a 'for' .. 'in' expression ('for' token already eaten)
|
2018-01-15 22:44:32 +00:00
|
|
|
|
pub fn parse_for_expr(&mut self, opt_label: Option<Label>,
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span_lo: Span,
|
2016-06-18 04:01:57 +00:00
|
|
|
|
mut attrs: ThinVec<Attribute>) -> PResult<'a, P<Expr>> {
|
2013-08-03 03:20:22 +00:00
|
|
|
|
// Parse: `for <src_pat> in <src_expr> <src_loop_block>`
|
2013-07-30 00:25:00 +00:00
|
|
|
|
|
in which parentheses are suggested for should-have-been-tuple-patterns
Programmers used to working in some other languages (such as Python or
Go) might expect to be able to destructure values with comma-separated
identifiers but no parentheses on the left side of an assignment.
Previously, the first name in such code would get parsed as a
single-indentifier pattern—recognizing, for example, the
`let a` in `let a, b = (1, 2);`—whereupon we would have a fatal syntax
error on seeing an unexpected comma rather than the expected semicolon
(all the way nearer to the end of `parse_full_stmt`).
Instead, let's look for that comma when parsing the pattern, and if we
see it, momentarily make-believe that we're parsing the remaining
elements in a tuple pattern, so that we can suggest wrapping it all in
parentheses. We need to do this in a separate wrapper method called on
the top-level pattern (or `|`-patterns) in a `let` statement, `for`
loop, `if`- or `while let` expression, or match arm rather than within
`parse_pat` itself, because `parse_pat` gets called recursively to parse
the sub-patterns within a tuple pattern.
Resolves #48492.
2018-02-25 04:41:16 +00:00
|
|
|
|
let pat = self.parse_top_level_pat()?;
|
2017-11-01 06:45:34 +00:00
|
|
|
|
if !self.eat_keyword(keywords::In) {
|
|
|
|
|
let in_span = self.prev_span.between(self.span);
|
|
|
|
|
let mut err = self.sess.span_diagnostic
|
|
|
|
|
.struct_span_err(in_span, "missing `in` in `for` loop");
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
err.span_suggestion_short_with_applicability(
|
|
|
|
|
in_span, "try adding `in` here", " in ".into(),
|
|
|
|
|
// has been misleading, at least in the past (closed Issue #48492)
|
|
|
|
|
Applicability::MaybeIncorrect
|
|
|
|
|
);
|
2017-11-01 06:45:34 +00:00
|
|
|
|
err.emit();
|
2017-10-31 21:26:49 +00:00
|
|
|
|
}
|
2017-09-08 19:08:01 +00:00
|
|
|
|
let expr = self.parse_expr_res(Restrictions::NO_STRUCT_LITERAL, None)?;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let (iattrs, loop_block) = self.parse_inner_attrs_and_block()?;
|
2016-06-18 04:01:57 +00:00
|
|
|
|
attrs.extend(iattrs);
|
2015-11-03 16:39:51 +00:00
|
|
|
|
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let hi = self.prev_span;
|
2018-01-15 22:44:32 +00:00
|
|
|
|
Ok(self.mk_expr(span_lo.to(hi), ExprKind::ForLoop(pat, expr, loop_block, opt_label), attrs))
|
2013-07-30 00:25:00 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-10-03 02:45:46 +00:00
|
|
|
|
/// Parse a 'while' or 'while let' expression ('while' token already eaten)
|
2018-01-15 22:44:32 +00:00
|
|
|
|
pub fn parse_while_expr(&mut self, opt_label: Option<Label>,
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span_lo: Span,
|
2016-06-18 04:01:57 +00:00
|
|
|
|
mut attrs: ThinVec<Attribute>) -> PResult<'a, P<Expr>> {
|
2014-10-27 12:33:30 +00:00
|
|
|
|
if self.token.is_keyword(keywords::Let) {
|
2018-01-15 22:44:32 +00:00
|
|
|
|
return self.parse_while_let_expr(opt_label, span_lo, attrs);
|
2014-10-03 02:45:46 +00:00
|
|
|
|
}
|
2017-09-08 19:08:01 +00:00
|
|
|
|
let cond = self.parse_expr_res(Restrictions::NO_STRUCT_LITERAL, None)?;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let (iattrs, body) = self.parse_inner_attrs_and_block()?;
|
2016-06-18 04:01:57 +00:00
|
|
|
|
attrs.extend(iattrs);
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let span = span_lo.to(body.span);
|
2018-01-15 22:44:32 +00:00
|
|
|
|
return Ok(self.mk_expr(span, ExprKind::While(cond, body, opt_label), attrs));
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-10-03 02:45:46 +00:00
|
|
|
|
/// Parse a 'while let' expression ('while' token already eaten)
|
2018-01-15 22:44:32 +00:00
|
|
|
|
pub fn parse_while_let_expr(&mut self, opt_label: Option<Label>,
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span_lo: Span,
|
2016-06-18 04:01:57 +00:00
|
|
|
|
mut attrs: ThinVec<Attribute>) -> PResult<'a, P<Expr>> {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect_keyword(keywords::Let)?;
|
2018-02-24 00:12:35 +00:00
|
|
|
|
let pats = self.parse_pats()?;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::Eq)?;
|
2017-09-08 19:08:01 +00:00
|
|
|
|
let expr = self.parse_expr_res(Restrictions::NO_STRUCT_LITERAL, None)?;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let (iattrs, body) = self.parse_inner_attrs_and_block()?;
|
2016-06-18 04:01:57 +00:00
|
|
|
|
attrs.extend(iattrs);
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let span = span_lo.to(body.span);
|
2018-02-24 00:12:35 +00:00
|
|
|
|
return Ok(self.mk_expr(span, ExprKind::WhileLet(pats, expr, body, opt_label), attrs));
|
2014-10-03 02:45:46 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-11-03 16:39:51 +00:00
|
|
|
|
// parse `loop {...}`, `loop` token already eaten
|
2018-01-15 22:44:32 +00:00
|
|
|
|
pub fn parse_loop_expr(&mut self, opt_label: Option<Label>,
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span_lo: Span,
|
2016-06-18 04:01:57 +00:00
|
|
|
|
mut attrs: ThinVec<Attribute>) -> PResult<'a, P<Expr>> {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let (iattrs, body) = self.parse_inner_attrs_and_block()?;
|
2016-06-18 04:01:57 +00:00
|
|
|
|
attrs.extend(iattrs);
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let span = span_lo.to(body.span);
|
2018-01-15 22:44:32 +00:00
|
|
|
|
Ok(self.mk_expr(span, ExprKind::Loop(body, opt_label), attrs))
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-03-03 22:41:07 +00:00
|
|
|
|
/// Parse a `do catch {...}` expression (`do catch` token already eaten)
|
2017-03-15 00:22:48 +00:00
|
|
|
|
pub fn parse_catch_expr(&mut self, span_lo: Span, mut attrs: ThinVec<Attribute>)
|
2017-02-17 23:12:47 +00:00
|
|
|
|
-> PResult<'a, P<Expr>>
|
|
|
|
|
{
|
|
|
|
|
let (iattrs, body) = self.parse_inner_attrs_and_block()?;
|
|
|
|
|
attrs.extend(iattrs);
|
2017-03-15 00:22:48 +00:00
|
|
|
|
Ok(self.mk_expr(span_lo.to(body.span), ExprKind::Catch(body), attrs))
|
2017-02-17 23:12:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-11-03 16:39:51 +00:00
|
|
|
|
// `match` token already eaten
|
2016-06-18 04:01:57 +00:00
|
|
|
|
fn parse_match_expr(&mut self, mut attrs: ThinVec<Attribute>) -> PResult<'a, P<Expr>> {
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let match_span = self.prev_span;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.prev_span;
|
2017-09-08 19:08:01 +00:00
|
|
|
|
let discriminant = self.parse_expr_res(Restrictions::NO_STRUCT_LITERAL,
|
2016-03-22 22:58:45 +00:00
|
|
|
|
None)?;
|
2016-07-01 23:40:45 +00:00
|
|
|
|
if let Err(mut e) = self.expect(&token::OpenDelim(token::Brace)) {
|
2015-10-27 13:41:55 +00:00
|
|
|
|
if self.token == token::Token::Semi {
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
e.span_suggestion_short_with_applicability(
|
|
|
|
|
match_span,
|
|
|
|
|
"try removing this `match`",
|
|
|
|
|
"".to_owned(),
|
|
|
|
|
Applicability::MaybeIncorrect // speculative
|
|
|
|
|
);
|
2015-10-27 13:41:55 +00:00
|
|
|
|
}
|
|
|
|
|
return Err(e)
|
|
|
|
|
}
|
2016-06-18 04:01:57 +00:00
|
|
|
|
attrs.extend(self.parse_inner_attributes()?);
|
|
|
|
|
|
2014-02-28 21:09:09 +00:00
|
|
|
|
let mut arms: Vec<Arm> = Vec::new();
|
2014-10-29 10:37:54 +00:00
|
|
|
|
while self.token != token::CloseDelim(token::Brace) {
|
2016-02-10 03:11:27 +00:00
|
|
|
|
match self.parse_arm() {
|
|
|
|
|
Ok(arm) => arms.push(arm),
|
|
|
|
|
Err(mut e) => {
|
|
|
|
|
// Recover by skipping to the end of the block.
|
|
|
|
|
e.emit();
|
|
|
|
|
self.recover_stmt();
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let span = lo.to(self.span);
|
2016-02-10 03:11:27 +00:00
|
|
|
|
if self.token == token::CloseDelim(token::Brace) {
|
|
|
|
|
self.bump();
|
|
|
|
|
}
|
2017-03-15 00:22:48 +00:00
|
|
|
|
return Ok(self.mk_expr(span, ExprKind::Match(discriminant, arms), attrs));
|
2016-02-10 03:11:27 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let hi = self.span;
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2017-03-15 00:22:48 +00:00
|
|
|
|
return Ok(self.mk_expr(lo.to(hi), ExprKind::Match(discriminant, arms), attrs));
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2010-11-24 22:42:01 +00:00
|
|
|
|
|
2015-12-20 21:00:43 +00:00
|
|
|
|
pub fn parse_arm(&mut self) -> PResult<'a, Arm> {
|
2016-11-02 03:03:55 +00:00
|
|
|
|
maybe_whole!(self, NtArm, |x| x);
|
Interpolate AST nodes in quasiquote.
This changes the `ToTokens` implementations for expressions, statements,
etc. with almost-trivial ones that produce `Interpolated(*Nt(...))`
pseudo-tokens. In this way, quasiquote now works the same way as macros
do: already-parsed AST fragments are used as-is, not reparsed.
The `ToSource` trait is removed. Quasiquote no longer involves
pretty-printing at all, which removes the need for the
`encode_with_hygiene` hack. All associated machinery is removed.
A new `Nonterminal` is added, NtArm, which the parser now interpolates.
This is just for quasiquote, not macros (although it could be in the
future).
`ToTokens` is no longer implemented for `Arg` (although this could be
added again) and `Generics` (which I don't think makes sense).
This breaks any compiler extensions that relied on the ability of
`ToTokens` to turn AST fragments back into inspectable token trees. For
this reason, this closes #16987.
As such, this is a [breaking-change].
Fixes #16472.
Fixes #15962.
Fixes #17397.
Fixes #16617.
2015-03-05 20:06:49 +00:00
|
|
|
|
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let attrs = self.parse_outer_attributes()?;
|
2017-08-26 22:09:31 +00:00
|
|
|
|
// Allow a '|' before the pats (RFC 1925)
|
2018-01-30 20:56:02 +00:00
|
|
|
|
self.eat(&token::BinOp(token::Or));
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let pats = self.parse_pats()?;
|
2017-05-12 18:05:39 +00:00
|
|
|
|
let guard = if self.eat_keyword(keywords::If) {
|
|
|
|
|
Some(self.parse_expr()?)
|
|
|
|
|
} else {
|
|
|
|
|
None
|
|
|
|
|
};
|
Provide missing comma in match arm suggestion
When finding:
```rust
match &Some(3) {
&None => 1
&Some(2) => { 3 }
_ => 2
}
```
provide the following diagnostic:
```
error: expected one of `,`, `.`, `?`, `}`, or an operator, found `=>`
--> $DIR/missing-comma-in-match.rs:15:18
|
X | &None => 1
| -- - help: missing comma
| |
| while parsing the match arm starting here
X | &Some(2) => { 3 }
| ^^ expected one of `,`, `.`, `?`, `}`, or an operator here
```
2018-02-18 22:36:35 +00:00
|
|
|
|
let arrow_span = self.span;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::FatArrow)?;
|
Provide missing comma in match arm suggestion
When finding:
```rust
match &Some(3) {
&None => 1
&Some(2) => { 3 }
_ => 2
}
```
provide the following diagnostic:
```
error: expected one of `,`, `.`, `?`, `}`, or an operator, found `=>`
--> $DIR/missing-comma-in-match.rs:15:18
|
X | &None => 1
| -- - help: missing comma
| |
| while parsing the match arm starting here
X | &Some(2) => { 3 }
| ^^ expected one of `,`, `.`, `?`, `}`, or an operator here
```
2018-02-18 22:36:35 +00:00
|
|
|
|
let arm_start_span = self.span;
|
|
|
|
|
|
|
|
|
|
let expr = self.parse_expr_res(Restrictions::STMT_EXPR, None)
|
|
|
|
|
.map_err(|mut err| {
|
2018-02-24 03:38:36 +00:00
|
|
|
|
err.span_label(arrow_span, "while parsing the `match` arm starting here");
|
Provide missing comma in match arm suggestion
When finding:
```rust
match &Some(3) {
&None => 1
&Some(2) => { 3 }
_ => 2
}
```
provide the following diagnostic:
```
error: expected one of `,`, `.`, `?`, `}`, or an operator, found `=>`
--> $DIR/missing-comma-in-match.rs:15:18
|
X | &None => 1
| -- - help: missing comma
| |
| while parsing the match arm starting here
X | &Some(2) => { 3 }
| ^^ expected one of `,`, `.`, `?`, `}`, or an operator here
```
2018-02-18 22:36:35 +00:00
|
|
|
|
err
|
|
|
|
|
})?;
|
2014-07-29 00:32:51 +00:00
|
|
|
|
|
2017-04-01 08:11:31 +00:00
|
|
|
|
let require_comma = classify::expr_requires_semi_to_be_stmt(&expr)
|
2014-10-29 10:37:54 +00:00
|
|
|
|
&& self.token != token::CloseDelim(token::Brace);
|
2014-07-29 00:32:51 +00:00
|
|
|
|
|
|
|
|
|
if require_comma {
|
Provide missing comma in match arm suggestion
When finding:
```rust
match &Some(3) {
&None => 1
&Some(2) => { 3 }
_ => 2
}
```
provide the following diagnostic:
```
error: expected one of `,`, `.`, `?`, `}`, or an operator, found `=>`
--> $DIR/missing-comma-in-match.rs:15:18
|
X | &None => 1
| -- - help: missing comma
| |
| while parsing the match arm starting here
X | &Some(2) => { 3 }
| ^^ expected one of `,`, `.`, `?`, `}`, or an operator here
```
2018-02-18 22:36:35 +00:00
|
|
|
|
let cm = self.sess.codemap();
|
|
|
|
|
self.expect_one_of(&[token::Comma], &[token::CloseDelim(token::Brace)])
|
|
|
|
|
.map_err(|mut err| {
|
|
|
|
|
match (cm.span_to_lines(expr.span), cm.span_to_lines(arm_start_span)) {
|
|
|
|
|
(Ok(ref expr_lines), Ok(ref arm_start_lines))
|
|
|
|
|
if arm_start_lines.lines[0].end_col == expr_lines.lines[0].end_col
|
|
|
|
|
&& expr_lines.lines.len() == 2
|
|
|
|
|
&& self.token == token::FatArrow => {
|
|
|
|
|
// We check wether there's any trailing code in the parse span, if there
|
|
|
|
|
// isn't, we very likely have the following:
|
|
|
|
|
//
|
|
|
|
|
// X | &Y => "y"
|
|
|
|
|
// | -- - missing comma
|
|
|
|
|
// | |
|
|
|
|
|
// | arrow_span
|
|
|
|
|
// X | &X => "x"
|
|
|
|
|
// | - ^^ self.span
|
|
|
|
|
// | |
|
|
|
|
|
// | parsed until here as `"y" & X`
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
err.span_suggestion_short_with_applicability(
|
2018-02-24 03:38:36 +00:00
|
|
|
|
cm.next_point(arm_start_span),
|
|
|
|
|
"missing a comma here to end this `match` arm",
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
",".to_owned(),
|
|
|
|
|
Applicability::MachineApplicable
|
2018-02-24 03:38:36 +00:00
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
_ => {
|
|
|
|
|
err.span_label(arrow_span,
|
|
|
|
|
"while parsing the `match` arm starting here");
|
Provide missing comma in match arm suggestion
When finding:
```rust
match &Some(3) {
&None => 1
&Some(2) => { 3 }
_ => 2
}
```
provide the following diagnostic:
```
error: expected one of `,`, `.`, `?`, `}`, or an operator, found `=>`
--> $DIR/missing-comma-in-match.rs:15:18
|
X | &None => 1
| -- - help: missing comma
| |
| while parsing the match arm starting here
X | &Some(2) => { 3 }
| ^^ expected one of `,`, `.`, `?`, `}`, or an operator here
```
2018-02-18 22:36:35 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
err
|
|
|
|
|
})?;
|
2014-07-29 00:32:51 +00:00
|
|
|
|
} else {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.eat(&token::Comma);
|
2014-07-29 00:32:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(ast::Arm {
|
2017-08-07 05:54:09 +00:00
|
|
|
|
attrs,
|
|
|
|
|
pats,
|
|
|
|
|
guard,
|
2014-07-29 00:32:51 +00:00
|
|
|
|
body: expr,
|
2015-03-28 21:58:51 +00:00
|
|
|
|
})
|
2014-07-29 00:32:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse an expression
|
2015-12-20 21:00:43 +00:00
|
|
|
|
pub fn parse_expr(&mut self) -> PResult<'a, P<Expr>> {
|
2015-11-03 16:39:51 +00:00
|
|
|
|
self.parse_expr_res(Restrictions::empty(), None)
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2011-01-01 01:28:43 +00:00
|
|
|
|
|
2015-10-16 19:42:06 +00:00
|
|
|
|
/// Evaluate the closure with restrictions in place.
|
|
|
|
|
///
|
|
|
|
|
/// After the closure is evaluated, restrictions are reset.
|
2016-02-11 00:52:44 +00:00
|
|
|
|
pub fn with_res<F, T>(&mut self, r: Restrictions, f: F) -> T
|
|
|
|
|
where F: FnOnce(&mut Self) -> T
|
2015-12-20 21:00:43 +00:00
|
|
|
|
{
|
2014-09-16 05:22:12 +00:00
|
|
|
|
let old = self.restrictions;
|
|
|
|
|
self.restrictions = r;
|
2015-10-16 19:42:06 +00:00
|
|
|
|
let r = f(self);
|
2014-09-16 05:22:12 +00:00
|
|
|
|
self.restrictions = old;
|
2015-10-16 19:42:06 +00:00
|
|
|
|
return r;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Parse an expression, subject to the given restrictions
|
2015-11-03 16:39:51 +00:00
|
|
|
|
pub fn parse_expr_res(&mut self, r: Restrictions,
|
2016-06-18 04:01:57 +00:00
|
|
|
|
already_parsed_attrs: Option<ThinVec<Attribute>>)
|
2015-12-20 21:00:43 +00:00
|
|
|
|
-> PResult<'a, P<Expr>> {
|
2015-11-03 16:39:51 +00:00
|
|
|
|
self.with_res(r, |this| this.parse_assoc_expr(already_parsed_attrs))
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2011-01-01 01:28:43 +00:00
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse the RHS of a local variable declaration (e.g. '= 14;')
|
2017-10-22 16:19:30 +00:00
|
|
|
|
fn parse_initializer(&mut self, skip_eq: bool) -> PResult<'a, Option<P<Expr>>> {
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
if self.check(&token::Eq) {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2016-03-23 03:01:37 +00:00
|
|
|
|
Ok(Some(self.parse_expr()?))
|
2017-10-22 16:19:30 +00:00
|
|
|
|
} else if skip_eq {
|
|
|
|
|
Ok(Some(self.parse_expr()?))
|
2013-10-03 09:53:46 +00:00
|
|
|
|
} else {
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(None)
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2010-10-12 01:20:25 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse patterns, separated by '|' s
|
2015-12-20 21:00:43 +00:00
|
|
|
|
fn parse_pats(&mut self) -> PResult<'a, Vec<P<Pat>>> {
|
2014-02-28 21:09:09 +00:00
|
|
|
|
let mut pats = Vec::new();
|
2012-05-23 22:06:11 +00:00
|
|
|
|
loop {
|
in which parentheses are suggested for should-have-been-tuple-patterns
Programmers used to working in some other languages (such as Python or
Go) might expect to be able to destructure values with comma-separated
identifiers but no parentheses on the left side of an assignment.
Previously, the first name in such code would get parsed as a
single-indentifier pattern—recognizing, for example, the
`let a` in `let a, b = (1, 2);`—whereupon we would have a fatal syntax
error on seeing an unexpected comma rather than the expected semicolon
(all the way nearer to the end of `parse_full_stmt`).
Instead, let's look for that comma when parsing the pattern, and if we
see it, momentarily make-believe that we're parsing the remaining
elements in a tuple pattern, so that we can suggest wrapping it all in
parentheses. We need to do this in a separate wrapper method called on
the top-level pattern (or `|`-patterns) in a `let` statement, `for`
loop, `if`- or `while let` expression, or match arm rather than within
`parse_pat` itself, because `parse_pat` gets called recursively to parse
the sub-patterns within a tuple pattern.
Resolves #48492.
2018-02-25 04:41:16 +00:00
|
|
|
|
pats.push(self.parse_top_level_pat()?);
|
2018-01-06 12:41:36 +00:00
|
|
|
|
|
2018-01-06 15:01:54 +00:00
|
|
|
|
if self.token == token::OrOr {
|
2018-01-06 20:29:08 +00:00
|
|
|
|
let mut err = self.struct_span_err(self.span,
|
|
|
|
|
"unexpected token `||` after pattern");
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
err.span_suggestion_with_applicability(
|
|
|
|
|
self.span,
|
|
|
|
|
"use a single `|` to specify multiple patterns",
|
|
|
|
|
"|".to_owned(),
|
|
|
|
|
Applicability::MachineApplicable
|
|
|
|
|
);
|
2018-01-06 20:22:29 +00:00
|
|
|
|
err.emit();
|
2018-01-06 15:01:54 +00:00
|
|
|
|
self.bump();
|
2018-01-06 15:05:02 +00:00
|
|
|
|
} else if self.check(&token::BinOp(token::Or)) {
|
2018-01-06 15:01:54 +00:00
|
|
|
|
self.bump();
|
2018-01-06 15:05:02 +00:00
|
|
|
|
} else {
|
2018-01-06 12:41:36 +00:00
|
|
|
|
return Ok(pats);
|
|
|
|
|
}
|
2012-05-23 22:06:11 +00:00
|
|
|
|
};
|
|
|
|
|
}
|
2011-07-08 14:27:55 +00:00
|
|
|
|
|
2018-02-24 12:27:06 +00:00
|
|
|
|
// Parses a parenthesized list of patterns like
|
|
|
|
|
// `()`, `(p)`, `(p,)`, `(p, q)`, or `(p, .., q)`. Returns:
|
|
|
|
|
// - a vector of the patterns that were parsed
|
|
|
|
|
// - an option indicating the index of the `..` element
|
|
|
|
|
// - a boolean indicating whether a trailing comma was present.
|
|
|
|
|
// Trailing commas are significant because (p) and (p,) are different patterns.
|
|
|
|
|
fn parse_parenthesized_pat_list(&mut self) -> PResult<'a, (Vec<P<Pat>>, Option<usize>, bool)> {
|
|
|
|
|
self.expect(&token::OpenDelim(token::Paren))?;
|
in which parentheses are suggested for should-have-been-tuple-patterns
Programmers used to working in some other languages (such as Python or
Go) might expect to be able to destructure values with comma-separated
identifiers but no parentheses on the left side of an assignment.
Previously, the first name in such code would get parsed as a
single-indentifier pattern—recognizing, for example, the
`let a` in `let a, b = (1, 2);`—whereupon we would have a fatal syntax
error on seeing an unexpected comma rather than the expected semicolon
(all the way nearer to the end of `parse_full_stmt`).
Instead, let's look for that comma when parsing the pattern, and if we
see it, momentarily make-believe that we're parsing the remaining
elements in a tuple pattern, so that we can suggest wrapping it all in
parentheses. We need to do this in a separate wrapper method called on
the top-level pattern (or `|`-patterns) in a `let` statement, `for`
loop, `if`- or `while let` expression, or match arm rather than within
`parse_pat` itself, because `parse_pat` gets called recursively to parse
the sub-patterns within a tuple pattern.
Resolves #48492.
2018-02-25 04:41:16 +00:00
|
|
|
|
let result = self.parse_pat_list()?;
|
|
|
|
|
self.expect(&token::CloseDelim(token::Paren))?;
|
|
|
|
|
Ok(result)
|
|
|
|
|
}
|
2016-03-06 12:54:44 +00:00
|
|
|
|
|
in which parentheses are suggested for should-have-been-tuple-patterns
Programmers used to working in some other languages (such as Python or
Go) might expect to be able to destructure values with comma-separated
identifiers but no parentheses on the left side of an assignment.
Previously, the first name in such code would get parsed as a
single-indentifier pattern—recognizing, for example, the
`let a` in `let a, b = (1, 2);`—whereupon we would have a fatal syntax
error on seeing an unexpected comma rather than the expected semicolon
(all the way nearer to the end of `parse_full_stmt`).
Instead, let's look for that comma when parsing the pattern, and if we
see it, momentarily make-believe that we're parsing the remaining
elements in a tuple pattern, so that we can suggest wrapping it all in
parentheses. We need to do this in a separate wrapper method called on
the top-level pattern (or `|`-patterns) in a `let` statement, `for`
loop, `if`- or `while let` expression, or match arm rather than within
`parse_pat` itself, because `parse_pat` gets called recursively to parse
the sub-patterns within a tuple pattern.
Resolves #48492.
2018-02-25 04:41:16 +00:00
|
|
|
|
fn parse_pat_list(&mut self) -> PResult<'a, (Vec<P<Pat>>, Option<usize>, bool)> {
|
2018-02-24 12:27:06 +00:00
|
|
|
|
let mut fields = Vec::new();
|
|
|
|
|
let mut ddpos = None;
|
|
|
|
|
let mut trailing_comma = false;
|
|
|
|
|
loop {
|
|
|
|
|
if self.eat(&token::DotDot) {
|
|
|
|
|
if ddpos.is_none() {
|
|
|
|
|
ddpos = Some(fields.len());
|
|
|
|
|
} else {
|
|
|
|
|
// Emit a friendly error, ignore `..` and continue parsing
|
|
|
|
|
self.span_err(self.prev_span,
|
|
|
|
|
"`..` can only be used once per tuple or tuple struct pattern");
|
2015-03-31 06:10:11 +00:00
|
|
|
|
}
|
2018-02-24 12:27:06 +00:00
|
|
|
|
} else if !self.check(&token::CloseDelim(token::Paren)) {
|
2016-03-06 12:54:44 +00:00
|
|
|
|
fields.push(self.parse_pat()?);
|
2018-02-24 12:27:06 +00:00
|
|
|
|
} else {
|
|
|
|
|
break
|
2015-03-31 06:10:11 +00:00
|
|
|
|
}
|
2016-03-06 12:54:44 +00:00
|
|
|
|
|
2018-02-24 12:27:06 +00:00
|
|
|
|
trailing_comma = self.eat(&token::Comma);
|
|
|
|
|
if !trailing_comma {
|
|
|
|
|
break
|
2015-03-31 06:10:11 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2016-03-06 12:54:44 +00:00
|
|
|
|
|
2018-02-24 12:27:06 +00:00
|
|
|
|
if ddpos == Some(fields.len()) && trailing_comma {
|
|
|
|
|
// `..` needs to be followed by `)` or `, pat`, `..,)` is disallowed.
|
|
|
|
|
self.span_err(self.prev_span, "trailing comma is not permitted after `..`");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Ok((fields, ddpos, trailing_comma))
|
2015-03-31 06:10:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-03-02 21:02:27 +00:00
|
|
|
|
fn parse_pat_vec_elements(
|
2013-12-30 22:04:00 +00:00
|
|
|
|
&mut self,
|
2015-12-20 21:00:43 +00:00
|
|
|
|
) -> PResult<'a, (Vec<P<Pat>>, Option<P<Pat>>, Vec<P<Pat>>)> {
|
2014-02-28 21:09:09 +00:00
|
|
|
|
let mut before = Vec::new();
|
2013-02-26 18:58:46 +00:00
|
|
|
|
let mut slice = None;
|
2014-02-28 21:09:09 +00:00
|
|
|
|
let mut after = Vec::new();
|
2012-12-08 20:22:43 +00:00
|
|
|
|
let mut first = true;
|
2013-02-26 18:58:46 +00:00
|
|
|
|
let mut before_slice = true;
|
2012-12-08 20:22:43 +00:00
|
|
|
|
|
2014-10-29 10:37:54 +00:00
|
|
|
|
while self.token != token::CloseDelim(token::Bracket) {
|
2014-09-06 22:23:55 +00:00
|
|
|
|
if first {
|
|
|
|
|
first = false;
|
|
|
|
|
} else {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::Comma)?;
|
2014-11-30 04:39:50 +00:00
|
|
|
|
|
|
|
|
|
if self.token == token::CloseDelim(token::Bracket)
|
2015-03-24 23:54:09 +00:00
|
|
|
|
&& (before_slice || !after.is_empty()) {
|
2014-11-30 04:39:50 +00:00
|
|
|
|
break
|
|
|
|
|
}
|
2014-09-06 22:23:55 +00:00
|
|
|
|
}
|
2012-12-08 20:22:43 +00:00
|
|
|
|
|
2013-02-26 18:58:46 +00:00
|
|
|
|
if before_slice {
|
2017-01-10 21:13:53 +00:00
|
|
|
|
if self.eat(&token::DotDot) {
|
2012-12-08 20:22:43 +00:00
|
|
|
|
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
if self.check(&token::Comma) ||
|
|
|
|
|
self.check(&token::CloseDelim(token::Bracket)) {
|
2017-12-16 22:53:11 +00:00
|
|
|
|
slice = Some(P(Pat {
|
2014-09-06 22:23:55 +00:00
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2016-02-11 18:16:33 +00:00
|
|
|
|
node: PatKind::Wild,
|
2018-02-24 19:21:33 +00:00
|
|
|
|
span: self.prev_span,
|
2014-09-13 16:06:01 +00:00
|
|
|
|
}));
|
2014-09-06 22:23:55 +00:00
|
|
|
|
before_slice = false;
|
2013-11-08 03:25:39 +00:00
|
|
|
|
}
|
2014-09-06 22:23:55 +00:00
|
|
|
|
continue
|
2012-12-08 20:22:43 +00:00
|
|
|
|
}
|
2014-09-06 22:23:55 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let subpat = self.parse_pat()?;
|
2017-01-10 21:13:53 +00:00
|
|
|
|
if before_slice && self.eat(&token::DotDot) {
|
2014-09-06 22:23:55 +00:00
|
|
|
|
slice = Some(subpat);
|
|
|
|
|
before_slice = false;
|
|
|
|
|
} else if before_slice {
|
|
|
|
|
before.push(subpat);
|
2013-02-26 18:58:46 +00:00
|
|
|
|
} else {
|
2014-09-06 22:23:55 +00:00
|
|
|
|
after.push(subpat);
|
2012-12-08 20:22:43 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2013-02-26 18:58:46 +00:00
|
|
|
|
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok((before, slice, after))
|
2012-12-08 20:22:43 +00:00
|
|
|
|
}
|
|
|
|
|
|
2018-05-30 05:31:00 +00:00
|
|
|
|
fn parse_pat_field(
|
|
|
|
|
&mut self,
|
|
|
|
|
lo: Span,
|
|
|
|
|
attrs: Vec<Attribute>
|
|
|
|
|
) -> PResult<'a, codemap::Spanned<ast::FieldPat>> {
|
|
|
|
|
// Check if a colon exists one ahead. This means we're parsing a fieldname.
|
|
|
|
|
let hi;
|
|
|
|
|
let (subpat, fieldname, is_shorthand) = if self.look_ahead(1, |t| t == &token::Colon) {
|
|
|
|
|
// Parsing a pattern of the form "fieldname: pat"
|
|
|
|
|
let fieldname = self.parse_field_name()?;
|
|
|
|
|
self.bump();
|
|
|
|
|
let pat = self.parse_pat()?;
|
|
|
|
|
hi = pat.span;
|
|
|
|
|
(pat, fieldname, false)
|
|
|
|
|
} else {
|
|
|
|
|
// Parsing a pattern of the form "(box) (ref) (mut) fieldname"
|
|
|
|
|
let is_box = self.eat_keyword(keywords::Box);
|
|
|
|
|
let boxed_span = self.span;
|
|
|
|
|
let is_ref = self.eat_keyword(keywords::Ref);
|
|
|
|
|
let is_mut = self.eat_keyword(keywords::Mut);
|
|
|
|
|
let fieldname = self.parse_ident()?;
|
|
|
|
|
hi = self.prev_span;
|
|
|
|
|
|
|
|
|
|
let bind_type = match (is_ref, is_mut) {
|
|
|
|
|
(true, true) => BindingMode::ByRef(Mutability::Mutable),
|
|
|
|
|
(true, false) => BindingMode::ByRef(Mutability::Immutable),
|
|
|
|
|
(false, true) => BindingMode::ByValue(Mutability::Mutable),
|
|
|
|
|
(false, false) => BindingMode::ByValue(Mutability::Immutable),
|
|
|
|
|
};
|
|
|
|
|
let fieldpat = P(Pat {
|
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
|
|
|
|
node: PatKind::Ident(bind_type, fieldname, None),
|
|
|
|
|
span: boxed_span.to(hi),
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
let subpat = if is_box {
|
|
|
|
|
P(Pat {
|
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
|
|
|
|
node: PatKind::Box(fieldpat),
|
|
|
|
|
span: lo.to(hi),
|
|
|
|
|
})
|
|
|
|
|
} else {
|
|
|
|
|
fieldpat
|
|
|
|
|
};
|
|
|
|
|
(subpat, fieldname, true)
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
Ok(codemap::Spanned {
|
|
|
|
|
span: lo.to(hi),
|
|
|
|
|
node: ast::FieldPat {
|
|
|
|
|
ident: fieldname,
|
|
|
|
|
pat: subpat,
|
|
|
|
|
is_shorthand,
|
|
|
|
|
attrs: attrs.into(),
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse the fields of a struct-like pattern
|
2016-06-21 22:08:13 +00:00
|
|
|
|
fn parse_pat_fields(&mut self) -> PResult<'a, (Vec<codemap::Spanned<ast::FieldPat>>, bool)> {
|
2014-02-28 21:09:09 +00:00
|
|
|
|
let mut fields = Vec::new();
|
2012-08-07 00:01:14 +00:00
|
|
|
|
let mut etc = false;
|
2018-05-30 05:31:00 +00:00
|
|
|
|
let mut ate_comma = true;
|
|
|
|
|
let mut delayed_err: Option<DiagnosticBuilder<'a>> = None;
|
|
|
|
|
let mut etc_span = None;
|
2012-08-07 00:01:14 +00:00
|
|
|
|
|
2018-05-30 05:31:00 +00:00
|
|
|
|
while self.token != token::CloseDelim(token::Brace) {
|
2017-01-04 03:13:01 +00:00
|
|
|
|
let attrs = self.parse_outer_attributes()?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
2018-05-30 05:31:00 +00:00
|
|
|
|
|
|
|
|
|
// check that a comma comes after every field
|
|
|
|
|
if !ate_comma {
|
|
|
|
|
let err = self.struct_span_err(self.prev_span, "expected `,`");
|
|
|
|
|
return Err(err);
|
|
|
|
|
}
|
|
|
|
|
ate_comma = false;
|
2014-10-06 00:36:53 +00:00
|
|
|
|
|
2017-12-16 08:58:19 +00:00
|
|
|
|
if self.check(&token::DotDot) || self.token == token::DotDotDot {
|
2018-05-30 05:31:00 +00:00
|
|
|
|
etc = true;
|
|
|
|
|
let mut etc_sp = self.span;
|
|
|
|
|
|
2017-12-16 08:58:19 +00:00
|
|
|
|
if self.token == token::DotDotDot { // Issue #46718
|
2018-05-30 05:31:00 +00:00
|
|
|
|
// Accept `...` as if it were `..` to avoid further errors
|
2017-12-16 08:58:19 +00:00
|
|
|
|
let mut err = self.struct_span_err(self.span,
|
|
|
|
|
"expected field pattern, found `...`");
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
err.span_suggestion_with_applicability(
|
|
|
|
|
self.span,
|
|
|
|
|
"to omit remaining fields, use one fewer `.`",
|
|
|
|
|
"..".to_owned(),
|
|
|
|
|
Applicability::MachineApplicable
|
|
|
|
|
);
|
2017-12-16 08:58:19 +00:00
|
|
|
|
err.emit();
|
|
|
|
|
}
|
2018-05-30 05:31:00 +00:00
|
|
|
|
self.bump(); // `..` || `...`:w
|
2017-12-16 08:58:19 +00:00
|
|
|
|
|
2018-05-30 05:31:00 +00:00
|
|
|
|
if self.token == token::CloseDelim(token::Brace) {
|
|
|
|
|
etc_span = Some(etc_sp);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
let token_str = self.this_token_to_string();
|
|
|
|
|
let mut err = self.fatal(&format!("expected `}}`, found `{}`", token_str));
|
|
|
|
|
|
|
|
|
|
err.span_label(self.span, "expected `}`");
|
|
|
|
|
let mut comma_sp = None;
|
|
|
|
|
if self.token == token::Comma { // Issue #49257
|
|
|
|
|
etc_sp = etc_sp.to(self.sess.codemap().span_until_non_whitespace(self.span));
|
|
|
|
|
err.span_label(etc_sp,
|
|
|
|
|
"`..` must be at the end and cannot have a trailing comma");
|
|
|
|
|
comma_sp = Some(self.span);
|
|
|
|
|
self.bump();
|
|
|
|
|
ate_comma = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
etc_span = Some(etc_sp);
|
|
|
|
|
if self.token == token::CloseDelim(token::Brace) {
|
|
|
|
|
// If the struct looks otherwise well formed, recover and continue.
|
|
|
|
|
if let Some(sp) = comma_sp {
|
|
|
|
|
err.span_suggestion_short(sp, "remove this comma", "".into());
|
|
|
|
|
}
|
|
|
|
|
err.emit();
|
|
|
|
|
break;
|
|
|
|
|
} else if self.token.is_ident() && ate_comma {
|
|
|
|
|
// Accept fields coming after `..,`.
|
|
|
|
|
// This way we avoid "pattern missing fields" errors afterwards.
|
|
|
|
|
// We delay this error until the end in order to have a span for a
|
|
|
|
|
// suggested fix.
|
|
|
|
|
if let Some(mut delayed_err) = delayed_err {
|
|
|
|
|
delayed_err.emit();
|
|
|
|
|
return Err(err);
|
2018-03-22 11:57:12 +00:00
|
|
|
|
} else {
|
2018-05-30 05:31:00 +00:00
|
|
|
|
delayed_err = Some(err);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if let Some(mut err) = delayed_err {
|
|
|
|
|
err.emit();
|
2018-03-22 11:57:12 +00:00
|
|
|
|
}
|
2018-02-19 00:59:33 +00:00
|
|
|
|
return Err(err);
|
2012-08-07 00:01:14 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-05-30 05:31:00 +00:00
|
|
|
|
fields.push(match self.parse_pat_field(lo, attrs) {
|
|
|
|
|
Ok(field) => field,
|
|
|
|
|
Err(err) => {
|
|
|
|
|
if let Some(mut delayed_err) = delayed_err {
|
|
|
|
|
delayed_err.emit();
|
|
|
|
|
}
|
|
|
|
|
return Err(err);
|
|
|
|
|
}
|
2017-01-04 03:13:01 +00:00
|
|
|
|
});
|
2018-05-30 05:31:00 +00:00
|
|
|
|
ate_comma = self.eat(&token::Comma);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if let Some(mut err) = delayed_err {
|
|
|
|
|
if let Some(etc_span) = etc_span {
|
|
|
|
|
err.multipart_suggestion(
|
|
|
|
|
"move the `..` to the end of the field list",
|
|
|
|
|
vec![
|
|
|
|
|
(etc_span, "".into()),
|
2018-05-30 18:04:39 +00:00
|
|
|
|
(self.span, format!("{}.. }}", if ate_comma { "" } else { ", " })),
|
2018-05-30 05:31:00 +00:00
|
|
|
|
],
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
err.emit();
|
2012-08-07 00:01:14 +00:00
|
|
|
|
}
|
2015-03-28 21:58:51 +00:00
|
|
|
|
return Ok((fields, etc));
|
2012-08-07 00:01:14 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-12-20 21:00:43 +00:00
|
|
|
|
fn parse_pat_range_end(&mut self) -> PResult<'a, P<Expr>> {
|
2016-04-20 23:03:29 +00:00
|
|
|
|
if self.token.is_path_start() {
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
2015-12-30 23:11:53 +00:00
|
|
|
|
let (qself, path) = if self.eat_lt() {
|
2015-03-25 16:53:28 +00:00
|
|
|
|
// Parse a qualified path
|
2017-07-19 23:39:34 +00:00
|
|
|
|
let (qself, path) = self.parse_qpath(PathStyle::Expr)?;
|
2015-03-25 16:53:28 +00:00
|
|
|
|
(Some(qself), path)
|
|
|
|
|
} else {
|
|
|
|
|
// Parse an unqualified path
|
2016-04-18 21:42:18 +00:00
|
|
|
|
(None, self.parse_path(PathStyle::Expr)?)
|
2015-03-25 16:53:28 +00:00
|
|
|
|
};
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let hi = self.prev_span;
|
|
|
|
|
Ok(self.mk_expr(lo.to(hi), ExprKind::Path(qself, path), ThinVec::new()))
|
2015-03-31 06:10:11 +00:00
|
|
|
|
} else {
|
2018-04-09 23:08:47 +00:00
|
|
|
|
self.parse_literal_maybe_minus()
|
2015-03-31 06:10:11 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-10 21:13:53 +00:00
|
|
|
|
// helper function to decide whether to parse as ident binding or to try to do
|
|
|
|
|
// something more complex like range patterns
|
|
|
|
|
fn parse_as_ident(&mut self) -> bool {
|
|
|
|
|
self.look_ahead(1, |t| match *t {
|
|
|
|
|
token::OpenDelim(token::Paren) | token::OpenDelim(token::Brace) |
|
2017-09-19 05:40:04 +00:00
|
|
|
|
token::DotDotDot | token::DotDotEq | token::ModSep | token::Not => Some(false),
|
2017-01-10 21:13:53 +00:00
|
|
|
|
// ensure slice patterns [a, b.., c] and [a, b, c..] don't go into the
|
|
|
|
|
// range pattern branch
|
|
|
|
|
token::DotDot => None,
|
|
|
|
|
_ => Some(true),
|
|
|
|
|
}).unwrap_or_else(|| self.look_ahead(2, |t| match *t {
|
|
|
|
|
token::Comma | token::CloseDelim(token::Bracket) => true,
|
|
|
|
|
_ => false,
|
|
|
|
|
}))
|
|
|
|
|
}
|
|
|
|
|
|
in which parentheses are suggested for should-have-been-tuple-patterns
Programmers used to working in some other languages (such as Python or
Go) might expect to be able to destructure values with comma-separated
identifiers but no parentheses on the left side of an assignment.
Previously, the first name in such code would get parsed as a
single-indentifier pattern—recognizing, for example, the
`let a` in `let a, b = (1, 2);`—whereupon we would have a fatal syntax
error on seeing an unexpected comma rather than the expected semicolon
(all the way nearer to the end of `parse_full_stmt`).
Instead, let's look for that comma when parsing the pattern, and if we
see it, momentarily make-believe that we're parsing the remaining
elements in a tuple pattern, so that we can suggest wrapping it all in
parentheses. We need to do this in a separate wrapper method called on
the top-level pattern (or `|`-patterns) in a `let` statement, `for`
loop, `if`- or `while let` expression, or match arm rather than within
`parse_pat` itself, because `parse_pat` gets called recursively to parse
the sub-patterns within a tuple pattern.
Resolves #48492.
2018-02-25 04:41:16 +00:00
|
|
|
|
/// A wrapper around `parse_pat` with some special error handling for the
|
|
|
|
|
/// "top-level" patterns in a match arm, `for` loop, `let`, &c. (in contast
|
|
|
|
|
/// to subpatterns within such).
|
|
|
|
|
pub fn parse_top_level_pat(&mut self) -> PResult<'a, P<Pat>> {
|
|
|
|
|
let pat = self.parse_pat()?;
|
|
|
|
|
if self.token == token::Comma {
|
|
|
|
|
// An unexpected comma after a top-level pattern is a clue that the
|
|
|
|
|
// user (perhaps more accustomed to some other language) forgot the
|
|
|
|
|
// parentheses in what should have been a tuple pattern; return a
|
|
|
|
|
// suggestion-enhanced error here rather than choking on the comma
|
|
|
|
|
// later.
|
|
|
|
|
let comma_span = self.span;
|
|
|
|
|
self.bump();
|
|
|
|
|
if let Err(mut err) = self.parse_pat_list() {
|
|
|
|
|
// We didn't expect this to work anyway; we just wanted
|
|
|
|
|
// to advance to the end of the comma-sequence so we know
|
|
|
|
|
// the span to suggest parenthesizing
|
|
|
|
|
err.cancel();
|
|
|
|
|
}
|
|
|
|
|
let seq_span = pat.span.to(self.prev_span);
|
|
|
|
|
let mut err = self.struct_span_err(comma_span,
|
|
|
|
|
"unexpected `,` in pattern");
|
|
|
|
|
if let Ok(seq_snippet) = self.sess.codemap().span_to_snippet(seq_span) {
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
err.span_suggestion_with_applicability(
|
|
|
|
|
seq_span,
|
|
|
|
|
"try adding parentheses",
|
|
|
|
|
format!("({})", seq_snippet),
|
|
|
|
|
Applicability::MachineApplicable
|
|
|
|
|
);
|
in which parentheses are suggested for should-have-been-tuple-patterns
Programmers used to working in some other languages (such as Python or
Go) might expect to be able to destructure values with comma-separated
identifiers but no parentheses on the left side of an assignment.
Previously, the first name in such code would get parsed as a
single-indentifier pattern—recognizing, for example, the
`let a` in `let a, b = (1, 2);`—whereupon we would have a fatal syntax
error on seeing an unexpected comma rather than the expected semicolon
(all the way nearer to the end of `parse_full_stmt`).
Instead, let's look for that comma when parsing the pattern, and if we
see it, momentarily make-believe that we're parsing the remaining
elements in a tuple pattern, so that we can suggest wrapping it all in
parentheses. We need to do this in a separate wrapper method called on
the top-level pattern (or `|`-patterns) in a `let` statement, `for`
loop, `if`- or `while let` expression, or match arm rather than within
`parse_pat` itself, because `parse_pat` gets called recursively to parse
the sub-patterns within a tuple pattern.
Resolves #48492.
2018-02-25 04:41:16 +00:00
|
|
|
|
}
|
|
|
|
|
return Err(err);
|
|
|
|
|
}
|
|
|
|
|
Ok(pat)
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse a pattern.
|
2015-12-20 21:00:43 +00:00
|
|
|
|
pub fn parse_pat(&mut self) -> PResult<'a, P<Pat>> {
|
2018-03-02 22:05:54 +00:00
|
|
|
|
self.parse_pat_with_range_pat(true)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Parse a pattern, with a setting whether modern range patterns e.g. `a..=b`, `a..b` are
|
|
|
|
|
/// allowed.
|
|
|
|
|
fn parse_pat_with_range_pat(&mut self, allow_range_pat: bool) -> PResult<'a, P<Pat>> {
|
2016-11-02 03:03:55 +00:00
|
|
|
|
maybe_whole!(self, NtPat, |x| x);
|
2012-08-01 21:34:35 +00:00
|
|
|
|
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
2013-04-12 05:10:31 +00:00
|
|
|
|
let pat;
|
2013-12-30 23:09:41 +00:00
|
|
|
|
match self.token {
|
2016-09-22 22:44:59 +00:00
|
|
|
|
token::BinOp(token::And) | token::AndAnd => {
|
|
|
|
|
// Parse &pat / &mut pat
|
|
|
|
|
self.expect_and()?;
|
2017-03-16 21:47:32 +00:00
|
|
|
|
let mutbl = self.parse_mutability();
|
2016-09-22 22:44:59 +00:00
|
|
|
|
if let token::Lifetime(ident) = self.token {
|
2018-02-19 07:08:23 +00:00
|
|
|
|
let mut err = self.fatal(&format!("unexpected lifetime `{}` in pattern",
|
|
|
|
|
ident));
|
|
|
|
|
err.span_label(self.span, "unexpected lifetime");
|
|
|
|
|
return Err(err);
|
2016-09-22 22:44:59 +00:00
|
|
|
|
}
|
2018-03-02 22:05:54 +00:00
|
|
|
|
let subpat = self.parse_pat_with_range_pat(false)?;
|
2016-09-22 22:44:59 +00:00
|
|
|
|
pat = PatKind::Ref(subpat, mutbl);
|
|
|
|
|
}
|
|
|
|
|
token::OpenDelim(token::Paren) => {
|
|
|
|
|
// Parse (pat,pat,pat,...) as tuple pattern
|
2018-02-24 12:27:06 +00:00
|
|
|
|
let (fields, ddpos, trailing_comma) = self.parse_parenthesized_pat_list()?;
|
|
|
|
|
pat = if fields.len() == 1 && ddpos.is_none() && !trailing_comma {
|
|
|
|
|
PatKind::Paren(fields.into_iter().nth(0).unwrap())
|
|
|
|
|
} else {
|
|
|
|
|
PatKind::Tuple(fields, ddpos)
|
|
|
|
|
};
|
2016-09-22 22:44:59 +00:00
|
|
|
|
}
|
|
|
|
|
token::OpenDelim(token::Bracket) => {
|
|
|
|
|
// Parse [pat,pat,...] as slice pattern
|
|
|
|
|
self.bump();
|
|
|
|
|
let (before, slice, after) = self.parse_pat_vec_elements()?;
|
|
|
|
|
self.expect(&token::CloseDelim(token::Bracket))?;
|
2016-09-20 14:54:24 +00:00
|
|
|
|
pat = PatKind::Slice(before, slice, after);
|
2015-10-24 23:57:42 +00:00
|
|
|
|
}
|
2018-03-08 11:27:23 +00:00
|
|
|
|
// At this point, token != &, &&, (, [
|
|
|
|
|
_ => if self.eat_keyword(keywords::Underscore) {
|
|
|
|
|
// Parse _
|
|
|
|
|
pat = PatKind::Wild;
|
|
|
|
|
} else if self.eat_keyword(keywords::Mut) {
|
2017-07-26 15:59:07 +00:00
|
|
|
|
// Parse mut ident @ pat / mut ref ident @ pat
|
|
|
|
|
let mutref_span = self.prev_span.to(self.span);
|
|
|
|
|
let binding_mode = if self.eat_keyword(keywords::Ref) {
|
|
|
|
|
self.diagnostic()
|
|
|
|
|
.struct_span_err(mutref_span, "the order of `mut` and `ref` is incorrect")
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
.span_suggestion_with_applicability(
|
|
|
|
|
mutref_span,
|
|
|
|
|
"try switching the order",
|
|
|
|
|
"ref mut".into(),
|
|
|
|
|
Applicability::MachineApplicable
|
|
|
|
|
).emit();
|
2017-07-26 15:59:07 +00:00
|
|
|
|
BindingMode::ByRef(Mutability::Mutable)
|
|
|
|
|
} else {
|
|
|
|
|
BindingMode::ByValue(Mutability::Mutable)
|
|
|
|
|
};
|
|
|
|
|
pat = self.parse_pat_ident(binding_mode)?;
|
2015-12-30 23:11:53 +00:00
|
|
|
|
} else if self.eat_keyword(keywords::Ref) {
|
2015-03-31 06:10:11 +00:00
|
|
|
|
// Parse ref ident @ pat / ref mut ident @ pat
|
2017-03-16 21:47:32 +00:00
|
|
|
|
let mutbl = self.parse_mutability();
|
2016-03-23 03:01:37 +00:00
|
|
|
|
pat = self.parse_pat_ident(BindingMode::ByRef(mutbl))?;
|
2015-12-30 23:11:53 +00:00
|
|
|
|
} else if self.eat_keyword(keywords::Box) {
|
2015-03-31 06:10:11 +00:00
|
|
|
|
// Parse box pat
|
2018-03-02 22:05:54 +00:00
|
|
|
|
let subpat = self.parse_pat_with_range_pat(false)?;
|
2016-02-11 18:16:33 +00:00
|
|
|
|
pat = PatKind::Box(subpat);
|
2017-06-29 10:16:35 +00:00
|
|
|
|
} else if self.token.is_ident() && !self.token.is_reserved_ident() &&
|
2017-01-10 21:13:53 +00:00
|
|
|
|
self.parse_as_ident() {
|
2016-09-22 22:44:59 +00:00
|
|
|
|
// Parse ident @ pat
|
|
|
|
|
// This can give false positives and parse nullary enums,
|
|
|
|
|
// they are dealt with later in resolve
|
|
|
|
|
let binding_mode = BindingMode::ByValue(Mutability::Immutable);
|
|
|
|
|
pat = self.parse_pat_ident(binding_mode)?;
|
2016-04-20 23:03:29 +00:00
|
|
|
|
} else if self.token.is_path_start() {
|
2015-03-31 06:10:11 +00:00
|
|
|
|
// Parse pattern starting with a path
|
2016-09-22 22:44:59 +00:00
|
|
|
|
let (qself, path) = if self.eat_lt() {
|
|
|
|
|
// Parse a qualified path
|
2017-07-19 23:39:34 +00:00
|
|
|
|
let (qself, path) = self.parse_qpath(PathStyle::Expr)?;
|
2016-09-22 22:44:59 +00:00
|
|
|
|
(Some(qself), path)
|
2015-03-31 06:10:11 +00:00
|
|
|
|
} else {
|
2016-09-22 22:44:59 +00:00
|
|
|
|
// Parse an unqualified path
|
|
|
|
|
(None, self.parse_path(PathStyle::Expr)?)
|
|
|
|
|
};
|
|
|
|
|
match self.token {
|
|
|
|
|
token::Not if qself.is_none() => {
|
2015-03-31 06:10:11 +00:00
|
|
|
|
// Parse macro invocation
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2018-05-22 15:01:21 +00:00
|
|
|
|
let (delim, tts) = self.expect_delimited_token_tree()?;
|
|
|
|
|
let mac = respan(lo.to(self.prev_span), Mac_ { path, tts, delim });
|
2016-09-22 22:44:59 +00:00
|
|
|
|
pat = PatKind::Mac(mac);
|
2013-05-05 01:57:14 +00:00
|
|
|
|
}
|
2017-09-19 05:40:04 +00:00
|
|
|
|
token::DotDotDot | token::DotDotEq | token::DotDot => {
|
2017-01-10 21:13:53 +00:00
|
|
|
|
let end_kind = match self.token {
|
|
|
|
|
token::DotDot => RangeEnd::Excluded,
|
2017-09-21 10:13:26 +00:00
|
|
|
|
token::DotDotDot => RangeEnd::Included(RangeSyntax::DotDotDot),
|
|
|
|
|
token::DotDotEq => RangeEnd::Included(RangeSyntax::DotDotEq),
|
2017-09-19 05:40:04 +00:00
|
|
|
|
_ => panic!("can only parse `..`/`...`/`..=` for ranges \
|
|
|
|
|
(checked above)"),
|
2017-01-10 21:13:53 +00:00
|
|
|
|
};
|
2015-03-31 06:10:11 +00:00
|
|
|
|
// Parse range
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let span = lo.to(self.prev_span);
|
|
|
|
|
let begin = self.mk_expr(span, ExprKind::Path(qself, path), ThinVec::new());
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let end = self.parse_pat_range_end()?;
|
2017-01-10 21:13:53 +00:00
|
|
|
|
pat = PatKind::Range(begin, end, end_kind);
|
2016-09-22 22:44:59 +00:00
|
|
|
|
}
|
|
|
|
|
token::OpenDelim(token::Brace) => {
|
|
|
|
|
if qself.is_some() {
|
2018-02-19 07:08:23 +00:00
|
|
|
|
let msg = "unexpected `{` after qualified path";
|
|
|
|
|
let mut err = self.fatal(msg);
|
|
|
|
|
err.span_label(self.span, msg);
|
|
|
|
|
return Err(err);
|
2015-03-25 16:53:28 +00:00
|
|
|
|
}
|
2015-10-25 00:02:08 +00:00
|
|
|
|
// Parse struct pattern
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2016-02-10 03:11:27 +00:00
|
|
|
|
let (fields, etc) = self.parse_pat_fields().unwrap_or_else(|mut e| {
|
|
|
|
|
e.emit();
|
|
|
|
|
self.recover_stmt();
|
|
|
|
|
(vec![], false)
|
|
|
|
|
});
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2016-02-11 18:16:33 +00:00
|
|
|
|
pat = PatKind::Struct(path, fields, etc);
|
2016-09-22 22:44:59 +00:00
|
|
|
|
}
|
|
|
|
|
token::OpenDelim(token::Paren) => {
|
2015-03-25 16:53:28 +00:00
|
|
|
|
if qself.is_some() {
|
2018-02-19 07:08:23 +00:00
|
|
|
|
let msg = "unexpected `(` after qualified path";
|
|
|
|
|
let mut err = self.fatal(msg);
|
|
|
|
|
err.span_label(self.span, msg);
|
|
|
|
|
return Err(err);
|
2015-03-25 16:53:28 +00:00
|
|
|
|
}
|
2015-03-31 06:10:11 +00:00
|
|
|
|
// Parse tuple struct or enum pattern
|
2018-02-24 12:27:06 +00:00
|
|
|
|
let (fields, ddpos, _) = self.parse_parenthesized_pat_list()?;
|
2016-03-06 12:54:44 +00:00
|
|
|
|
pat = PatKind::TupleStruct(path, fields, ddpos)
|
2012-08-07 00:01:14 +00:00
|
|
|
|
}
|
2016-09-22 22:44:59 +00:00
|
|
|
|
_ => pat = PatKind::Path(qself, path),
|
2012-04-20 07:54:42 +00:00
|
|
|
|
}
|
2015-03-31 06:10:11 +00:00
|
|
|
|
} else {
|
|
|
|
|
// Try to parse everything else as literal with optional minus
|
2018-04-09 23:08:47 +00:00
|
|
|
|
match self.parse_literal_maybe_minus() {
|
2016-04-20 23:03:29 +00:00
|
|
|
|
Ok(begin) => {
|
|
|
|
|
if self.eat(&token::DotDotDot) {
|
|
|
|
|
let end = self.parse_pat_range_end()?;
|
2017-09-21 10:13:26 +00:00
|
|
|
|
pat = PatKind::Range(begin, end,
|
|
|
|
|
RangeEnd::Included(RangeSyntax::DotDotDot));
|
2017-09-19 05:40:04 +00:00
|
|
|
|
} else if self.eat(&token::DotDotEq) {
|
|
|
|
|
let end = self.parse_pat_range_end()?;
|
2017-09-21 10:13:26 +00:00
|
|
|
|
pat = PatKind::Range(begin, end,
|
|
|
|
|
RangeEnd::Included(RangeSyntax::DotDotEq));
|
2017-01-10 21:13:53 +00:00
|
|
|
|
} else if self.eat(&token::DotDot) {
|
|
|
|
|
let end = self.parse_pat_range_end()?;
|
|
|
|
|
pat = PatKind::Range(begin, end, RangeEnd::Excluded);
|
2016-04-20 23:03:29 +00:00
|
|
|
|
} else {
|
|
|
|
|
pat = PatKind::Lit(begin);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
Err(mut err) => {
|
2016-09-15 19:34:21 +00:00
|
|
|
|
self.cancel(&mut err);
|
2016-04-20 23:03:29 +00:00
|
|
|
|
let msg = format!("expected pattern, found {}", self.this_token_descr());
|
2018-02-19 07:08:23 +00:00
|
|
|
|
let mut err = self.fatal(&msg);
|
|
|
|
|
err.span_label(self.span, "expected pattern");
|
|
|
|
|
return Err(err);
|
2016-04-20 23:03:29 +00:00
|
|
|
|
}
|
2015-03-31 06:10:11 +00:00
|
|
|
|
}
|
2012-01-15 00:05:07 +00:00
|
|
|
|
}
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2015-03-31 06:10:11 +00:00
|
|
|
|
|
2017-12-16 22:53:11 +00:00
|
|
|
|
let pat = Pat { node: pat, span: lo.to(self.prev_span), id: ast::DUMMY_NODE_ID };
|
2017-12-18 20:59:31 +00:00
|
|
|
|
let pat = self.maybe_recover_from_bad_qpath(pat, true)?;
|
2017-12-16 22:53:11 +00:00
|
|
|
|
|
2018-03-02 22:05:54 +00:00
|
|
|
|
if !allow_range_pat {
|
|
|
|
|
match pat.node {
|
|
|
|
|
PatKind::Range(_, _, RangeEnd::Included(RangeSyntax::DotDotDot)) => {}
|
|
|
|
|
PatKind::Range(..) => {
|
|
|
|
|
let mut err = self.struct_span_err(
|
|
|
|
|
pat.span,
|
|
|
|
|
"the range pattern here has ambiguous interpretation",
|
|
|
|
|
);
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
err.span_suggestion_with_applicability(
|
2018-03-02 22:05:54 +00:00
|
|
|
|
pat.span,
|
|
|
|
|
"add parentheses to clarify the precedence",
|
|
|
|
|
format!("({})", pprust::pat_to_string(&pat)),
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
// "ambiguous interpretation" implies that we have to be guessing
|
|
|
|
|
Applicability::MaybeIncorrect
|
2018-03-02 22:05:54 +00:00
|
|
|
|
);
|
|
|
|
|
return Err(err);
|
|
|
|
|
}
|
|
|
|
|
_ => {}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-12-16 22:53:11 +00:00
|
|
|
|
Ok(P(pat))
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse ident or ident @ pat
|
|
|
|
|
/// used by the copy foo and ref foo patterns to give a good
|
|
|
|
|
/// error message when parsing mistakes like ref foo(a,b)
|
2013-12-30 22:04:00 +00:00
|
|
|
|
fn parse_pat_ident(&mut self,
|
2013-09-02 01:45:37 +00:00
|
|
|
|
binding_mode: ast::BindingMode)
|
2016-02-11 18:16:33 +00:00
|
|
|
|
-> PResult<'a, PatKind> {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let ident = self.parse_ident()?;
|
2015-12-30 23:11:53 +00:00
|
|
|
|
let sub = if self.eat(&token::At) {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
Some(self.parse_pat()?)
|
2013-04-24 08:29:46 +00:00
|
|
|
|
} else {
|
|
|
|
|
None
|
|
|
|
|
};
|
2012-08-06 14:20:23 +00:00
|
|
|
|
|
|
|
|
|
// just to be friendly, if they write something like
|
2012-08-20 19:23:37 +00:00
|
|
|
|
// ref Some(i)
|
2012-08-06 14:20:23 +00:00
|
|
|
|
// we end up here with ( as the current token. This shortly
|
|
|
|
|
// leads to a parse error. Note that if there is no explicit
|
|
|
|
|
// binding mode then we do not end up here, because the lookahead
|
|
|
|
|
// will direct us over to parse_enum_variant()
|
2014-10-29 10:37:54 +00:00
|
|
|
|
if self.token == token::OpenDelim(token::Paren) {
|
2015-03-28 21:58:51 +00:00
|
|
|
|
return Err(self.span_fatal(
|
2016-09-21 02:09:22 +00:00
|
|
|
|
self.prev_span,
|
2015-03-28 21:58:51 +00:00
|
|
|
|
"expected identifier, found enum pattern"))
|
2012-08-06 14:20:23 +00:00
|
|
|
|
}
|
|
|
|
|
|
2018-03-18 13:47:09 +00:00
|
|
|
|
Ok(PatKind::Ident(binding_mode, ident, sub))
|
2012-08-06 14:20:23 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse a local variable declaration
|
2016-06-18 04:01:57 +00:00
|
|
|
|
fn parse_local(&mut self, attrs: ThinVec<Attribute>) -> PResult<'a, P<Local>> {
|
2017-08-12 09:00:57 +00:00
|
|
|
|
let lo = self.prev_span;
|
in which parentheses are suggested for should-have-been-tuple-patterns
Programmers used to working in some other languages (such as Python or
Go) might expect to be able to destructure values with comma-separated
identifiers but no parentheses on the left side of an assignment.
Previously, the first name in such code would get parsed as a
single-indentifier pattern—recognizing, for example, the
`let a` in `let a, b = (1, 2);`—whereupon we would have a fatal syntax
error on seeing an unexpected comma rather than the expected semicolon
(all the way nearer to the end of `parse_full_stmt`).
Instead, let's look for that comma when parsing the pattern, and if we
see it, momentarily make-believe that we're parsing the remaining
elements in a tuple pattern, so that we can suggest wrapping it all in
parentheses. We need to do this in a separate wrapper method called on
the top-level pattern (or `|`-patterns) in a `let` statement, `for`
loop, `if`- or `while let` expression, or match arm rather than within
`parse_pat` itself, because `parse_pat` gets called recursively to parse
the sub-patterns within a tuple pattern.
Resolves #48492.
2018-02-25 04:41:16 +00:00
|
|
|
|
let pat = self.parse_top_level_pat()?;
|
2013-06-07 01:54:14 +00:00
|
|
|
|
|
2017-10-22 16:19:30 +00:00
|
|
|
|
let (err, ty) = if self.eat(&token::Colon) {
|
|
|
|
|
// Save the state of the parser before parsing type normally, in case there is a `:`
|
|
|
|
|
// instead of an `=` typo.
|
|
|
|
|
let parser_snapshot_before_type = self.clone();
|
|
|
|
|
let colon_sp = self.prev_span;
|
|
|
|
|
match self.parse_ty() {
|
|
|
|
|
Ok(ty) => (None, Some(ty)),
|
|
|
|
|
Err(mut err) => {
|
|
|
|
|
// Rewind to before attempting to parse the type and continue parsing
|
|
|
|
|
let parser_snapshot_after_type = self.clone();
|
|
|
|
|
mem::replace(self, parser_snapshot_before_type);
|
|
|
|
|
|
|
|
|
|
let snippet = self.sess.codemap().span_to_snippet(pat.span).unwrap();
|
|
|
|
|
err.span_label(pat.span, format!("while parsing the type for `{}`", snippet));
|
|
|
|
|
(Some((parser_snapshot_after_type, colon_sp, err)), None)
|
|
|
|
|
}
|
|
|
|
|
}
|
2017-05-12 18:05:39 +00:00
|
|
|
|
} else {
|
2017-10-22 16:19:30 +00:00
|
|
|
|
(None, None)
|
|
|
|
|
};
|
|
|
|
|
let init = match (self.parse_initializer(err.is_some()), err) {
|
|
|
|
|
(Ok(init), None) => { // init parsed, ty parsed
|
|
|
|
|
init
|
|
|
|
|
}
|
|
|
|
|
(Ok(init), Some((_, colon_sp, mut err))) => { // init parsed, ty error
|
|
|
|
|
// Could parse the type as if it were the initializer, it is likely there was a
|
|
|
|
|
// typo in the code: `:` instead of `=`. Add suggestion and emit the error.
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
err.span_suggestion_short_with_applicability(
|
|
|
|
|
colon_sp,
|
|
|
|
|
"use `=` if you meant to assign",
|
|
|
|
|
"=".to_string(),
|
|
|
|
|
Applicability::MachineApplicable
|
|
|
|
|
);
|
2017-10-22 16:19:30 +00:00
|
|
|
|
err.emit();
|
2018-02-16 14:56:50 +00:00
|
|
|
|
// As this was parsed successfully, continue as if the code has been fixed for the
|
2017-10-22 16:19:30 +00:00
|
|
|
|
// rest of the file. It will still fail due to the emitted error, but we avoid
|
|
|
|
|
// extra noise.
|
|
|
|
|
init
|
|
|
|
|
}
|
|
|
|
|
(Err(mut init_err), Some((snapshot, _, ty_err))) => { // init error, ty error
|
|
|
|
|
init_err.cancel();
|
|
|
|
|
// Couldn't parse the type nor the initializer, only raise the type error and
|
|
|
|
|
// return to the parser state before parsing the type as the initializer.
|
|
|
|
|
// let x: <parse_error>;
|
|
|
|
|
mem::replace(self, snapshot);
|
|
|
|
|
return Err(ty_err);
|
|
|
|
|
}
|
|
|
|
|
(Err(err), None) => { // init error, ty parsed
|
|
|
|
|
// Couldn't parse the initializer and we're not attempting to recover a failed
|
|
|
|
|
// parse of the type, return the error.
|
|
|
|
|
return Err(err);
|
|
|
|
|
}
|
2017-05-12 18:05:39 +00:00
|
|
|
|
};
|
2017-10-06 10:16:16 +00:00
|
|
|
|
let hi = if self.token == token::Semi {
|
|
|
|
|
self.span
|
|
|
|
|
} else {
|
|
|
|
|
self.prev_span
|
|
|
|
|
};
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(P(ast::Local {
|
2017-08-07 05:54:09 +00:00
|
|
|
|
ty,
|
|
|
|
|
pat,
|
|
|
|
|
init,
|
2013-09-07 02:11:55 +00:00
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2017-10-06 10:16:16 +00:00
|
|
|
|
span: lo.to(hi),
|
2017-08-07 05:54:09 +00:00
|
|
|
|
attrs,
|
2015-03-28 21:58:51 +00:00
|
|
|
|
}))
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse a structure field
|
2016-08-08 12:35:15 +00:00
|
|
|
|
fn parse_name_and_ty(&mut self,
|
2017-03-15 00:22:48 +00:00
|
|
|
|
lo: Span,
|
2016-08-08 12:35:15 +00:00
|
|
|
|
vis: Visibility,
|
|
|
|
|
attrs: Vec<Attribute>)
|
|
|
|
|
-> PResult<'a, StructField> {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let name = self.parse_ident()?;
|
|
|
|
|
self.expect(&token::Colon)?;
|
2017-01-16 23:13:41 +00:00
|
|
|
|
let ty = self.parse_ty()?;
|
2016-04-06 08:19:10 +00:00
|
|
|
|
Ok(StructField {
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span: lo.to(self.prev_span),
|
2016-04-02 13:47:53 +00:00
|
|
|
|
ident: Some(name),
|
2017-08-07 05:54:09 +00:00
|
|
|
|
vis,
|
2013-09-07 02:11:55 +00:00
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2017-08-07 05:54:09 +00:00
|
|
|
|
ty,
|
|
|
|
|
attrs,
|
2016-04-06 08:19:10 +00:00
|
|
|
|
})
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-03-13 09:34:51 +00:00
|
|
|
|
/// Emit an expected item after attributes error.
|
|
|
|
|
fn expected_item_err(&self, attrs: &[Attribute]) {
|
|
|
|
|
let message = match attrs.last() {
|
2016-11-14 12:00:25 +00:00
|
|
|
|
Some(&Attribute { is_sugared_doc: true, .. }) => "expected item after doc comment",
|
2014-09-12 01:07:07 +00:00
|
|
|
|
_ => "expected item after attributes",
|
2015-03-13 09:34:51 +00:00
|
|
|
|
};
|
|
|
|
|
|
2016-09-21 02:09:22 +00:00
|
|
|
|
self.span_err(self.prev_span, message);
|
2014-09-12 01:07:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-07-02 09:01:21 +00:00
|
|
|
|
/// Parse a statement. This stops just before trailing semicolons on everything but items.
|
|
|
|
|
/// e.g. a `StmtKind::Semi` parses to a `StmtKind::Expr`, leaving the trailing `;` unconsumed.
|
2016-02-11 20:33:09 +00:00
|
|
|
|
pub fn parse_stmt(&mut self) -> PResult<'a, Option<Stmt>> {
|
2016-07-16 20:41:43 +00:00
|
|
|
|
Ok(self.parse_stmt_(true))
|
2016-02-10 03:11:27 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Eat tokens until we can be relatively sure we reached the end of the
|
|
|
|
|
// statement. This is something of a best-effort heuristic.
|
|
|
|
|
//
|
|
|
|
|
// We terminate when we find an unmatched `}` (without consuming it).
|
|
|
|
|
fn recover_stmt(&mut self) {
|
2017-04-13 19:37:05 +00:00
|
|
|
|
self.recover_stmt_(SemiColonMode::Ignore, BlockMode::Ignore)
|
2016-02-10 03:11:27 +00:00
|
|
|
|
}
|
2017-04-13 19:37:05 +00:00
|
|
|
|
|
2016-02-10 03:11:27 +00:00
|
|
|
|
// If `break_on_semi` is `Break`, then we will stop consuming tokens after
|
|
|
|
|
// finding (and consuming) a `;` outside of `{}` or `[]` (note that this is
|
|
|
|
|
// approximate - it can mean we break too early due to macros, but that
|
|
|
|
|
// shoud only lead to sub-optimal recovery, not inaccurate parsing).
|
2017-04-13 19:37:05 +00:00
|
|
|
|
//
|
|
|
|
|
// If `break_on_block` is `Break`, then we will stop consuming tokens
|
|
|
|
|
// after finding (and consuming) a brace-delimited block.
|
|
|
|
|
fn recover_stmt_(&mut self, break_on_semi: SemiColonMode, break_on_block: BlockMode) {
|
2016-02-10 03:11:27 +00:00
|
|
|
|
let mut brace_depth = 0;
|
|
|
|
|
let mut bracket_depth = 0;
|
2017-04-13 19:37:05 +00:00
|
|
|
|
let mut in_block = false;
|
|
|
|
|
debug!("recover_stmt_ enter loop (semi={:?}, block={:?})",
|
|
|
|
|
break_on_semi, break_on_block);
|
2016-02-10 03:11:27 +00:00
|
|
|
|
loop {
|
2016-03-18 02:49:12 +00:00
|
|
|
|
debug!("recover_stmt_ loop {:?}", self.token);
|
2016-02-10 03:11:27 +00:00
|
|
|
|
match self.token {
|
|
|
|
|
token::OpenDelim(token::DelimToken::Brace) => {
|
|
|
|
|
brace_depth += 1;
|
|
|
|
|
self.bump();
|
2017-04-13 19:37:05 +00:00
|
|
|
|
if break_on_block == BlockMode::Break &&
|
|
|
|
|
brace_depth == 1 &&
|
|
|
|
|
bracket_depth == 0 {
|
|
|
|
|
in_block = true;
|
|
|
|
|
}
|
2016-02-10 03:11:27 +00:00
|
|
|
|
}
|
|
|
|
|
token::OpenDelim(token::DelimToken::Bracket) => {
|
|
|
|
|
bracket_depth += 1;
|
|
|
|
|
self.bump();
|
|
|
|
|
}
|
|
|
|
|
token::CloseDelim(token::DelimToken::Brace) => {
|
|
|
|
|
if brace_depth == 0 {
|
2016-03-18 02:49:12 +00:00
|
|
|
|
debug!("recover_stmt_ return - close delim {:?}", self.token);
|
2016-02-10 03:11:27 +00:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
brace_depth -= 1;
|
|
|
|
|
self.bump();
|
2017-04-13 19:37:05 +00:00
|
|
|
|
if in_block && bracket_depth == 0 && brace_depth == 0 {
|
|
|
|
|
debug!("recover_stmt_ return - block end {:?}", self.token);
|
|
|
|
|
return;
|
|
|
|
|
}
|
2016-02-10 03:11:27 +00:00
|
|
|
|
}
|
|
|
|
|
token::CloseDelim(token::DelimToken::Bracket) => {
|
|
|
|
|
bracket_depth -= 1;
|
|
|
|
|
if bracket_depth < 0 {
|
|
|
|
|
bracket_depth = 0;
|
|
|
|
|
}
|
|
|
|
|
self.bump();
|
|
|
|
|
}
|
2016-03-18 02:49:12 +00:00
|
|
|
|
token::Eof => {
|
|
|
|
|
debug!("recover_stmt_ return - Eof");
|
|
|
|
|
return;
|
|
|
|
|
}
|
2016-02-10 03:11:27 +00:00
|
|
|
|
token::Semi => {
|
|
|
|
|
self.bump();
|
|
|
|
|
if break_on_semi == SemiColonMode::Break &&
|
|
|
|
|
brace_depth == 0 &&
|
|
|
|
|
bracket_depth == 0 {
|
2016-03-18 02:49:12 +00:00
|
|
|
|
debug!("recover_stmt_ return - Semi");
|
2016-02-10 03:11:27 +00:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
_ => {
|
|
|
|
|
self.bump()
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2015-03-13 09:34:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-09-06 05:57:58 +00:00
|
|
|
|
fn parse_stmt_(&mut self, macro_legacy_warnings: bool) -> Option<Stmt> {
|
|
|
|
|
self.parse_stmt_without_recovery(macro_legacy_warnings).unwrap_or_else(|mut e| {
|
2016-02-10 03:11:27 +00:00
|
|
|
|
e.emit();
|
2017-04-13 19:37:05 +00:00
|
|
|
|
self.recover_stmt_(SemiColonMode::Break, BlockMode::Ignore);
|
2016-02-10 03:11:27 +00:00
|
|
|
|
None
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
2017-02-17 23:12:47 +00:00
|
|
|
|
fn is_catch_expr(&mut self) -> bool {
|
2017-03-03 22:41:07 +00:00
|
|
|
|
self.token.is_keyword(keywords::Do) &&
|
|
|
|
|
self.look_ahead(1, |t| t.is_keyword(keywords::Catch)) &&
|
|
|
|
|
self.look_ahead(2, |t| *t == token::OpenDelim(token::Brace)) &&
|
2017-02-17 23:12:47 +00:00
|
|
|
|
|
|
|
|
|
// prevent `while catch {} {}`, `if catch {} {} else {}`, etc.
|
2017-09-08 19:08:01 +00:00
|
|
|
|
!self.restrictions.contains(Restrictions::NO_STRUCT_LITERAL)
|
2017-02-17 23:12:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-03-05 05:15:58 +00:00
|
|
|
|
fn is_union_item(&self) -> bool {
|
2016-10-19 20:33:41 +00:00
|
|
|
|
self.token.is_keyword(keywords::Union) &&
|
2017-06-29 10:16:35 +00:00
|
|
|
|
self.look_ahead(1, |t| t.is_ident() && !t.is_reserved_ident())
|
2016-10-19 20:33:41 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-11-04 20:56:45 +00:00
|
|
|
|
fn is_crate_vis(&self) -> bool {
|
|
|
|
|
self.token.is_keyword(keywords::Crate) && self.look_ahead(1, |t| t != &token::ModSep)
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-01 14:42:32 +00:00
|
|
|
|
fn is_extern_non_path(&self) -> bool {
|
|
|
|
|
self.token.is_keyword(keywords::Extern) && self.look_ahead(1, |t| t != &token::ModSep)
|
|
|
|
|
}
|
|
|
|
|
|
2017-12-04 18:26:20 +00:00
|
|
|
|
fn is_auto_trait_item(&mut self) -> bool {
|
|
|
|
|
// auto trait
|
|
|
|
|
(self.token.is_keyword(keywords::Auto)
|
|
|
|
|
&& self.look_ahead(1, |t| t.is_keyword(keywords::Trait)))
|
|
|
|
|
|| // unsafe auto trait
|
|
|
|
|
(self.token.is_keyword(keywords::Unsafe) &&
|
|
|
|
|
self.look_ahead(1, |t| t.is_keyword(keywords::Auto)) &&
|
|
|
|
|
self.look_ahead(2, |t| t.is_keyword(keywords::Trait)))
|
2017-10-15 18:03:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-09-06 21:11:16 +00:00
|
|
|
|
fn eat_macro_def(&mut self, attrs: &[Attribute], vis: &Visibility, lo: Span)
|
2017-03-05 05:15:58 +00:00
|
|
|
|
-> PResult<'a, Option<P<Item>>> {
|
2017-09-06 21:11:16 +00:00
|
|
|
|
let token_lo = self.span;
|
2017-03-18 01:55:51 +00:00
|
|
|
|
let (ident, def) = match self.token {
|
2018-03-10 05:56:40 +00:00
|
|
|
|
token::Ident(ident, false) if ident.name == keywords::Macro.name() => {
|
2017-03-18 01:55:51 +00:00
|
|
|
|
self.bump();
|
|
|
|
|
let ident = self.parse_ident()?;
|
|
|
|
|
let tokens = if self.check(&token::OpenDelim(token::Brace)) {
|
|
|
|
|
match self.parse_token_tree() {
|
|
|
|
|
TokenTree::Delimited(_, ref delimited) => delimited.stream(),
|
|
|
|
|
_ => unreachable!(),
|
|
|
|
|
}
|
|
|
|
|
} else if self.check(&token::OpenDelim(token::Paren)) {
|
|
|
|
|
let args = self.parse_token_tree();
|
|
|
|
|
let body = if self.check(&token::OpenDelim(token::Brace)) {
|
|
|
|
|
self.parse_token_tree()
|
|
|
|
|
} else {
|
|
|
|
|
self.unexpected()?;
|
|
|
|
|
unreachable!()
|
|
|
|
|
};
|
|
|
|
|
TokenStream::concat(vec![
|
|
|
|
|
args.into(),
|
2017-09-06 21:11:16 +00:00
|
|
|
|
TokenTree::Token(token_lo.to(self.prev_span), token::FatArrow).into(),
|
2017-03-18 01:55:51 +00:00
|
|
|
|
body.into(),
|
|
|
|
|
])
|
|
|
|
|
} else {
|
|
|
|
|
self.unexpected()?;
|
|
|
|
|
unreachable!()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
(ident, ast::MacroDef { tokens: tokens.into(), legacy: false })
|
|
|
|
|
}
|
2018-03-10 05:56:40 +00:00
|
|
|
|
token::Ident(ident, _) if ident.name == "macro_rules" &&
|
2017-03-18 01:55:51 +00:00
|
|
|
|
self.look_ahead(1, |t| *t == token::Not) => {
|
|
|
|
|
let prev_span = self.prev_span;
|
2018-01-29 05:12:09 +00:00
|
|
|
|
self.complain_if_pub_macro(&vis.node, prev_span);
|
2017-03-18 01:55:51 +00:00
|
|
|
|
self.bump();
|
|
|
|
|
self.bump();
|
|
|
|
|
|
|
|
|
|
let ident = self.parse_ident()?;
|
|
|
|
|
let (delim, tokens) = self.expect_delimited_token_tree()?;
|
2018-05-22 15:01:21 +00:00
|
|
|
|
if delim != MacDelimiter::Brace {
|
2017-03-18 01:55:51 +00:00
|
|
|
|
if !self.eat(&token::Semi) {
|
|
|
|
|
let msg = "macros that expand to items must either \
|
|
|
|
|
be surrounded with braces or followed by a semicolon";
|
|
|
|
|
self.span_err(self.prev_span, msg);
|
|
|
|
|
}
|
2017-03-05 05:15:58 +00:00
|
|
|
|
}
|
2017-03-18 01:55:51 +00:00
|
|
|
|
|
|
|
|
|
(ident, ast::MacroDef { tokens: tokens, legacy: true })
|
2017-03-05 05:15:58 +00:00
|
|
|
|
}
|
|
|
|
|
_ => return Ok(None),
|
|
|
|
|
};
|
|
|
|
|
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let span = lo.to(self.prev_span);
|
2017-03-18 01:55:51 +00:00
|
|
|
|
Ok(Some(self.mk_item(span, ident, ItemKind::MacroDef(def), vis.clone(), attrs.to_vec())))
|
2017-03-05 05:15:58 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-09-06 05:57:58 +00:00
|
|
|
|
fn parse_stmt_without_recovery(&mut self,
|
|
|
|
|
macro_legacy_warnings: bool)
|
|
|
|
|
-> PResult<'a, Option<Stmt>> {
|
2016-11-02 03:03:55 +00:00
|
|
|
|
maybe_whole!(self, NtStmt, |x| Some(x));
|
2012-08-01 21:34:35 +00:00
|
|
|
|
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let attrs = self.parse_outer_attributes()?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
2015-03-13 09:34:51 +00:00
|
|
|
|
|
2016-06-17 02:30:01 +00:00
|
|
|
|
Ok(Some(if self.eat_keyword(keywords::Let) {
|
|
|
|
|
Stmt {
|
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2016-06-26 02:18:04 +00:00
|
|
|
|
node: StmtKind::Local(self.parse_local(attrs.into())?),
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span: lo.to(self.prev_span),
|
2016-06-17 02:30:01 +00:00
|
|
|
|
}
|
2018-01-29 05:12:09 +00:00
|
|
|
|
} else if let Some(macro_def) = self.eat_macro_def(
|
|
|
|
|
&attrs,
|
|
|
|
|
&codemap::respan(lo, VisibilityKind::Inherited),
|
|
|
|
|
lo,
|
|
|
|
|
)? {
|
2017-03-05 05:15:58 +00:00
|
|
|
|
Stmt {
|
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
|
|
|
|
node: StmtKind::Item(macro_def),
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span: lo.to(self.prev_span),
|
2017-03-05 05:15:58 +00:00
|
|
|
|
}
|
2017-12-04 18:26:20 +00:00
|
|
|
|
// Starts like a simple path, being careful to avoid contextual keywords
|
|
|
|
|
// such as a union items, item with `crate` visibility or auto trait items.
|
2017-11-04 20:56:45 +00:00
|
|
|
|
// Our goal here is to parse an arbitrary path `a::b::c` but not something that starts
|
|
|
|
|
// like a path (1 token), but it fact not a path.
|
|
|
|
|
// `union::b::c` - path, `union U { ... }` - not a path.
|
|
|
|
|
// `crate::b::c` - path, `crate struct S;` - not a path.
|
2018-01-01 14:42:32 +00:00
|
|
|
|
// `extern::b::c` - path, `extern crate c;` - not a path.
|
2016-10-19 20:33:41 +00:00
|
|
|
|
} else if self.token.is_path_start() &&
|
|
|
|
|
!self.token.is_qpath_start() &&
|
2017-11-04 20:56:45 +00:00
|
|
|
|
!self.is_union_item() &&
|
2018-01-01 14:42:32 +00:00
|
|
|
|
!self.is_crate_vis() &&
|
2017-12-04 18:26:20 +00:00
|
|
|
|
!self.is_extern_non_path() &&
|
|
|
|
|
!self.is_auto_trait_item() {
|
2016-09-22 05:10:16 +00:00
|
|
|
|
let pth = self.parse_path(PathStyle::Expr)?;
|
2013-05-08 22:27:29 +00:00
|
|
|
|
|
2016-09-22 05:10:16 +00:00
|
|
|
|
if !self.eat(&token::Not) {
|
|
|
|
|
let expr = if self.check(&token::OpenDelim(token::Brace)) {
|
|
|
|
|
self.parse_struct_expr(lo, pth, ThinVec::new())?
|
|
|
|
|
} else {
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let hi = self.prev_span;
|
|
|
|
|
self.mk_expr(lo.to(hi), ExprKind::Path(None, pth), ThinVec::new())
|
2016-09-22 05:10:16 +00:00
|
|
|
|
};
|
|
|
|
|
|
2017-09-08 19:08:01 +00:00
|
|
|
|
let expr = self.with_res(Restrictions::STMT_EXPR, |this| {
|
2016-09-22 05:10:16 +00:00
|
|
|
|
let expr = this.parse_dot_or_call_expr_with(expr, lo, attrs.into())?;
|
|
|
|
|
this.parse_assoc_expr_with(0, LhsExpr::AlreadyParsed(expr))
|
|
|
|
|
})?;
|
2012-11-14 04:45:25 +00:00
|
|
|
|
|
2016-09-22 05:10:16 +00:00
|
|
|
|
return Ok(Some(Stmt {
|
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
|
|
|
|
node: StmtKind::Expr(expr),
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span: lo.to(self.prev_span),
|
2016-09-22 05:10:16 +00:00
|
|
|
|
}));
|
|
|
|
|
}
|
2012-11-14 04:45:25 +00:00
|
|
|
|
|
2016-09-22 05:10:16 +00:00
|
|
|
|
// it's a macro invocation
|
2014-10-29 14:47:53 +00:00
|
|
|
|
let id = match self.token {
|
2016-04-18 21:42:18 +00:00
|
|
|
|
token::OpenDelim(_) => keywords::Invalid.ident(), // no special identifier
|
2016-03-23 03:01:37 +00:00
|
|
|
|
_ => self.parse_ident()?,
|
2012-11-14 04:45:25 +00:00
|
|
|
|
};
|
|
|
|
|
|
2014-02-23 13:53:59 +00:00
|
|
|
|
// check that we're pointing at delimiters (need to check
|
|
|
|
|
// again after the `if`, because of `parse_ident`
|
|
|
|
|
// consuming more tokens).
|
2018-05-22 15:01:21 +00:00
|
|
|
|
match self.token {
|
|
|
|
|
token::OpenDelim(_) => {}
|
2014-10-29 14:47:53 +00:00
|
|
|
|
_ => {
|
2014-05-28 16:24:28 +00:00
|
|
|
|
// we only expect an ident if we didn't parse one
|
|
|
|
|
// above.
|
2016-04-18 21:42:18 +00:00
|
|
|
|
let ident_str = if id.name == keywords::Invalid.name() {
|
2014-05-28 16:24:28 +00:00
|
|
|
|
"identifier, "
|
|
|
|
|
} else {
|
|
|
|
|
""
|
|
|
|
|
};
|
2014-06-21 10:39:03 +00:00
|
|
|
|
let tok_str = self.this_token_to_string();
|
2018-02-19 07:08:23 +00:00
|
|
|
|
let mut err = self.fatal(&format!("expected {}`(` or `{{`, found `{}`",
|
|
|
|
|
ident_str,
|
|
|
|
|
tok_str));
|
|
|
|
|
err.span_label(self.span, format!("expected {}`(` or `{{`", ident_str));
|
|
|
|
|
return Err(err)
|
2014-10-29 14:47:53 +00:00
|
|
|
|
},
|
2018-05-22 15:01:21 +00:00
|
|
|
|
}
|
2014-02-23 13:53:59 +00:00
|
|
|
|
|
2018-05-22 15:01:21 +00:00
|
|
|
|
let (delim, tts) = self.expect_delimited_token_tree()?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let hi = self.prev_span;
|
2012-11-14 04:45:25 +00:00
|
|
|
|
|
2018-05-22 15:01:21 +00:00
|
|
|
|
let style = if delim == MacDelimiter::Brace {
|
2016-02-09 10:56:59 +00:00
|
|
|
|
MacStmtStyle::Braces
|
2014-11-14 17:18:10 +00:00
|
|
|
|
} else {
|
2016-02-09 10:56:59 +00:00
|
|
|
|
MacStmtStyle::NoBraces
|
2014-11-14 17:18:10 +00:00
|
|
|
|
};
|
|
|
|
|
|
2016-04-18 21:42:18 +00:00
|
|
|
|
if id.name == keywords::Invalid.name() {
|
2018-05-22 15:01:21 +00:00
|
|
|
|
let mac = respan(lo.to(hi), Mac_ { path: pth, tts, delim });
|
|
|
|
|
let node = if delim == MacDelimiter::Brace ||
|
2016-07-16 20:41:43 +00:00
|
|
|
|
self.token == token::Semi || self.token == token::Eof {
|
|
|
|
|
StmtKind::Mac(P((mac, style, attrs.into())))
|
|
|
|
|
}
|
|
|
|
|
// We used to incorrectly stop parsing macro-expanded statements here.
|
|
|
|
|
// If the next token will be an error anyway but could have parsed with the
|
|
|
|
|
// earlier behavior, stop parsing here and emit a warning to avoid breakage.
|
2016-09-06 05:57:58 +00:00
|
|
|
|
else if macro_legacy_warnings && self.token.can_begin_expr() && match self.token {
|
2016-07-16 20:41:43 +00:00
|
|
|
|
// These can continue an expression, so we can't stop parsing and warn.
|
|
|
|
|
token::OpenDelim(token::Paren) | token::OpenDelim(token::Bracket) |
|
|
|
|
|
token::BinOp(token::Minus) | token::BinOp(token::Star) |
|
|
|
|
|
token::BinOp(token::And) | token::BinOp(token::Or) |
|
|
|
|
|
token::AndAnd | token::OrOr |
|
2017-09-19 05:40:04 +00:00
|
|
|
|
token::DotDot | token::DotDotDot | token::DotDotEq => false,
|
2016-07-16 20:41:43 +00:00
|
|
|
|
_ => true,
|
|
|
|
|
} {
|
|
|
|
|
self.warn_missing_semicolon();
|
|
|
|
|
StmtKind::Mac(P((mac, style, attrs.into())))
|
|
|
|
|
} else {
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let e = self.mk_mac_expr(lo.to(hi), mac.node, ThinVec::new());
|
2016-07-16 20:41:43 +00:00
|
|
|
|
let e = self.parse_dot_or_call_expr_with(e, lo, attrs.into())?;
|
|
|
|
|
let e = self.parse_assoc_expr_with(0, LhsExpr::AlreadyParsed(e))?;
|
|
|
|
|
StmtKind::Expr(e)
|
|
|
|
|
};
|
2016-06-17 02:30:01 +00:00
|
|
|
|
Stmt {
|
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span: lo.to(hi),
|
2017-08-07 05:54:09 +00:00
|
|
|
|
node,
|
2016-06-17 02:30:01 +00:00
|
|
|
|
}
|
2012-11-14 04:45:25 +00:00
|
|
|
|
} else {
|
|
|
|
|
// if it has a special ident, it's definitely an item
|
2014-11-14 17:18:10 +00:00
|
|
|
|
//
|
|
|
|
|
// Require a semicolon or braces.
|
2016-02-09 10:56:59 +00:00
|
|
|
|
if style != MacStmtStyle::Braces {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if !self.eat(&token::Semi) {
|
2016-09-21 02:09:22 +00:00
|
|
|
|
self.span_err(self.prev_span,
|
2014-11-14 17:18:10 +00:00
|
|
|
|
"macros that expand to items must \
|
|
|
|
|
either be surrounded with braces or \
|
|
|
|
|
followed by a semicolon");
|
|
|
|
|
}
|
|
|
|
|
}
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let span = lo.to(hi);
|
2016-06-17 02:30:01 +00:00
|
|
|
|
Stmt {
|
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2017-08-07 05:54:09 +00:00
|
|
|
|
span,
|
2016-06-17 02:30:01 +00:00
|
|
|
|
node: StmtKind::Item({
|
2012-11-14 04:45:25 +00:00
|
|
|
|
self.mk_item(
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span, id /*id is good here*/,
|
2018-05-22 15:01:21 +00:00
|
|
|
|
ItemKind::Mac(respan(span, Mac_ { path: pth, tts, delim })),
|
2018-01-29 05:12:09 +00:00
|
|
|
|
respan(lo, VisibilityKind::Inherited),
|
2016-06-26 02:16:55 +00:00
|
|
|
|
attrs)
|
2016-06-17 02:30:01 +00:00
|
|
|
|
}),
|
|
|
|
|
}
|
2012-11-14 04:45:25 +00:00
|
|
|
|
}
|
2012-05-23 22:06:11 +00:00
|
|
|
|
} else {
|
2015-11-03 16:39:51 +00:00
|
|
|
|
// FIXME: Bad copy of attrs
|
2016-11-05 04:16:26 +00:00
|
|
|
|
let old_directory_ownership =
|
|
|
|
|
mem::replace(&mut self.directory.ownership, DirectoryOwnership::UnownedViaBlock);
|
|
|
|
|
let item = self.parse_item_(attrs.clone(), false, true)?;
|
|
|
|
|
self.directory.ownership = old_directory_ownership;
|
2017-05-17 22:37:24 +00:00
|
|
|
|
|
2016-11-05 04:16:26 +00:00
|
|
|
|
match item {
|
2016-06-17 02:30:01 +00:00
|
|
|
|
Some(i) => Stmt {
|
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span: lo.to(i.span),
|
2016-06-17 02:30:01 +00:00
|
|
|
|
node: StmtKind::Item(i),
|
|
|
|
|
},
|
2015-03-13 09:34:51 +00:00
|
|
|
|
None => {
|
2017-10-16 02:02:45 +00:00
|
|
|
|
let unused_attrs = |attrs: &[Attribute], s: &mut Self| {
|
2017-05-12 18:05:39 +00:00
|
|
|
|
if !attrs.is_empty() {
|
2016-09-21 02:16:28 +00:00
|
|
|
|
if s.prev_token_kind == PrevTokenKind::DocComment {
|
2017-02-12 14:18:41 +00:00
|
|
|
|
s.span_fatal_err(s.prev_span, Error::UselessDocComment).emit();
|
2017-10-16 02:02:45 +00:00
|
|
|
|
} else if attrs.iter().any(|a| a.style == AttrStyle::Outer) {
|
2016-09-16 05:46:40 +00:00
|
|
|
|
s.span_err(s.span, "expected statement after outer attribute");
|
2016-05-28 02:05:22 +00:00
|
|
|
|
}
|
2015-11-03 16:39:51 +00:00
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
2015-03-13 09:34:51 +00:00
|
|
|
|
// Do not attempt to parse an expression if we're done here.
|
|
|
|
|
if self.token == token::Semi {
|
2015-11-03 16:39:51 +00:00
|
|
|
|
unused_attrs(&attrs, self);
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2015-03-28 21:58:51 +00:00
|
|
|
|
return Ok(None);
|
2015-03-13 09:34:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if self.token == token::CloseDelim(token::Brace) {
|
2015-11-03 16:39:51 +00:00
|
|
|
|
unused_attrs(&attrs, self);
|
2015-03-28 21:58:51 +00:00
|
|
|
|
return Ok(None);
|
2014-09-12 01:07:07 +00:00
|
|
|
|
}
|
2011-06-15 20:27:39 +00:00
|
|
|
|
|
2014-09-13 16:06:01 +00:00
|
|
|
|
// Remainder are line-expr stmts.
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let e = self.parse_expr_res(
|
2017-09-08 19:08:01 +00:00
|
|
|
|
Restrictions::STMT_EXPR, Some(attrs.into()))?;
|
2016-06-17 02:30:01 +00:00
|
|
|
|
Stmt {
|
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span: lo.to(e.span),
|
2016-06-17 02:30:01 +00:00
|
|
|
|
node: StmtKind::Expr(e),
|
|
|
|
|
}
|
2014-09-13 16:06:01 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2015-03-28 21:58:51 +00:00
|
|
|
|
}))
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2011-12-21 04:12:52 +00:00
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Is this expression a successfully-parsed statement?
|
2014-09-13 16:06:01 +00:00
|
|
|
|
fn expr_is_complete(&mut self, e: &Expr) -> bool {
|
2017-09-08 19:08:01 +00:00
|
|
|
|
self.restrictions.contains(Restrictions::STMT_EXPR) &&
|
2014-09-13 16:06:01 +00:00
|
|
|
|
!classify::expr_requires_semi_to_be_stmt(e)
|
2010-09-21 23:22:32 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse a block. No inner attrs are allowed.
|
2015-12-20 21:00:43 +00:00
|
|
|
|
pub fn parse_block(&mut self) -> PResult<'a, P<Block>> {
|
2016-11-02 03:03:55 +00:00
|
|
|
|
maybe_whole!(self, NtBlock, |x| x);
|
2013-04-06 00:31:52 +00:00
|
|
|
|
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
2014-11-10 10:58:03 +00:00
|
|
|
|
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if !self.eat(&token::OpenDelim(token::Brace)) {
|
2014-11-10 10:58:03 +00:00
|
|
|
|
let sp = self.span;
|
|
|
|
|
let tok = self.this_token_to_string();
|
2016-08-23 06:23:31 +00:00
|
|
|
|
let mut e = self.span_fatal(sp, &format!("expected `{{`, found `{}`", tok));
|
|
|
|
|
|
|
|
|
|
// Check to see if the user has written something like
|
|
|
|
|
//
|
|
|
|
|
// if (cond)
|
|
|
|
|
// bar;
|
|
|
|
|
//
|
|
|
|
|
// Which is valid in other languages, but not Rust.
|
|
|
|
|
match self.parse_stmt_without_recovery(false) {
|
|
|
|
|
Ok(Some(stmt)) => {
|
2018-03-22 04:54:06 +00:00
|
|
|
|
if self.look_ahead(1, |t| t == &token::OpenDelim(token::Brace)) {
|
|
|
|
|
// if the next token is an open brace (e.g., `if a b {`), the place-
|
|
|
|
|
// inside-a-block suggestion would be more likely wrong than right
|
|
|
|
|
return Err(e);
|
|
|
|
|
}
|
2016-08-23 06:23:31 +00:00
|
|
|
|
let mut stmt_span = stmt.span;
|
|
|
|
|
// expand the span to include the semicolon, if it exists
|
|
|
|
|
if self.eat(&token::Semi) {
|
2017-07-31 20:04:34 +00:00
|
|
|
|
stmt_span = stmt_span.with_hi(self.prev_span.hi());
|
2016-08-23 06:23:31 +00:00
|
|
|
|
}
|
2017-01-31 13:45:08 +00:00
|
|
|
|
let sugg = pprust::to_string(|s| {
|
|
|
|
|
use print::pprust::{PrintState, INDENT_UNIT};
|
|
|
|
|
s.ibox(INDENT_UNIT)?;
|
|
|
|
|
s.bopen()?;
|
|
|
|
|
s.print_stmt(&stmt)?;
|
|
|
|
|
s.bclose_maybe_open(stmt.span, INDENT_UNIT, false)
|
|
|
|
|
});
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
e.span_suggestion_with_applicability(
|
|
|
|
|
stmt_span,
|
|
|
|
|
"try placing this code inside a block",
|
|
|
|
|
sugg,
|
|
|
|
|
// speculative, has been misleading in the past (closed Issue #46836)
|
|
|
|
|
Applicability::MaybeIncorrect
|
|
|
|
|
);
|
2016-08-23 06:23:31 +00:00
|
|
|
|
}
|
|
|
|
|
Err(mut e) => {
|
2017-04-13 19:37:05 +00:00
|
|
|
|
self.recover_stmt_(SemiColonMode::Break, BlockMode::Ignore);
|
2016-09-15 19:34:21 +00:00
|
|
|
|
self.cancel(&mut e);
|
2016-08-23 06:23:31 +00:00
|
|
|
|
}
|
|
|
|
|
_ => ()
|
|
|
|
|
}
|
|
|
|
|
return Err(e);
|
2014-11-10 10:58:03 +00:00
|
|
|
|
}
|
2013-04-06 00:31:52 +00:00
|
|
|
|
|
2016-02-08 11:44:45 +00:00
|
|
|
|
self.parse_block_tail(lo, BlockCheckMode::Default)
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2010-11-30 01:11:03 +00:00
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse a block. Inner attrs are allowed.
|
2015-12-20 21:00:43 +00:00
|
|
|
|
fn parse_inner_attrs_and_block(&mut self) -> PResult<'a, (Vec<Attribute>, P<Block>)> {
|
2016-11-02 03:03:55 +00:00
|
|
|
|
maybe_whole!(self, NtBlock, |x| (Vec::new(), x));
|
2012-08-01 21:34:35 +00:00
|
|
|
|
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::OpenDelim(token::Brace))?;
|
|
|
|
|
Ok((self.parse_inner_attributes()?,
|
|
|
|
|
self.parse_block_tail(lo, BlockCheckMode::Default)?))
|
2012-01-16 01:23:59 +00:00
|
|
|
|
}
|
2013-04-02 23:44:01 +00:00
|
|
|
|
|
2015-03-13 09:34:51 +00:00
|
|
|
|
/// Parse the rest of a block expression or function body
|
2014-12-23 13:07:30 +00:00
|
|
|
|
/// Precondition: already parsed the '{'.
|
2017-03-15 00:22:48 +00:00
|
|
|
|
fn parse_block_tail(&mut self, lo: Span, s: BlockCheckMode) -> PResult<'a, P<Block>> {
|
2014-12-23 13:07:30 +00:00
|
|
|
|
let mut stmts = vec![];
|
2017-12-14 07:05:49 +00:00
|
|
|
|
let mut recovered = false;
|
2012-01-16 01:23:59 +00:00
|
|
|
|
|
2015-12-30 23:11:53 +00:00
|
|
|
|
while !self.eat(&token::CloseDelim(token::Brace)) {
|
2017-11-21 14:49:15 +00:00
|
|
|
|
let stmt = match self.parse_full_stmt(false) {
|
2017-11-21 16:03:02 +00:00
|
|
|
|
Err(mut err) => {
|
|
|
|
|
err.emit();
|
2017-12-14 07:05:49 +00:00
|
|
|
|
self.recover_stmt_(SemiColonMode::Ignore, BlockMode::Ignore);
|
2017-11-23 21:16:19 +00:00
|
|
|
|
self.eat(&token::CloseDelim(token::Brace));
|
2017-12-14 07:05:49 +00:00
|
|
|
|
recovered = true;
|
2017-11-21 14:49:15 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
Ok(stmt) => stmt,
|
|
|
|
|
};
|
|
|
|
|
if let Some(stmt) = stmt {
|
2016-07-07 04:12:20 +00:00
|
|
|
|
stmts.push(stmt);
|
2016-03-18 02:49:12 +00:00
|
|
|
|
} else if self.token == token::Eof {
|
|
|
|
|
break;
|
2015-03-13 09:34:51 +00:00
|
|
|
|
} else {
|
|
|
|
|
// Found only `;` or `}`.
|
|
|
|
|
continue;
|
|
|
|
|
};
|
2013-04-30 19:02:56 +00:00
|
|
|
|
}
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(P(ast::Block {
|
2017-08-07 05:54:09 +00:00
|
|
|
|
stmts,
|
2013-09-07 02:11:55 +00:00
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2013-01-15 03:35:08 +00:00
|
|
|
|
rules: s,
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span: lo.to(self.prev_span),
|
2017-12-14 07:05:49 +00:00
|
|
|
|
recovered,
|
2015-03-28 21:58:51 +00:00
|
|
|
|
}))
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-07-07 04:12:20 +00:00
|
|
|
|
/// Parse a statement, including the trailing semicolon.
|
2016-09-06 05:57:58 +00:00
|
|
|
|
pub fn parse_full_stmt(&mut self, macro_legacy_warnings: bool) -> PResult<'a, Option<Stmt>> {
|
2018-03-16 06:20:56 +00:00
|
|
|
|
// skip looking for a trailing semicolon when we have an interpolated statement
|
|
|
|
|
maybe_whole!(self, NtStmt, |x| Some(x));
|
|
|
|
|
|
2017-12-14 07:05:49 +00:00
|
|
|
|
let mut stmt = match self.parse_stmt_without_recovery(macro_legacy_warnings)? {
|
2016-07-07 04:12:20 +00:00
|
|
|
|
Some(stmt) => stmt,
|
|
|
|
|
None => return Ok(None),
|
|
|
|
|
};
|
|
|
|
|
|
2016-07-02 09:01:21 +00:00
|
|
|
|
match stmt.node {
|
2016-07-02 09:32:23 +00:00
|
|
|
|
StmtKind::Expr(ref expr) if self.token != token::Eof => {
|
2016-07-02 09:01:21 +00:00
|
|
|
|
// expression without semicolon
|
|
|
|
|
if classify::expr_requires_semi_to_be_stmt(expr) {
|
|
|
|
|
// Just check for errors and recover; do not eat semicolon yet.
|
|
|
|
|
if let Err(mut e) =
|
|
|
|
|
self.expect_one_of(&[], &[token::Semi, token::CloseDelim(token::Brace)])
|
|
|
|
|
{
|
|
|
|
|
e.emit();
|
|
|
|
|
self.recover_stmt();
|
|
|
|
|
}
|
|
|
|
|
}
|
2016-02-10 03:11:27 +00:00
|
|
|
|
}
|
2016-07-02 09:01:21 +00:00
|
|
|
|
StmtKind::Local(..) => {
|
2016-07-12 03:56:19 +00:00
|
|
|
|
// We used to incorrectly allow a macro-expanded let statement to lack a semicolon.
|
2016-09-06 05:57:58 +00:00
|
|
|
|
if macro_legacy_warnings && self.token != token::Semi {
|
2016-07-12 03:56:19 +00:00
|
|
|
|
self.warn_missing_semicolon();
|
|
|
|
|
} else {
|
|
|
|
|
self.expect_one_of(&[token::Semi], &[])?;
|
|
|
|
|
}
|
2016-07-02 09:01:21 +00:00
|
|
|
|
}
|
|
|
|
|
_ => {}
|
2014-11-14 17:18:10 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-07-02 09:01:21 +00:00
|
|
|
|
if self.eat(&token::Semi) {
|
|
|
|
|
stmt = stmt.add_trailing_semicolon();
|
2014-11-14 17:18:10 +00:00
|
|
|
|
}
|
2016-07-02 09:01:21 +00:00
|
|
|
|
|
2017-07-31 20:04:34 +00:00
|
|
|
|
stmt.span = stmt.span.with_hi(self.prev_span.hi());
|
2016-07-16 20:41:43 +00:00
|
|
|
|
Ok(Some(stmt))
|
2014-11-14 17:18:10 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-07-12 03:56:19 +00:00
|
|
|
|
fn warn_missing_semicolon(&self) {
|
|
|
|
|
self.diagnostic().struct_span_warn(self.span, {
|
|
|
|
|
&format!("expected `;`, found `{}`", self.this_token_to_string())
|
|
|
|
|
}).note({
|
|
|
|
|
"This was erroneously allowed and will become a hard error in a future release"
|
|
|
|
|
}).emit();
|
|
|
|
|
}
|
|
|
|
|
|
2017-11-04 23:46:41 +00:00
|
|
|
|
fn err_dotdotdot_syntax(&self, span: Span) {
|
|
|
|
|
self.diagnostic().struct_span_err(span, {
|
|
|
|
|
"`...` syntax cannot be used in expressions"
|
|
|
|
|
}).help({
|
|
|
|
|
"Use `..` if you need an exclusive range (a < b)"
|
|
|
|
|
}).help({
|
|
|
|
|
"or `..=` if you need an inclusive range (a <= b)"
|
2017-09-19 05:40:04 +00:00
|
|
|
|
}).emit();
|
|
|
|
|
}
|
|
|
|
|
|
2017-04-17 14:48:23 +00:00
|
|
|
|
// Parse bounds of a type parameter `BOUND + BOUND + BOUND`, possibly with trailing `+`.
|
2017-01-17 18:18:29 +00:00
|
|
|
|
// BOUND = TY_BOUND | LT_BOUND
|
|
|
|
|
// LT_BOUND = LIFETIME (e.g. `'a`)
|
2017-04-04 22:12:53 +00:00
|
|
|
|
// TY_BOUND = TY_BOUND_NOPAREN | (TY_BOUND_NOPAREN)
|
|
|
|
|
// TY_BOUND_NOPAREN = [?] [for<LT_PARAM_DEFS>] SIMPLE_PATH (e.g. `?for<'a: 'b> m::Trait<'a>`)
|
2017-03-16 21:47:32 +00:00
|
|
|
|
fn parse_ty_param_bounds_common(&mut self, allow_plus: bool) -> PResult<'a, TyParamBounds> {
|
2017-01-17 18:18:29 +00:00
|
|
|
|
let mut bounds = Vec::new();
|
2013-02-15 05:50:03 +00:00
|
|
|
|
loop {
|
2017-10-10 14:33:19 +00:00
|
|
|
|
// This needs to be syncronized with `Token::can_begin_bound`.
|
2017-04-20 21:19:06 +00:00
|
|
|
|
let is_bound_start = self.check_path() || self.check_lifetime() ||
|
|
|
|
|
self.check(&token::Question) ||
|
|
|
|
|
self.check_keyword(keywords::For) ||
|
|
|
|
|
self.check(&token::OpenDelim(token::Paren));
|
|
|
|
|
if is_bound_start {
|
|
|
|
|
let has_parens = self.eat(&token::OpenDelim(token::Paren));
|
|
|
|
|
let question = if self.eat(&token::Question) { Some(self.prev_span) } else { None };
|
|
|
|
|
if self.token.is_lifetime() {
|
|
|
|
|
if let Some(question_span) = question {
|
|
|
|
|
self.span_err(question_span,
|
|
|
|
|
"`?` may only modify trait bounds, not lifetime bounds");
|
|
|
|
|
}
|
|
|
|
|
bounds.push(RegionTyParamBound(self.expect_lifetime()));
|
2017-01-17 18:18:29 +00:00
|
|
|
|
} else {
|
2017-04-20 21:19:06 +00:00
|
|
|
|
let lo = self.span;
|
|
|
|
|
let lifetime_defs = self.parse_late_bound_lifetime_defs()?;
|
|
|
|
|
let path = self.parse_path(PathStyle::Type)?;
|
|
|
|
|
let poly_trait = PolyTraitRef::new(lifetime_defs, path, lo.to(self.prev_span));
|
|
|
|
|
let modifier = if question.is_some() {
|
|
|
|
|
TraitBoundModifier::Maybe
|
|
|
|
|
} else {
|
|
|
|
|
TraitBoundModifier::None
|
|
|
|
|
};
|
|
|
|
|
bounds.push(TraitTyParamBound(poly_trait, modifier));
|
|
|
|
|
}
|
2017-04-04 22:12:53 +00:00
|
|
|
|
if has_parens {
|
|
|
|
|
self.expect(&token::CloseDelim(token::Paren))?;
|
2017-04-20 21:19:06 +00:00
|
|
|
|
if let Some(&RegionTyParamBound(..)) = bounds.last() {
|
|
|
|
|
self.span_err(self.prev_span,
|
|
|
|
|
"parenthesized lifetime bounds are not supported");
|
|
|
|
|
}
|
2017-04-04 22:12:53 +00:00
|
|
|
|
}
|
2017-01-17 18:18:29 +00:00
|
|
|
|
} else {
|
|
|
|
|
break
|
2017-03-16 21:47:32 +00:00
|
|
|
|
}
|
2013-01-22 22:37:32 +00:00
|
|
|
|
|
2018-05-25 20:40:16 +00:00
|
|
|
|
if !allow_plus || !self.eat_plus() {
|
2017-01-17 18:18:29 +00:00
|
|
|
|
break
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2013-02-15 05:50:03 +00:00
|
|
|
|
|
2017-01-17 18:18:29 +00:00
|
|
|
|
return Ok(bounds);
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-16 21:47:32 +00:00
|
|
|
|
fn parse_ty_param_bounds(&mut self) -> PResult<'a, TyParamBounds> {
|
|
|
|
|
self.parse_ty_param_bounds_common(true)
|
|
|
|
|
}
|
|
|
|
|
|
2017-04-13 13:53:22 +00:00
|
|
|
|
// Parse bounds of a lifetime parameter `BOUND + BOUND + BOUND`, possibly with trailing `+`.
|
2017-01-17 18:18:29 +00:00
|
|
|
|
// BOUND = LT_BOUND (e.g. `'a`)
|
|
|
|
|
fn parse_lt_param_bounds(&mut self) -> Vec<Lifetime> {
|
|
|
|
|
let mut lifetimes = Vec::new();
|
2017-03-16 21:47:32 +00:00
|
|
|
|
while self.check_lifetime() {
|
|
|
|
|
lifetimes.push(self.expect_lifetime());
|
2017-01-24 19:55:45 +00:00
|
|
|
|
|
2018-05-25 21:09:32 +00:00
|
|
|
|
if !self.eat_plus() {
|
2017-01-17 18:18:29 +00:00
|
|
|
|
break
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
lifetimes
|
2012-08-07 01:54:20 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-03-18 18:54:06 +00:00
|
|
|
|
/// Matches typaram = IDENT (`?` unbound)? optbounds ( EQ ty )?
|
2017-01-17 18:18:29 +00:00
|
|
|
|
fn parse_ty_param(&mut self, preceding_attrs: Vec<Attribute>) -> PResult<'a, TyParam> {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let ident = self.parse_ident()?;
|
2014-07-08 02:26:02 +00:00
|
|
|
|
|
2017-01-17 18:18:29 +00:00
|
|
|
|
// Parse optional colon and param bounds.
|
|
|
|
|
let bounds = if self.eat(&token::Colon) {
|
|
|
|
|
self.parse_ty_param_bounds()?
|
|
|
|
|
} else {
|
|
|
|
|
Vec::new()
|
|
|
|
|
};
|
2014-01-30 17:28:02 +00:00
|
|
|
|
|
2017-01-17 18:18:29 +00:00
|
|
|
|
let default = if self.eat(&token::Eq) {
|
2017-01-16 23:13:41 +00:00
|
|
|
|
Some(self.parse_ty()?)
|
2015-03-18 18:54:06 +00:00
|
|
|
|
} else {
|
|
|
|
|
None
|
|
|
|
|
};
|
2014-01-30 17:28:02 +00:00
|
|
|
|
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(TyParam {
|
2016-05-17 16:51:45 +00:00
|
|
|
|
attrs: preceding_attrs.into(),
|
2017-08-07 05:54:09 +00:00
|
|
|
|
ident,
|
2014-01-30 17:28:02 +00:00
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2017-08-07 05:54:09 +00:00
|
|
|
|
bounds,
|
|
|
|
|
default,
|
2015-03-28 21:58:51 +00:00
|
|
|
|
})
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2012-01-04 22:16:41 +00:00
|
|
|
|
|
2017-11-19 05:18:43 +00:00
|
|
|
|
/// Parses the following grammar:
|
|
|
|
|
/// TraitItemAssocTy = Ident ["<"...">"] [":" [TyParamBounds]] ["where" ...] ["=" Ty]
|
2017-11-05 21:14:22 +00:00
|
|
|
|
fn parse_trait_item_assoc_ty(&mut self, preceding_attrs: Vec<Attribute>)
|
2017-11-09 23:15:02 +00:00
|
|
|
|
-> PResult<'a, (ast::Generics, TyParam)> {
|
2017-11-05 21:14:22 +00:00
|
|
|
|
let ident = self.parse_ident()?;
|
|
|
|
|
let mut generics = self.parse_generics()?;
|
|
|
|
|
|
|
|
|
|
// Parse optional colon and param bounds.
|
|
|
|
|
let bounds = if self.eat(&token::Colon) {
|
|
|
|
|
self.parse_ty_param_bounds()?
|
|
|
|
|
} else {
|
|
|
|
|
Vec::new()
|
|
|
|
|
};
|
2017-11-19 05:18:43 +00:00
|
|
|
|
generics.where_clause = self.parse_where_clause()?;
|
2017-11-05 21:14:22 +00:00
|
|
|
|
|
|
|
|
|
let default = if self.eat(&token::Eq) {
|
|
|
|
|
Some(self.parse_ty()?)
|
|
|
|
|
} else {
|
|
|
|
|
None
|
|
|
|
|
};
|
2017-11-25 19:42:55 +00:00
|
|
|
|
self.expect(&token::Semi)?;
|
2017-11-05 21:14:22 +00:00
|
|
|
|
|
2017-11-09 23:15:02 +00:00
|
|
|
|
Ok((generics, TyParam {
|
2017-11-05 21:14:22 +00:00
|
|
|
|
attrs: preceding_attrs.into(),
|
|
|
|
|
ident,
|
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
|
|
|
|
bounds,
|
|
|
|
|
default,
|
|
|
|
|
}))
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-17 18:18:29 +00:00
|
|
|
|
/// Parses (possibly empty) list of lifetime and type parameters, possibly including
|
|
|
|
|
/// trailing comma and erroneous trailing attributes.
|
2017-10-16 19:07:26 +00:00
|
|
|
|
pub fn parse_generic_params(&mut self) -> PResult<'a, Vec<ast::GenericParam>> {
|
|
|
|
|
let mut params = Vec::new();
|
2017-01-17 18:18:29 +00:00
|
|
|
|
let mut seen_ty_param = false;
|
|
|
|
|
loop {
|
|
|
|
|
let attrs = self.parse_outer_attributes()?;
|
2017-03-16 21:47:32 +00:00
|
|
|
|
if self.check_lifetime() {
|
|
|
|
|
let lifetime = self.expect_lifetime();
|
2017-01-17 18:18:29 +00:00
|
|
|
|
// Parse lifetime parameter.
|
|
|
|
|
let bounds = if self.eat(&token::Colon) {
|
|
|
|
|
self.parse_lt_param_bounds()
|
|
|
|
|
} else {
|
|
|
|
|
Vec::new()
|
|
|
|
|
};
|
2017-10-16 19:07:26 +00:00
|
|
|
|
params.push(ast::GenericParam::Lifetime(LifetimeDef {
|
2017-01-17 18:18:29 +00:00
|
|
|
|
attrs: attrs.into(),
|
2017-08-07 05:54:09 +00:00
|
|
|
|
lifetime,
|
|
|
|
|
bounds,
|
2017-10-16 19:07:26 +00:00
|
|
|
|
}));
|
2017-01-17 18:18:29 +00:00
|
|
|
|
if seen_ty_param {
|
|
|
|
|
self.span_err(self.prev_span,
|
|
|
|
|
"lifetime parameters must be declared prior to type parameters");
|
|
|
|
|
}
|
2017-03-16 21:47:32 +00:00
|
|
|
|
} else if self.check_ident() {
|
2017-01-17 18:18:29 +00:00
|
|
|
|
// Parse type parameter.
|
2017-10-16 19:07:26 +00:00
|
|
|
|
params.push(ast::GenericParam::Type(self.parse_ty_param(attrs)?));
|
2017-01-17 18:18:29 +00:00
|
|
|
|
seen_ty_param = true;
|
|
|
|
|
} else {
|
|
|
|
|
// Check for trailing attributes and stop parsing.
|
|
|
|
|
if !attrs.is_empty() {
|
|
|
|
|
let param_kind = if seen_ty_param { "type" } else { "lifetime" };
|
|
|
|
|
self.span_err(attrs[0].span,
|
|
|
|
|
&format!("trailing attribute after {} parameters", param_kind));
|
|
|
|
|
}
|
|
|
|
|
break
|
2017-03-16 21:47:32 +00:00
|
|
|
|
}
|
2017-01-17 18:18:29 +00:00
|
|
|
|
|
|
|
|
|
if !self.eat(&token::Comma) {
|
|
|
|
|
break
|
|
|
|
|
}
|
|
|
|
|
}
|
2017-10-16 19:07:26 +00:00
|
|
|
|
Ok(params)
|
2017-01-17 18:18:29 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-08-11 16:32:26 +00:00
|
|
|
|
/// Parse a set of optional generic type parameter declarations. Where
|
|
|
|
|
/// clauses are not parsed here, and must be added later via
|
|
|
|
|
/// `parse_where_clause()`.
|
|
|
|
|
///
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// matches generics = ( ) | ( < > ) | ( < typaramseq ( , )? > ) | ( < lifetimes ( , )? > )
|
|
|
|
|
/// | ( < lifetimes , typaramseq ( , )? > )
|
|
|
|
|
/// where typaramseq = ( typaram ) | ( typaram , typaramseq )
|
2015-12-20 21:00:43 +00:00
|
|
|
|
pub fn parse_generics(&mut self) -> PResult<'a, ast::Generics> {
|
2016-11-02 03:03:55 +00:00
|
|
|
|
maybe_whole!(self, NtGenerics, |x| x);
|
2015-05-02 17:55:41 +00:00
|
|
|
|
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let span_lo = self.span;
|
2017-01-17 18:18:29 +00:00
|
|
|
|
if self.eat_lt() {
|
2017-10-16 19:07:26 +00:00
|
|
|
|
let params = self.parse_generic_params()?;
|
2017-01-17 18:18:29 +00:00
|
|
|
|
self.expect_gt()?;
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(ast::Generics {
|
2017-10-16 19:07:26 +00:00
|
|
|
|
params,
|
2014-08-11 16:32:26 +00:00
|
|
|
|
where_clause: WhereClause {
|
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
|
|
|
|
predicates: Vec::new(),
|
2017-07-27 04:37:35 +00:00
|
|
|
|
span: syntax_pos::DUMMY_SP,
|
2016-08-10 17:39:12 +00:00
|
|
|
|
},
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span: span_lo.to(self.prev_span),
|
2015-03-28 21:58:51 +00:00
|
|
|
|
})
|
2013-02-15 05:50:03 +00:00
|
|
|
|
} else {
|
2015-11-28 19:02:07 +00:00
|
|
|
|
Ok(ast::Generics::default())
|
2013-02-15 05:50:03 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-17 18:18:29 +00:00
|
|
|
|
/// Parses (possibly empty) list of lifetime and type arguments and associated type bindings,
|
|
|
|
|
/// possibly including trailing comma.
|
|
|
|
|
fn parse_generic_args(&mut self) -> PResult<'a, (Vec<Lifetime>, Vec<P<Ty>>, Vec<TypeBinding>)> {
|
|
|
|
|
let mut lifetimes = Vec::new();
|
|
|
|
|
let mut types = Vec::new();
|
|
|
|
|
let mut bindings = Vec::new();
|
|
|
|
|
let mut seen_type = false;
|
|
|
|
|
let mut seen_binding = false;
|
|
|
|
|
loop {
|
2018-05-25 21:09:32 +00:00
|
|
|
|
if self.check_lifetime() && self.look_ahead(1, |t| !t.is_like_plus()) {
|
2017-01-17 18:18:29 +00:00
|
|
|
|
// Parse lifetime argument.
|
2017-03-16 21:47:32 +00:00
|
|
|
|
lifetimes.push(self.expect_lifetime());
|
2017-01-17 18:18:29 +00:00
|
|
|
|
if seen_type || seen_binding {
|
|
|
|
|
self.span_err(self.prev_span,
|
|
|
|
|
"lifetime parameters must be declared prior to type parameters");
|
2014-11-29 04:08:30 +00:00
|
|
|
|
}
|
2017-03-16 21:47:32 +00:00
|
|
|
|
} else if self.check_ident() && self.look_ahead(1, |t| t == &token::Eq) {
|
2017-01-17 18:18:29 +00:00
|
|
|
|
// Parse associated type binding.
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
2017-01-17 18:18:29 +00:00
|
|
|
|
let ident = self.parse_ident()?;
|
|
|
|
|
self.bump();
|
|
|
|
|
let ty = self.parse_ty()?;
|
|
|
|
|
bindings.push(TypeBinding {
|
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2017-08-07 05:54:09 +00:00
|
|
|
|
ident,
|
|
|
|
|
ty,
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span: lo.to(self.prev_span),
|
2016-02-11 20:33:09 +00:00
|
|
|
|
});
|
2017-01-17 18:18:29 +00:00
|
|
|
|
seen_binding = true;
|
2017-01-18 16:01:04 +00:00
|
|
|
|
} else if self.check_type() {
|
2017-01-17 18:18:29 +00:00
|
|
|
|
// Parse type argument.
|
|
|
|
|
types.push(self.parse_ty()?);
|
|
|
|
|
if seen_binding {
|
|
|
|
|
self.span_err(types[types.len() - 1].span,
|
|
|
|
|
"type parameters must be declared prior to associated type bindings");
|
|
|
|
|
}
|
|
|
|
|
seen_type = true;
|
|
|
|
|
} else {
|
|
|
|
|
break
|
2017-03-16 21:47:32 +00:00
|
|
|
|
}
|
2011-07-27 12:19:39 +00:00
|
|
|
|
|
2017-01-17 18:18:29 +00:00
|
|
|
|
if !self.eat(&token::Comma) {
|
|
|
|
|
break
|
|
|
|
|
}
|
2014-05-23 19:51:21 +00:00
|
|
|
|
}
|
2017-01-17 18:18:29 +00:00
|
|
|
|
Ok((lifetimes, types, bindings))
|
2014-05-23 19:51:21 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-08-11 16:32:26 +00:00
|
|
|
|
/// Parses an optional `where` clause and places it in `generics`.
|
2014-12-20 10:29:19 +00:00
|
|
|
|
///
|
2017-06-20 07:15:16 +00:00
|
|
|
|
/// ```ignore (only-for-syntax-highlight)
|
2014-12-20 10:29:19 +00:00
|
|
|
|
/// where T : Trait<U, V> + 'b, 'a : 'b
|
|
|
|
|
/// ```
|
2017-01-17 18:18:29 +00:00
|
|
|
|
pub fn parse_where_clause(&mut self) -> PResult<'a, WhereClause> {
|
2016-11-02 03:03:55 +00:00
|
|
|
|
maybe_whole!(self, NtWhereClause, |x| x);
|
2015-05-02 17:55:41 +00:00
|
|
|
|
|
2015-03-14 05:22:04 +00:00
|
|
|
|
let mut where_clause = WhereClause {
|
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
|
|
|
|
predicates: Vec::new(),
|
2017-07-27 04:37:35 +00:00
|
|
|
|
span: syntax_pos::DUMMY_SP,
|
2015-03-14 05:22:04 +00:00
|
|
|
|
};
|
|
|
|
|
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if !self.eat_keyword(keywords::Where) {
|
2015-03-28 21:58:51 +00:00
|
|
|
|
return Ok(where_clause);
|
2014-08-11 16:32:26 +00:00
|
|
|
|
}
|
2017-07-27 04:37:35 +00:00
|
|
|
|
let lo = self.prev_span;
|
2014-08-11 16:32:26 +00:00
|
|
|
|
|
2016-12-09 18:54:05 +00:00
|
|
|
|
// We are considering adding generics to the `where` keyword as an alternative higher-rank
|
|
|
|
|
// parameter syntax (as in `where<'a>` or `where<T>`. To avoid that being a breaking
|
2018-01-14 15:10:19 +00:00
|
|
|
|
// change we parse those generics now, but report an error.
|
|
|
|
|
if self.choose_generics_over_qpath() {
|
|
|
|
|
let generics = self.parse_generics()?;
|
|
|
|
|
self.span_err(generics.span,
|
|
|
|
|
"generic parameters on `where` clauses are reserved for future use");
|
2016-12-09 18:54:05 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-08-11 16:32:26 +00:00
|
|
|
|
loop {
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
2018-05-25 21:09:32 +00:00
|
|
|
|
if self.check_lifetime() && self.look_ahead(1, |t| !t.is_like_plus()) {
|
2017-03-16 21:47:32 +00:00
|
|
|
|
let lifetime = self.expect_lifetime();
|
2017-01-17 18:18:29 +00:00
|
|
|
|
// Bounds starting with a colon are mandatory, but possibly empty.
|
|
|
|
|
self.expect(&token::Colon)?;
|
|
|
|
|
let bounds = self.parse_lt_param_bounds();
|
|
|
|
|
where_clause.predicates.push(ast::WherePredicate::RegionPredicate(
|
|
|
|
|
ast::WhereRegionPredicate {
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span: lo.to(self.prev_span),
|
2017-08-07 05:54:09 +00:00
|
|
|
|
lifetime,
|
|
|
|
|
bounds,
|
2017-01-17 18:18:29 +00:00
|
|
|
|
}
|
|
|
|
|
));
|
2017-03-16 21:47:32 +00:00
|
|
|
|
} else if self.check_type() {
|
2017-01-17 18:18:29 +00:00
|
|
|
|
// Parse optional `for<'a, 'b>`.
|
|
|
|
|
// This `for` is parsed greedily and applies to the whole predicate,
|
|
|
|
|
// the bounded type can have its own `for` applying only to it.
|
|
|
|
|
// Example 1: for<'a> Trait1<'a>: Trait2<'a /*ok*/>
|
|
|
|
|
// Example 2: (for<'a> Trait1<'a>): Trait2<'a /*not ok*/>
|
|
|
|
|
// Example 3: for<'a> for<'b> Trait1<'a, 'b>: Trait2<'a /*ok*/, 'b /*not ok*/>
|
|
|
|
|
let lifetime_defs = self.parse_late_bound_lifetime_defs()?;
|
|
|
|
|
|
|
|
|
|
// Parse type with mandatory colon and (possibly empty) bounds,
|
|
|
|
|
// or with mandatory equality sign and the second type.
|
|
|
|
|
let ty = self.parse_ty()?;
|
|
|
|
|
if self.eat(&token::Colon) {
|
|
|
|
|
let bounds = self.parse_ty_param_bounds()?;
|
|
|
|
|
where_clause.predicates.push(ast::WherePredicate::BoundPredicate(
|
|
|
|
|
ast::WhereBoundPredicate {
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span: lo.to(self.prev_span),
|
2017-10-16 19:07:26 +00:00
|
|
|
|
bound_generic_params: lifetime_defs,
|
2017-01-17 18:18:29 +00:00
|
|
|
|
bounded_ty: ty,
|
2017-08-07 05:54:09 +00:00
|
|
|
|
bounds,
|
2014-12-20 10:29:19 +00:00
|
|
|
|
}
|
|
|
|
|
));
|
2017-01-17 18:18:29 +00:00
|
|
|
|
// FIXME: Decide what should be used here, `=` or `==`.
|
2018-03-06 10:33:26 +00:00
|
|
|
|
// FIXME: We are just dropping the binders in lifetime_defs on the floor here.
|
2017-01-17 18:18:29 +00:00
|
|
|
|
} else if self.eat(&token::Eq) || self.eat(&token::EqEq) {
|
|
|
|
|
let rhs_ty = self.parse_ty()?;
|
|
|
|
|
where_clause.predicates.push(ast::WherePredicate::EqPredicate(
|
|
|
|
|
ast::WhereEqPredicate {
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span: lo.to(self.prev_span),
|
2017-01-17 18:18:29 +00:00
|
|
|
|
lhs_ty: ty,
|
2017-08-07 05:54:09 +00:00
|
|
|
|
rhs_ty,
|
2017-01-17 18:18:29 +00:00
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2014-12-20 10:29:19 +00:00
|
|
|
|
}
|
2017-01-17 18:18:29 +00:00
|
|
|
|
));
|
|
|
|
|
} else {
|
|
|
|
|
return self.unexpected();
|
2014-12-20 10:29:19 +00:00
|
|
|
|
}
|
2017-01-17 18:18:29 +00:00
|
|
|
|
} else {
|
|
|
|
|
break
|
2017-03-16 21:47:32 +00:00
|
|
|
|
}
|
2014-08-11 16:32:26 +00:00
|
|
|
|
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if !self.eat(&token::Comma) {
|
2014-08-11 16:32:26 +00:00
|
|
|
|
break
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-07-27 04:37:35 +00:00
|
|
|
|
where_clause.span = lo.to(self.prev_span);
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(where_clause)
|
2014-08-11 16:32:26 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-12-30 22:04:00 +00:00
|
|
|
|
fn parse_fn_args(&mut self, named_args: bool, allow_variadic: bool)
|
2015-12-20 21:00:43 +00:00
|
|
|
|
-> PResult<'a, (Vec<Arg> , bool)> {
|
2013-12-30 23:17:53 +00:00
|
|
|
|
let sp = self.span;
|
2016-01-31 19:39:50 +00:00
|
|
|
|
let mut variadic = false;
|
|
|
|
|
let args: Vec<Option<Arg>> =
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.parse_unspanned_seq(
|
2014-10-29 10:37:54 +00:00
|
|
|
|
&token::OpenDelim(token::Paren),
|
|
|
|
|
&token::CloseDelim(token::Paren),
|
2016-02-23 04:24:42 +00:00
|
|
|
|
SeqSep::trailing_allowed(token::Comma),
|
2013-10-25 05:56:34 +00:00
|
|
|
|
|p| {
|
2014-10-27 08:22:52 +00:00
|
|
|
|
if p.token == token::DotDotDot {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
p.bump();
|
2018-02-12 06:10:35 +00:00
|
|
|
|
variadic = true;
|
2013-10-25 05:56:34 +00:00
|
|
|
|
if allow_variadic {
|
2014-10-29 10:37:54 +00:00
|
|
|
|
if p.token != token::CloseDelim(token::Paren) {
|
2014-06-14 03:48:09 +00:00
|
|
|
|
let span = p.span;
|
2016-01-31 19:39:50 +00:00
|
|
|
|
p.span_err(span,
|
|
|
|
|
"`...` must be last in argument list for variadic function");
|
2013-10-25 05:56:34 +00:00
|
|
|
|
}
|
2018-02-12 06:10:35 +00:00
|
|
|
|
Ok(None)
|
2013-10-25 05:56:34 +00:00
|
|
|
|
} else {
|
2018-02-12 06:10:35 +00:00
|
|
|
|
let span = p.prev_span;
|
|
|
|
|
if p.token == token::CloseDelim(token::Paren) {
|
|
|
|
|
// continue parsing to present any further errors
|
|
|
|
|
p.struct_span_err(
|
|
|
|
|
span,
|
|
|
|
|
"only foreign functions are allowed to be variadic"
|
|
|
|
|
).emit();
|
|
|
|
|
Ok(Some(dummy_arg(span)))
|
|
|
|
|
} else {
|
|
|
|
|
// this function definition looks beyond recovery, stop parsing
|
|
|
|
|
p.span_err(span,
|
|
|
|
|
"only foreign functions are allowed to be variadic");
|
|
|
|
|
Ok(None)
|
|
|
|
|
}
|
2013-10-25 05:56:34 +00:00
|
|
|
|
}
|
|
|
|
|
} else {
|
2016-01-31 19:39:50 +00:00
|
|
|
|
match p.parse_arg_general(named_args) {
|
|
|
|
|
Ok(arg) => Ok(Some(arg)),
|
|
|
|
|
Err(mut e) => {
|
|
|
|
|
e.emit();
|
2017-03-29 01:56:29 +00:00
|
|
|
|
let lo = p.prev_span;
|
|
|
|
|
// Skip every token until next possible arg or end.
|
2016-01-31 19:39:50 +00:00
|
|
|
|
p.eat_to_tokens(&[&token::Comma, &token::CloseDelim(token::Paren)]);
|
2017-03-29 01:56:29 +00:00
|
|
|
|
// Create a placeholder argument for proper arg count (#34264).
|
|
|
|
|
let span = lo.to(p.prev_span);
|
|
|
|
|
Ok(Some(dummy_arg(span)))
|
2016-01-31 19:39:50 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2013-10-25 05:56:34 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2016-03-23 03:01:37 +00:00
|
|
|
|
)?;
|
2012-05-23 22:06:11 +00:00
|
|
|
|
|
2016-02-10 03:11:27 +00:00
|
|
|
|
let args: Vec<_> = args.into_iter().filter_map(|x| x).collect();
|
|
|
|
|
|
2013-10-25 05:56:34 +00:00
|
|
|
|
if variadic && args.is_empty() {
|
|
|
|
|
self.span_err(sp,
|
|
|
|
|
"variadic function must be declared with at least one named argument");
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok((args, variadic))
|
2013-10-25 05:56:34 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse the argument list and result type of a function declaration
|
2015-12-20 21:00:43 +00:00
|
|
|
|
pub fn parse_fn_decl(&mut self, allow_variadic: bool) -> PResult<'a, P<FnDecl>> {
|
2013-10-25 05:56:34 +00:00
|
|
|
|
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let (args, variadic) = self.parse_fn_args(true, allow_variadic)?;
|
2018-01-18 17:59:28 +00:00
|
|
|
|
let ret_ty = self.parse_ret_ty(true)?;
|
2013-10-25 05:56:34 +00:00
|
|
|
|
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(P(FnDecl {
|
2013-09-14 02:07:43 +00:00
|
|
|
|
inputs: args,
|
2013-01-10 18:59:58 +00:00
|
|
|
|
output: ret_ty,
|
2017-08-07 05:54:09 +00:00
|
|
|
|
variadic,
|
2015-03-28 21:58:51 +00:00
|
|
|
|
}))
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-03-06 12:54:44 +00:00
|
|
|
|
/// Returns the parsed optional self argument and whether a self shortcut was used.
|
2016-03-06 12:54:44 +00:00
|
|
|
|
fn parse_self_arg(&mut self) -> PResult<'a, Option<Arg>> {
|
2016-05-08 18:18:21 +00:00
|
|
|
|
let expect_ident = |this: &mut Self| match this.token {
|
2016-03-06 12:54:44 +00:00
|
|
|
|
// Preserve hygienic context.
|
2018-03-18 13:47:09 +00:00
|
|
|
|
token::Ident(ident, _) =>
|
|
|
|
|
{ let span = this.span; this.bump(); Ident::new(ident.name, span) }
|
2016-05-08 18:18:21 +00:00
|
|
|
|
_ => unreachable!()
|
|
|
|
|
};
|
2016-10-19 20:33:41 +00:00
|
|
|
|
let isolated_self = |this: &mut Self, n| {
|
|
|
|
|
this.look_ahead(n, |t| t.is_keyword(keywords::SelfValue)) &&
|
|
|
|
|
this.look_ahead(n + 1, |t| t != &token::ModSep)
|
|
|
|
|
};
|
2013-03-10 00:43:53 +00:00
|
|
|
|
|
2016-05-08 18:18:21 +00:00
|
|
|
|
// Parse optional self parameter of a method.
|
|
|
|
|
// Only a limited set of initial token sequences is considered self parameters, anything
|
|
|
|
|
// else is parsed as a normal function parameter list, so some lookahead is required.
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let eself_lo = self.span;
|
2018-05-25 18:33:15 +00:00
|
|
|
|
let (eself, eself_ident, eself_hi) = match self.token {
|
2014-10-27 08:22:52 +00:00
|
|
|
|
token::BinOp(token::And) => {
|
2016-05-08 18:18:21 +00:00
|
|
|
|
// &self
|
|
|
|
|
// &mut self
|
|
|
|
|
// &'lt self
|
|
|
|
|
// &'lt mut self
|
|
|
|
|
// ¬_self
|
2018-05-25 18:33:15 +00:00
|
|
|
|
(if isolated_self(self, 1) {
|
2016-05-08 18:18:21 +00:00
|
|
|
|
self.bump();
|
2018-05-25 18:33:15 +00:00
|
|
|
|
SelfKind::Region(None, Mutability::Immutable)
|
2016-05-08 18:18:21 +00:00
|
|
|
|
} else if self.look_ahead(1, |t| t.is_keyword(keywords::Mut)) &&
|
2016-10-19 20:33:41 +00:00
|
|
|
|
isolated_self(self, 2) {
|
2016-05-08 18:18:21 +00:00
|
|
|
|
self.bump();
|
|
|
|
|
self.bump();
|
2018-05-25 18:33:15 +00:00
|
|
|
|
SelfKind::Region(None, Mutability::Mutable)
|
2016-05-08 18:18:21 +00:00
|
|
|
|
} else if self.look_ahead(1, |t| t.is_lifetime()) &&
|
2016-10-19 20:33:41 +00:00
|
|
|
|
isolated_self(self, 2) {
|
2016-05-08 18:18:21 +00:00
|
|
|
|
self.bump();
|
2017-03-16 21:47:32 +00:00
|
|
|
|
let lt = self.expect_lifetime();
|
2018-05-25 18:33:15 +00:00
|
|
|
|
SelfKind::Region(Some(lt), Mutability::Immutable)
|
2016-05-08 18:18:21 +00:00
|
|
|
|
} else if self.look_ahead(1, |t| t.is_lifetime()) &&
|
|
|
|
|
self.look_ahead(2, |t| t.is_keyword(keywords::Mut)) &&
|
2016-10-19 20:33:41 +00:00
|
|
|
|
isolated_self(self, 3) {
|
2016-05-08 18:18:21 +00:00
|
|
|
|
self.bump();
|
2017-03-16 21:47:32 +00:00
|
|
|
|
let lt = self.expect_lifetime();
|
2016-05-08 18:18:21 +00:00
|
|
|
|
self.bump();
|
2018-05-25 18:33:15 +00:00
|
|
|
|
SelfKind::Region(Some(lt), Mutability::Mutable)
|
2016-05-08 18:18:21 +00:00
|
|
|
|
} else {
|
2016-03-06 12:54:44 +00:00
|
|
|
|
return Ok(None);
|
2018-05-25 18:33:15 +00:00
|
|
|
|
}, expect_ident(self), self.prev_span)
|
2014-01-12 00:25:51 +00:00
|
|
|
|
}
|
2014-10-27 08:22:52 +00:00
|
|
|
|
token::BinOp(token::Star) => {
|
2016-05-08 18:18:21 +00:00
|
|
|
|
// *self
|
|
|
|
|
// *const self
|
|
|
|
|
// *mut self
|
|
|
|
|
// *not_self
|
|
|
|
|
// Emit special error for `self` cases.
|
2018-05-25 18:33:15 +00:00
|
|
|
|
(if isolated_self(self, 1) {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2016-05-08 18:18:21 +00:00
|
|
|
|
self.span_err(self.span, "cannot pass `self` by raw pointer");
|
2018-05-25 18:33:15 +00:00
|
|
|
|
SelfKind::Value(Mutability::Immutable)
|
2016-05-08 18:18:21 +00:00
|
|
|
|
} else if self.look_ahead(1, |t| t.is_mutability()) &&
|
2016-10-19 20:33:41 +00:00
|
|
|
|
isolated_self(self, 2) {
|
2016-05-08 18:18:21 +00:00
|
|
|
|
self.bump();
|
|
|
|
|
self.bump();
|
|
|
|
|
self.span_err(self.span, "cannot pass `self` by raw pointer");
|
2018-05-25 18:33:15 +00:00
|
|
|
|
SelfKind::Value(Mutability::Immutable)
|
2016-05-08 18:18:21 +00:00
|
|
|
|
} else {
|
2016-03-06 12:54:44 +00:00
|
|
|
|
return Ok(None);
|
2018-05-25 18:33:15 +00:00
|
|
|
|
}, expect_ident(self), self.prev_span)
|
2014-01-12 00:25:51 +00:00
|
|
|
|
}
|
2014-10-27 08:22:52 +00:00
|
|
|
|
token::Ident(..) => {
|
2016-10-19 20:33:41 +00:00
|
|
|
|
if isolated_self(self, 0) {
|
2016-05-08 18:18:21 +00:00
|
|
|
|
// self
|
|
|
|
|
// self: TYPE
|
|
|
|
|
let eself_ident = expect_ident(self);
|
2018-05-25 18:33:15 +00:00
|
|
|
|
let eself_hi = self.prev_span;
|
|
|
|
|
(if self.eat(&token::Colon) {
|
2017-01-16 23:13:41 +00:00
|
|
|
|
let ty = self.parse_ty()?;
|
2018-05-25 18:33:15 +00:00
|
|
|
|
SelfKind::Explicit(ty, Mutability::Immutable)
|
librustc: Disallow mutation and assignment in pattern guards, and modify
the CFG for match statements.
There were two bugs in issue #14684. One was simply that the borrow
check didn't know about the correct CFG for match statements: the
pattern must be a predecessor of the guard. This disallows the bad
behavior if there are bindings in the pattern. But it isn't enough to
prevent the memory safety problem, because of wildcards; thus, this
patch introduces a more restrictive rule, which disallows assignments
and mutable borrows inside guards outright.
I discussed this with Niko and we decided this was the best plan of
action.
This breaks code that performs mutable borrows in pattern guards. Most
commonly, the code looks like this:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz if self.f(...) => { ... }
_ => { ... }
}
}
}
Change this code to not use a guard. For example:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz => {
if self.f(...) {
...
} else {
...
}
}
_ => { ... }
}
}
}
Sometimes this can result in code duplication, but often it illustrates
a hidden memory safety problem.
Closes #14684.
[breaking-change]
2014-07-25 22:18:19 +00:00
|
|
|
|
} else {
|
2018-05-25 18:33:15 +00:00
|
|
|
|
SelfKind::Value(Mutability::Immutable)
|
|
|
|
|
}, eself_ident, eself_hi)
|
2016-05-08 18:18:21 +00:00
|
|
|
|
} else if self.token.is_keyword(keywords::Mut) &&
|
2016-10-19 20:33:41 +00:00
|
|
|
|
isolated_self(self, 1) {
|
2016-05-08 18:18:21 +00:00
|
|
|
|
// mut self
|
|
|
|
|
// mut self: TYPE
|
|
|
|
|
self.bump();
|
|
|
|
|
let eself_ident = expect_ident(self);
|
2018-05-25 18:33:15 +00:00
|
|
|
|
let eself_hi = self.prev_span;
|
|
|
|
|
(if self.eat(&token::Colon) {
|
2017-01-16 23:13:41 +00:00
|
|
|
|
let ty = self.parse_ty()?;
|
2018-05-25 18:33:15 +00:00
|
|
|
|
SelfKind::Explicit(ty, Mutability::Mutable)
|
librustc: Disallow mutation and assignment in pattern guards, and modify
the CFG for match statements.
There were two bugs in issue #14684. One was simply that the borrow
check didn't know about the correct CFG for match statements: the
pattern must be a predecessor of the guard. This disallows the bad
behavior if there are bindings in the pattern. But it isn't enough to
prevent the memory safety problem, because of wildcards; thus, this
patch introduces a more restrictive rule, which disallows assignments
and mutable borrows inside guards outright.
I discussed this with Niko and we decided this was the best plan of
action.
This breaks code that performs mutable borrows in pattern guards. Most
commonly, the code looks like this:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz if self.f(...) => { ... }
_ => { ... }
}
}
}
Change this code to not use a guard. For example:
impl Foo {
fn f(&mut self, ...) {}
fn g(&mut self, ...) {
match bar {
Baz => {
if self.f(...) {
...
} else {
...
}
}
_ => { ... }
}
}
}
Sometimes this can result in code duplication, but often it illustrates
a hidden memory safety problem.
Closes #14684.
[breaking-change]
2014-07-25 22:18:19 +00:00
|
|
|
|
} else {
|
2018-05-25 18:33:15 +00:00
|
|
|
|
SelfKind::Value(Mutability::Mutable)
|
|
|
|
|
}, eself_ident, eself_hi)
|
2014-05-06 23:37:32 +00:00
|
|
|
|
} else {
|
2016-03-06 12:54:44 +00:00
|
|
|
|
return Ok(None);
|
2014-05-06 23:37:32 +00:00
|
|
|
|
}
|
2014-01-12 00:25:51 +00:00
|
|
|
|
}
|
2016-03-06 12:54:44 +00:00
|
|
|
|
_ => return Ok(None),
|
2012-08-17 22:25:35 +00:00
|
|
|
|
};
|
2016-03-06 12:54:44 +00:00
|
|
|
|
|
2018-05-25 18:33:15 +00:00
|
|
|
|
let eself = codemap::respan(eself_lo.to(eself_hi), eself);
|
2016-03-06 12:54:44 +00:00
|
|
|
|
Ok(Some(Arg::from_self(eself, eself_ident)))
|
2016-03-06 12:54:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Parse the parameter list and result type of a function that may have a `self` parameter.
|
2016-03-06 12:54:44 +00:00
|
|
|
|
fn parse_fn_decl_with_self<F>(&mut self, parse_arg_fn: F) -> PResult<'a, P<FnDecl>>
|
2016-03-06 12:54:44 +00:00
|
|
|
|
where F: FnMut(&mut Parser<'a>) -> PResult<'a, Arg>,
|
|
|
|
|
{
|
|
|
|
|
self.expect(&token::OpenDelim(token::Paren))?;
|
|
|
|
|
|
|
|
|
|
// Parse optional self argument
|
2016-03-06 12:54:44 +00:00
|
|
|
|
let self_arg = self.parse_self_arg()?;
|
2012-07-30 23:33:02 +00:00
|
|
|
|
|
2016-05-08 18:18:21 +00:00
|
|
|
|
// Parse the rest of the function parameter list.
|
|
|
|
|
let sep = SeqSep::trailing_allowed(token::Comma);
|
2016-03-06 12:54:44 +00:00
|
|
|
|
let fn_inputs = if let Some(self_arg) = self_arg {
|
|
|
|
|
if self.check(&token::CloseDelim(token::Paren)) {
|
|
|
|
|
vec![self_arg]
|
|
|
|
|
} else if self.eat(&token::Comma) {
|
|
|
|
|
let mut fn_inputs = vec![self_arg];
|
|
|
|
|
fn_inputs.append(&mut self.parse_seq_to_before_end(
|
2017-10-22 16:19:30 +00:00
|
|
|
|
&token::CloseDelim(token::Paren), sep, parse_arg_fn)?
|
2016-03-06 12:54:44 +00:00
|
|
|
|
);
|
|
|
|
|
fn_inputs
|
|
|
|
|
} else {
|
|
|
|
|
return self.unexpected();
|
2012-07-30 23:33:02 +00:00
|
|
|
|
}
|
2016-03-06 12:54:44 +00:00
|
|
|
|
} else {
|
2017-10-22 16:19:30 +00:00
|
|
|
|
self.parse_seq_to_before_end(&token::CloseDelim(token::Paren), sep, parse_arg_fn)?
|
2014-01-27 12:18:36 +00:00
|
|
|
|
};
|
2012-07-30 23:33:02 +00:00
|
|
|
|
|
2016-05-08 18:18:21 +00:00
|
|
|
|
// Parse closing paren and return type.
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::CloseDelim(token::Paren))?;
|
2016-03-06 12:54:44 +00:00
|
|
|
|
Ok(P(FnDecl {
|
2013-09-14 02:07:43 +00:00
|
|
|
|
inputs: fn_inputs,
|
2018-01-18 17:59:28 +00:00
|
|
|
|
output: self.parse_ret_ty(true)?,
|
2013-10-25 05:56:34 +00:00
|
|
|
|
variadic: false
|
2016-03-06 12:54:44 +00:00
|
|
|
|
}))
|
2012-07-30 23:33:02 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-05-29 05:26:56 +00:00
|
|
|
|
// parse the |arg, arg| header on a lambda
|
2015-12-20 21:00:43 +00:00
|
|
|
|
fn parse_fn_block_decl(&mut self) -> PResult<'a, P<FnDecl>> {
|
2015-02-03 16:34:05 +00:00
|
|
|
|
let inputs_captures = {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat(&token::OrOr) {
|
2015-02-03 16:34:05 +00:00
|
|
|
|
Vec::new()
|
2012-05-23 22:06:11 +00:00
|
|
|
|
} else {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::BinOp(token::Or))?;
|
2017-09-07 06:07:49 +00:00
|
|
|
|
let args = self.parse_seq_to_before_tokens(
|
|
|
|
|
&[&token::BinOp(token::Or), &token::OrOr],
|
2016-02-23 04:24:42 +00:00
|
|
|
|
SeqSep::trailing_allowed(token::Comma),
|
2017-09-07 06:07:49 +00:00
|
|
|
|
TokenExpectType::NoExpect,
|
2017-10-22 16:19:30 +00:00
|
|
|
|
|p| p.parse_fn_block_arg()
|
|
|
|
|
)?;
|
2017-09-07 06:07:49 +00:00
|
|
|
|
self.expect_or()?;
|
2015-02-03 16:34:05 +00:00
|
|
|
|
args
|
2012-05-04 19:33:04 +00:00
|
|
|
|
}
|
|
|
|
|
};
|
2018-01-18 17:59:28 +00:00
|
|
|
|
let output = self.parse_ret_ty(true)?;
|
2013-01-16 00:05:20 +00:00
|
|
|
|
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(P(FnDecl {
|
2013-09-14 02:07:43 +00:00
|
|
|
|
inputs: inputs_captures,
|
2017-08-07 05:54:09 +00:00
|
|
|
|
output,
|
2013-10-25 05:56:34 +00:00
|
|
|
|
variadic: false
|
2015-03-28 21:58:51 +00:00
|
|
|
|
}))
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse the name and optional generic types of a function header.
|
2015-12-20 21:00:43 +00:00
|
|
|
|
fn parse_fn_header(&mut self) -> PResult<'a, (Ident, ast::Generics)> {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let id = self.parse_ident()?;
|
|
|
|
|
let generics = self.parse_generics()?;
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok((id, generics))
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-03-15 00:22:48 +00:00
|
|
|
|
fn mk_item(&mut self, span: Span, ident: Ident, node: ItemKind, vis: Visibility,
|
2014-09-13 16:06:01 +00:00
|
|
|
|
attrs: Vec<Attribute>) -> P<Item> {
|
|
|
|
|
P(Item {
|
2017-08-07 05:54:09 +00:00
|
|
|
|
ident,
|
|
|
|
|
attrs,
|
2014-01-09 13:05:33 +00:00
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2017-08-07 05:54:09 +00:00
|
|
|
|
node,
|
|
|
|
|
vis,
|
|
|
|
|
span,
|
2017-07-12 16:50:05 +00:00
|
|
|
|
tokens: None,
|
2014-09-13 16:06:01 +00:00
|
|
|
|
})
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse an item-position function declaration.
|
2015-02-25 20:05:07 +00:00
|
|
|
|
fn parse_item_fn(&mut self,
|
|
|
|
|
unsafety: Unsafety,
|
2016-08-10 23:20:12 +00:00
|
|
|
|
constness: Spanned<Constness>,
|
2017-12-02 19:15:03 +00:00
|
|
|
|
abi: Abi)
|
2015-12-20 21:00:43 +00:00
|
|
|
|
-> PResult<'a, ItemInfo> {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let (ident, mut generics) = self.parse_fn_header()?;
|
|
|
|
|
let decl = self.parse_fn_decl(false)?;
|
|
|
|
|
generics.where_clause = self.parse_where_clause()?;
|
|
|
|
|
let (inner_attrs, body) = self.parse_inner_attrs_and_block()?;
|
2016-02-09 10:36:51 +00:00
|
|
|
|
Ok((ident, ItemKind::Fn(decl, unsafety, constness, abi, generics, body), Some(inner_attrs)))
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-05-05 12:47:04 +00:00
|
|
|
|
/// true if we are looking at `const ID`, false for things like `const fn` etc
|
|
|
|
|
pub fn is_const_item(&mut self) -> bool {
|
|
|
|
|
self.token.is_keyword(keywords::Const) &&
|
2015-10-24 08:52:07 +00:00
|
|
|
|
!self.look_ahead(1, |t| t.is_keyword(keywords::Fn)) &&
|
|
|
|
|
!self.look_ahead(1, |t| t.is_keyword(keywords::Unsafe))
|
2015-05-05 12:47:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// parses all the "front matter" for a `fn` declaration, up to
|
|
|
|
|
/// and including the `fn` keyword:
|
|
|
|
|
///
|
|
|
|
|
/// - `const fn`
|
|
|
|
|
/// - `unsafe fn`
|
2015-10-24 08:52:07 +00:00
|
|
|
|
/// - `const unsafe fn`
|
2015-05-05 12:47:04 +00:00
|
|
|
|
/// - `extern fn`
|
|
|
|
|
/// - etc
|
2017-12-02 19:15:03 +00:00
|
|
|
|
pub fn parse_fn_front_matter(&mut self) -> PResult<'a, (Spanned<Constness>, Unsafety, Abi)> {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
let is_const_fn = self.eat_keyword(keywords::Const);
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let const_span = self.prev_span;
|
2017-12-02 19:15:03 +00:00
|
|
|
|
let unsafety = self.parse_unsafety();
|
2015-05-05 12:47:04 +00:00
|
|
|
|
let (constness, unsafety, abi) = if is_const_fn {
|
2016-08-10 23:20:12 +00:00
|
|
|
|
(respan(const_span, Constness::Const), unsafety, Abi::Rust)
|
2015-05-05 12:47:04 +00:00
|
|
|
|
} else {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
let abi = if self.eat_keyword(keywords::Extern) {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.parse_opt_abi()?.unwrap_or(Abi::C)
|
2015-05-05 12:47:04 +00:00
|
|
|
|
} else {
|
2016-02-05 12:13:36 +00:00
|
|
|
|
Abi::Rust
|
2015-05-05 12:47:04 +00:00
|
|
|
|
};
|
2016-09-21 02:09:22 +00:00
|
|
|
|
(respan(self.prev_span, Constness::NotConst), unsafety, abi)
|
2015-05-05 12:47:04 +00:00
|
|
|
|
};
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect_keyword(keywords::Fn)?;
|
2015-05-05 12:47:04 +00:00
|
|
|
|
Ok((constness, unsafety, abi))
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-11 21:38:58 +00:00
|
|
|
|
/// Parse an impl item.
|
2017-04-13 19:37:05 +00:00
|
|
|
|
pub fn parse_impl_item(&mut self, at_end: &mut bool) -> PResult<'a, ImplItem> {
|
2016-11-02 03:03:55 +00:00
|
|
|
|
maybe_whole!(self, NtImplItem, |x| x);
|
2017-07-12 16:50:05 +00:00
|
|
|
|
let attrs = self.parse_outer_attributes()?;
|
|
|
|
|
let (mut item, tokens) = self.collect_tokens(|this| {
|
|
|
|
|
this.parse_impl_item_(at_end, attrs)
|
|
|
|
|
})?;
|
Interpolate AST nodes in quasiquote.
This changes the `ToTokens` implementations for expressions, statements,
etc. with almost-trivial ones that produce `Interpolated(*Nt(...))`
pseudo-tokens. In this way, quasiquote now works the same way as macros
do: already-parsed AST fragments are used as-is, not reparsed.
The `ToSource` trait is removed. Quasiquote no longer involves
pretty-printing at all, which removes the need for the
`encode_with_hygiene` hack. All associated machinery is removed.
A new `Nonterminal` is added, NtArm, which the parser now interpolates.
This is just for quasiquote, not macros (although it could be in the
future).
`ToTokens` is no longer implemented for `Arg` (although this could be
added again) and `Generics` (which I don't think makes sense).
This breaks any compiler extensions that relied on the ability of
`ToTokens` to turn AST fragments back into inspectable token trees. For
this reason, this closes #16987.
As such, this is a [breaking-change].
Fixes #16472.
Fixes #15962.
Fixes #17397.
Fixes #16617.
2015-03-05 20:06:49 +00:00
|
|
|
|
|
2017-07-12 16:50:05 +00:00
|
|
|
|
// See `parse_item` for why this clause is here.
|
|
|
|
|
if !item.attrs.iter().any(|attr| attr.style == AttrStyle::Inner) {
|
|
|
|
|
item.tokens = Some(tokens);
|
|
|
|
|
}
|
|
|
|
|
Ok(item)
|
|
|
|
|
}
|
Interpolate AST nodes in quasiquote.
This changes the `ToTokens` implementations for expressions, statements,
etc. with almost-trivial ones that produce `Interpolated(*Nt(...))`
pseudo-tokens. In this way, quasiquote now works the same way as macros
do: already-parsed AST fragments are used as-is, not reparsed.
The `ToSource` trait is removed. Quasiquote no longer involves
pretty-printing at all, which removes the need for the
`encode_with_hygiene` hack. All associated machinery is removed.
A new `Nonterminal` is added, NtArm, which the parser now interpolates.
This is just for quasiquote, not macros (although it could be in the
future).
`ToTokens` is no longer implemented for `Arg` (although this could be
added again) and `Generics` (which I don't think makes sense).
This breaks any compiler extensions that relied on the ability of
`ToTokens` to turn AST fragments back into inspectable token trees. For
this reason, this closes #16987.
As such, this is a [breaking-change].
Fixes #16472.
Fixes #15962.
Fixes #17397.
Fixes #16617.
2015-03-05 20:06:49 +00:00
|
|
|
|
|
2017-07-12 16:50:05 +00:00
|
|
|
|
fn parse_impl_item_(&mut self,
|
|
|
|
|
at_end: &mut bool,
|
|
|
|
|
mut attrs: Vec<Attribute>) -> PResult<'a, ImplItem> {
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
2017-03-18 04:13:00 +00:00
|
|
|
|
let vis = self.parse_visibility(false)?;
|
2017-12-02 19:15:03 +00:00
|
|
|
|
let defaultness = self.parse_defaultness();
|
2017-09-22 02:18:47 +00:00
|
|
|
|
let (name, node, generics) = if self.eat_keyword(keywords::Type) {
|
2017-11-19 05:18:43 +00:00
|
|
|
|
// This parses the grammar:
|
|
|
|
|
// ImplItemAssocTy = Ident ["<"...">"] ["where" ...] "=" Ty ";"
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let name = self.parse_ident()?;
|
2017-11-05 21:14:22 +00:00
|
|
|
|
let mut generics = self.parse_generics()?;
|
2017-11-19 05:18:43 +00:00
|
|
|
|
generics.where_clause = self.parse_where_clause()?;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::Eq)?;
|
2017-01-16 23:13:41 +00:00
|
|
|
|
let typ = self.parse_ty()?;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::Semi)?;
|
2017-11-05 21:14:22 +00:00
|
|
|
|
(name, ast::ImplItemKind::Type(typ), generics)
|
2015-05-05 12:47:04 +00:00
|
|
|
|
} else if self.is_const_item() {
|
2017-11-19 05:18:43 +00:00
|
|
|
|
// This parses the grammar:
|
|
|
|
|
// ImplItemConst = "const" Ident ":" Ty "=" Expr ";"
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect_keyword(keywords::Const)?;
|
|
|
|
|
let name = self.parse_ident()?;
|
|
|
|
|
self.expect(&token::Colon)?;
|
2017-01-16 23:13:41 +00:00
|
|
|
|
let typ = self.parse_ty()?;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::Eq)?;
|
|
|
|
|
let expr = self.parse_expr()?;
|
2016-07-01 23:40:45 +00:00
|
|
|
|
self.expect(&token::Semi)?;
|
2017-09-22 02:18:47 +00:00
|
|
|
|
(name, ast::ImplItemKind::Const(typ, expr), ast::Generics::default())
|
2015-03-11 21:38:58 +00:00
|
|
|
|
} else {
|
2017-09-22 02:18:47 +00:00
|
|
|
|
let (name, inner_attrs, generics, node) = self.parse_impl_method(&vis, at_end)?;
|
2015-06-10 16:22:20 +00:00
|
|
|
|
attrs.extend(inner_attrs);
|
2017-09-22 02:18:47 +00:00
|
|
|
|
(name, node, generics)
|
2015-03-13 09:34:51 +00:00
|
|
|
|
};
|
|
|
|
|
|
2016-02-11 20:33:09 +00:00
|
|
|
|
Ok(ImplItem {
|
2015-03-13 09:34:51 +00:00
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span: lo.to(self.prev_span),
|
2015-03-13 09:34:51 +00:00
|
|
|
|
ident: name,
|
2017-08-07 05:54:09 +00:00
|
|
|
|
vis,
|
|
|
|
|
defaultness,
|
|
|
|
|
attrs,
|
2017-09-22 02:18:47 +00:00
|
|
|
|
generics,
|
2017-08-07 05:54:09 +00:00
|
|
|
|
node,
|
2017-07-12 16:50:05 +00:00
|
|
|
|
tokens: None,
|
2016-02-11 20:33:09 +00:00
|
|
|
|
})
|
2014-10-06 14:53:05 +00:00
|
|
|
|
}
|
|
|
|
|
|
2018-01-29 05:12:09 +00:00
|
|
|
|
fn complain_if_pub_macro(&mut self, vis: &VisibilityKind, sp: Span) {
|
2017-03-25 06:00:21 +00:00
|
|
|
|
if let Err(mut err) = self.complain_if_pub_macro_diag(vis, sp) {
|
|
|
|
|
err.emit();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-29 05:12:09 +00:00
|
|
|
|
fn complain_if_pub_macro_diag(&mut self, vis: &VisibilityKind, sp: Span) -> PResult<'a, ()> {
|
2017-03-25 06:00:21 +00:00
|
|
|
|
match *vis {
|
2018-01-29 05:12:09 +00:00
|
|
|
|
VisibilityKind::Inherited => Ok(()),
|
2016-03-31 19:10:38 +00:00
|
|
|
|
_ => {
|
2015-12-29 12:59:19 +00:00
|
|
|
|
let is_macro_rules: bool = match self.token {
|
2018-03-10 05:56:40 +00:00
|
|
|
|
token::Ident(sid, _) => sid.name == Symbol::intern("macro_rules"),
|
2015-12-28 04:31:11 +00:00
|
|
|
|
_ => false,
|
|
|
|
|
};
|
|
|
|
|
if is_macro_rules {
|
2017-03-25 06:00:21 +00:00
|
|
|
|
let mut err = self.diagnostic()
|
|
|
|
|
.struct_span_err(sp, "can't qualify macro_rules invocation with `pub`");
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
err.span_suggestion_with_applicability(
|
|
|
|
|
sp,
|
|
|
|
|
"try exporting the macro",
|
|
|
|
|
"#[macro_export]".to_owned(),
|
|
|
|
|
Applicability::MaybeIncorrect // speculative
|
|
|
|
|
);
|
2017-03-25 06:00:21 +00:00
|
|
|
|
Err(err)
|
2015-12-28 04:31:11 +00:00
|
|
|
|
} else {
|
2017-03-25 06:00:21 +00:00
|
|
|
|
let mut err = self.diagnostic()
|
|
|
|
|
.struct_span_err(sp, "can't qualify macro invocation with `pub`");
|
|
|
|
|
err.help("try adjusting the macro to put `pub` inside the invocation");
|
|
|
|
|
Err(err)
|
2015-12-28 04:31:11 +00:00
|
|
|
|
}
|
2015-02-13 04:43:57 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-04-13 19:37:05 +00:00
|
|
|
|
fn missing_assoc_item_kind_err(&mut self, item_type: &str, prev_span: Span)
|
|
|
|
|
-> DiagnosticBuilder<'a>
|
|
|
|
|
{
|
2018-03-11 02:16:26 +00:00
|
|
|
|
let expected_kinds = if item_type == "extern" {
|
|
|
|
|
"missing `fn`, `type`, or `static`"
|
|
|
|
|
} else {
|
|
|
|
|
"missing `fn`, `type`, or `const`"
|
|
|
|
|
};
|
|
|
|
|
|
2017-04-13 19:37:05 +00:00
|
|
|
|
// Given this code `path(`, it seems like this is not
|
|
|
|
|
// setting the visibility of a macro invocation, but rather
|
|
|
|
|
// a mistyped method declaration.
|
|
|
|
|
// Create a diagnostic pointing out that `fn` is missing.
|
|
|
|
|
//
|
|
|
|
|
// x | pub path(&self) {
|
|
|
|
|
// | ^ missing `fn`, `type`, or `const`
|
|
|
|
|
// pub path(
|
|
|
|
|
// ^^ `sp` below will point to this
|
|
|
|
|
let sp = prev_span.between(self.prev_span);
|
|
|
|
|
let mut err = self.diagnostic().struct_span_err(
|
|
|
|
|
sp,
|
2018-03-11 02:16:26 +00:00
|
|
|
|
&format!("{} for {}-item declaration",
|
|
|
|
|
expected_kinds, item_type));
|
|
|
|
|
err.span_label(sp, expected_kinds);
|
2017-04-13 19:37:05 +00:00
|
|
|
|
err
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-13 09:34:51 +00:00
|
|
|
|
/// Parse a method or a macro invocation in a trait impl.
|
2017-04-13 19:37:05 +00:00
|
|
|
|
fn parse_impl_method(&mut self, vis: &Visibility, at_end: &mut bool)
|
2017-12-02 19:15:03 +00:00
|
|
|
|
-> PResult<'a, (Ident, Vec<Attribute>, ast::Generics,
|
2017-09-22 02:22:33 +00:00
|
|
|
|
ast::ImplItemKind)> {
|
2014-07-07 22:15:31 +00:00
|
|
|
|
// code copied from parse_macro_use_or_failure... abstraction!
|
2018-03-11 02:16:26 +00:00
|
|
|
|
if let Some(mac) = self.parse_assoc_macro_invoc("impl", Some(vis), at_end)? {
|
2017-03-25 06:00:21 +00:00
|
|
|
|
// Method macro.
|
2017-09-22 02:22:33 +00:00
|
|
|
|
Ok((keywords::Invalid.ident(), vec![], ast::Generics::default(),
|
|
|
|
|
ast::ImplItemKind::Macro(mac)))
|
2015-03-13 09:34:51 +00:00
|
|
|
|
} else {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let (constness, unsafety, abi) = self.parse_fn_front_matter()?;
|
|
|
|
|
let ident = self.parse_ident()?;
|
|
|
|
|
let mut generics = self.parse_generics()?;
|
2016-03-06 12:54:44 +00:00
|
|
|
|
let decl = self.parse_fn_decl_with_self(|p| p.parse_arg())?;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
generics.where_clause = self.parse_where_clause()?;
|
2017-04-13 19:37:05 +00:00
|
|
|
|
*at_end = true;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let (inner_attrs, body) = self.parse_inner_attrs_and_block()?;
|
2017-09-22 02:18:47 +00:00
|
|
|
|
Ok((ident, inner_attrs, generics, ast::ImplItemKind::Method(ast::MethodSig {
|
2017-08-07 05:54:09 +00:00
|
|
|
|
abi,
|
|
|
|
|
unsafety,
|
|
|
|
|
constness,
|
|
|
|
|
decl,
|
2015-03-28 21:58:51 +00:00
|
|
|
|
}, body)))
|
2015-03-13 09:34:51 +00:00
|
|
|
|
}
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-10-02 12:27:45 +00:00
|
|
|
|
/// Parse `trait Foo { ... }` or `trait Foo = Bar;`
|
2017-10-15 18:03:03 +00:00
|
|
|
|
fn parse_item_trait(&mut self, is_auto: IsAuto, unsafety: Unsafety) -> PResult<'a, ItemInfo> {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let ident = self.parse_ident()?;
|
|
|
|
|
let mut tps = self.parse_generics()?;
|
2012-08-03 22:24:11 +00:00
|
|
|
|
|
2017-01-17 18:18:29 +00:00
|
|
|
|
// Parse optional colon and supertrait bounds.
|
|
|
|
|
let bounds = if self.eat(&token::Colon) {
|
|
|
|
|
self.parse_ty_param_bounds()?
|
|
|
|
|
} else {
|
|
|
|
|
Vec::new()
|
|
|
|
|
};
|
2012-08-03 22:02:01 +00:00
|
|
|
|
|
2017-10-02 12:27:45 +00:00
|
|
|
|
if self.eat(&token::Eq) {
|
|
|
|
|
// it's a trait alias
|
|
|
|
|
let bounds = self.parse_ty_param_bounds()?;
|
|
|
|
|
tps.where_clause = self.parse_where_clause()?;
|
|
|
|
|
self.expect(&token::Semi)?;
|
|
|
|
|
if unsafety != Unsafety::Normal {
|
|
|
|
|
self.span_err(self.prev_span, "trait aliases cannot be unsafe");
|
|
|
|
|
}
|
|
|
|
|
Ok((ident, ItemKind::TraitAlias(tps, bounds), None))
|
|
|
|
|
} else {
|
|
|
|
|
// it's a normal trait
|
|
|
|
|
tps.where_clause = self.parse_where_clause()?;
|
|
|
|
|
self.expect(&token::OpenDelim(token::Brace))?;
|
|
|
|
|
let mut trait_items = vec![];
|
|
|
|
|
while !self.eat(&token::CloseDelim(token::Brace)) {
|
|
|
|
|
let mut at_end = false;
|
|
|
|
|
match self.parse_trait_item(&mut at_end) {
|
|
|
|
|
Ok(item) => trait_items.push(item),
|
|
|
|
|
Err(mut e) => {
|
|
|
|
|
e.emit();
|
|
|
|
|
if !at_end {
|
|
|
|
|
self.recover_stmt_(SemiColonMode::Break, BlockMode::Break);
|
|
|
|
|
}
|
2017-04-13 19:37:05 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2017-10-02 12:27:45 +00:00
|
|
|
|
Ok((ident, ItemKind::Trait(is_auto, unsafety, tps, bounds, trait_items), None))
|
2017-04-13 19:37:05 +00:00
|
|
|
|
}
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2018-01-14 15:10:19 +00:00
|
|
|
|
fn choose_generics_over_qpath(&self) -> bool {
|
|
|
|
|
// There's an ambiguity between generic parameters and qualified paths in impls.
|
|
|
|
|
// If we see `<` it may start both, so we have to inspect some following tokens.
|
|
|
|
|
// The following combinations can only start generics,
|
|
|
|
|
// but not qualified paths (with one exception):
|
|
|
|
|
// `<` `>` - empty generic parameters
|
|
|
|
|
// `<` `#` - generic parameters with attributes
|
|
|
|
|
// `<` (LIFETIME|IDENT) `>` - single generic parameter
|
|
|
|
|
// `<` (LIFETIME|IDENT) `,` - first generic parameter in a list
|
|
|
|
|
// `<` (LIFETIME|IDENT) `:` - generic parameter with bounds
|
|
|
|
|
// `<` (LIFETIME|IDENT) `=` - generic parameter with a default
|
|
|
|
|
// The only truly ambiguous case is
|
|
|
|
|
// `<` IDENT `>` `::` IDENT ...
|
|
|
|
|
// we disambiguate it in favor of generics (`impl<T> ::absolute::Path<T> { ... }`)
|
|
|
|
|
// because this is what almost always expected in practice, qualified paths in impls
|
|
|
|
|
// (`impl <Type>::AssocTy { ... }`) aren't even allowed by type checker at the moment.
|
|
|
|
|
self.token == token::Lt &&
|
|
|
|
|
(self.look_ahead(1, |t| t == &token::Pound || t == &token::Gt) ||
|
|
|
|
|
self.look_ahead(1, |t| t.is_lifetime() || t.is_ident()) &&
|
|
|
|
|
self.look_ahead(2, |t| t == &token::Gt || t == &token::Comma ||
|
|
|
|
|
t == &token::Colon || t == &token::Eq))
|
|
|
|
|
}
|
|
|
|
|
|
2017-12-02 19:15:03 +00:00
|
|
|
|
fn parse_impl_body(&mut self) -> PResult<'a, (Vec<ImplItem>, Vec<Attribute>)> {
|
|
|
|
|
self.expect(&token::OpenDelim(token::Brace))?;
|
|
|
|
|
let attrs = self.parse_inner_attributes()?;
|
2015-01-22 21:14:52 +00:00
|
|
|
|
|
2017-12-02 19:15:03 +00:00
|
|
|
|
let mut impl_items = Vec::new();
|
|
|
|
|
while !self.eat(&token::CloseDelim(token::Brace)) {
|
|
|
|
|
let mut at_end = false;
|
|
|
|
|
match self.parse_impl_item(&mut at_end) {
|
|
|
|
|
Ok(impl_item) => impl_items.push(impl_item),
|
|
|
|
|
Err(mut err) => {
|
|
|
|
|
err.emit();
|
|
|
|
|
if !at_end {
|
|
|
|
|
self.recover_stmt_(SemiColonMode::Break, BlockMode::Break);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
Ok((impl_items, attrs))
|
|
|
|
|
}
|
2012-07-24 23:38:24 +00:00
|
|
|
|
|
2017-12-02 19:15:03 +00:00
|
|
|
|
/// Parses an implementation item, `impl` keyword is already parsed.
|
|
|
|
|
/// impl<'a, T> TYPE { /* impl items */ }
|
|
|
|
|
/// impl<'a, T> TRAIT for TYPE { /* impl items */ }
|
|
|
|
|
/// impl<'a, T> !TRAIT for TYPE { /* impl items */ }
|
|
|
|
|
/// We actually parse slightly more relaxed grammar for better error reporting and recovery.
|
|
|
|
|
/// `impl` GENERICS `!`? TYPE `for`? (TYPE | `..`) (`where` PREDICATES)? `{` BODY `}`
|
|
|
|
|
/// `impl` GENERICS `!`? TYPE (`where` PREDICATES)? `{` BODY `}`
|
|
|
|
|
fn parse_item_impl(&mut self, unsafety: Unsafety, defaultness: Defaultness)
|
|
|
|
|
-> PResult<'a, ItemInfo> {
|
|
|
|
|
// First, parse generic parameters if necessary.
|
2018-01-14 15:10:19 +00:00
|
|
|
|
let mut generics = if self.choose_generics_over_qpath() {
|
|
|
|
|
self.parse_generics()?
|
|
|
|
|
} else {
|
|
|
|
|
ast::Generics::default()
|
|
|
|
|
};
|
2013-03-29 01:55:35 +00:00
|
|
|
|
|
2017-12-02 19:15:03 +00:00
|
|
|
|
// Disambiguate `impl !Trait for Type { ... }` and `impl ! { ... }` for the never type.
|
|
|
|
|
let polarity = if self.check(&token::Not) && self.look_ahead(1, |t| t.can_begin_type()) {
|
|
|
|
|
self.bump(); // `!`
|
2014-12-28 22:33:18 +00:00
|
|
|
|
ast::ImplPolarity::Negative
|
|
|
|
|
} else {
|
|
|
|
|
ast::ImplPolarity::Positive
|
|
|
|
|
};
|
|
|
|
|
|
2017-12-02 19:15:03 +00:00
|
|
|
|
// Parse both types and traits as a type, then reinterpret if necessary.
|
|
|
|
|
let ty_first = self.parse_ty()?;
|
|
|
|
|
|
|
|
|
|
// If `for` is missing we try to recover.
|
|
|
|
|
let has_for = self.eat_keyword(keywords::For);
|
|
|
|
|
let missing_for_span = self.prev_span.between(self.span);
|
|
|
|
|
|
|
|
|
|
let ty_second = if self.token == token::DotDot {
|
|
|
|
|
// We need to report this error after `cfg` expansion for compatibility reasons
|
|
|
|
|
self.bump(); // `..`, do not add it to expected tokens
|
|
|
|
|
Some(P(Ty { node: TyKind::Err, span: self.prev_span, id: ast::DUMMY_NODE_ID }))
|
|
|
|
|
} else if has_for || self.token.can_begin_type() {
|
|
|
|
|
Some(self.parse_ty()?)
|
2012-08-08 22:34:17 +00:00
|
|
|
|
} else {
|
2012-09-07 22:11:26 +00:00
|
|
|
|
None
|
2012-08-08 22:34:17 +00:00
|
|
|
|
};
|
2012-07-24 23:38:24 +00:00
|
|
|
|
|
2017-12-01 12:01:23 +00:00
|
|
|
|
generics.where_clause = self.parse_where_clause()?;
|
2015-03-13 09:34:51 +00:00
|
|
|
|
|
2017-12-02 19:15:03 +00:00
|
|
|
|
let (impl_items, attrs) = self.parse_impl_body()?;
|
2015-03-13 09:34:51 +00:00
|
|
|
|
|
2017-12-02 19:15:03 +00:00
|
|
|
|
let item_kind = match ty_second {
|
|
|
|
|
Some(ty_second) => {
|
|
|
|
|
// impl Trait for Type
|
|
|
|
|
if !has_for {
|
|
|
|
|
self.span_err(missing_for_span, "missing `for` in a trait impl");
|
2017-04-13 19:37:05 +00:00
|
|
|
|
}
|
2017-12-02 19:15:03 +00:00
|
|
|
|
|
|
|
|
|
let ty_first = ty_first.into_inner();
|
|
|
|
|
let path = match ty_first.node {
|
|
|
|
|
// This notably includes paths passed through `ty` macro fragments (#46438).
|
|
|
|
|
TyKind::Path(None, path) => path,
|
|
|
|
|
_ => {
|
|
|
|
|
self.span_err(ty_first.span, "expected a trait, found type");
|
2018-03-19 00:54:56 +00:00
|
|
|
|
ast::Path::from_ident(Ident::new(keywords::Invalid.name(), ty_first.span))
|
2017-12-02 19:15:03 +00:00
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
let trait_ref = TraitRef { path, ref_id: ty_first.id };
|
|
|
|
|
|
|
|
|
|
ItemKind::Impl(unsafety, polarity, defaultness,
|
|
|
|
|
generics, Some(trait_ref), ty_second, impl_items)
|
2015-03-13 09:34:51 +00:00
|
|
|
|
}
|
2017-12-02 19:15:03 +00:00
|
|
|
|
None => {
|
|
|
|
|
// impl Type
|
|
|
|
|
ItemKind::Impl(unsafety, polarity, defaultness,
|
|
|
|
|
generics, None, ty_first, impl_items)
|
|
|
|
|
}
|
|
|
|
|
};
|
2017-12-01 12:01:23 +00:00
|
|
|
|
|
2017-12-02 19:15:03 +00:00
|
|
|
|
Ok((keywords::Invalid.ident(), item_kind, Some(attrs)))
|
2012-11-07 02:41:06 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-10-16 19:07:26 +00:00
|
|
|
|
fn parse_late_bound_lifetime_defs(&mut self) -> PResult<'a, Vec<GenericParam>> {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::For) {
|
2017-01-17 18:18:29 +00:00
|
|
|
|
self.expect_lt()?;
|
2017-10-16 19:07:26 +00:00
|
|
|
|
let params = self.parse_generic_params()?;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect_gt()?;
|
2018-03-06 10:22:24 +00:00
|
|
|
|
// We rely on AST validation to rule out invalid cases: There must not be type
|
|
|
|
|
// parameters, and the lifetime parameters must not have bounds.
|
2017-10-16 19:07:26 +00:00
|
|
|
|
Ok(params)
|
2014-11-07 11:53:45 +00:00
|
|
|
|
} else {
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(Vec::new())
|
2014-11-07 11:53:45 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse struct Foo { ... }
|
2015-12-20 21:00:43 +00:00
|
|
|
|
fn parse_item_struct(&mut self) -> PResult<'a, ItemInfo> {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let class_name = self.parse_ident()?;
|
2017-02-17 23:12:47 +00:00
|
|
|
|
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let mut generics = self.parse_generics()?;
|
2012-08-16 00:10:23 +00:00
|
|
|
|
|
2015-01-02 12:02:50 +00:00
|
|
|
|
// There is a special case worth noting here, as reported in issue #17904.
|
|
|
|
|
// If we are parsing a tuple struct it is the case that the where clause
|
|
|
|
|
// should follow the field list. Like so:
|
|
|
|
|
//
|
|
|
|
|
// struct Foo<T>(T) where T: Copy;
|
|
|
|
|
//
|
|
|
|
|
// If we are parsing a normal record-style struct it is the case
|
|
|
|
|
// that the where clause comes before the body, and after the generics.
|
|
|
|
|
// So if we look ahead and see a brace or a where-clause we begin
|
|
|
|
|
// parsing a record style struct.
|
|
|
|
|
//
|
|
|
|
|
// Otherwise if we look ahead and see a paren we parse a tuple-style
|
|
|
|
|
// struct.
|
|
|
|
|
|
2015-10-10 00:28:40 +00:00
|
|
|
|
let vdata = if self.token.is_keyword(keywords::Where) {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
generics.where_clause = self.parse_where_clause()?;
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat(&token::Semi) {
|
2015-01-04 10:35:14 +00:00
|
|
|
|
// If we see a: `struct Foo<T> where T: Copy;` style decl.
|
2015-10-10 00:28:40 +00:00
|
|
|
|
VariantData::Unit(ast::DUMMY_NODE_ID)
|
2015-01-04 10:35:14 +00:00
|
|
|
|
} else {
|
|
|
|
|
// If we see: `struct Foo<T> where T: Copy { ... }`
|
2016-03-23 03:01:37 +00:00
|
|
|
|
VariantData::Struct(self.parse_record_struct_body()?, ast::DUMMY_NODE_ID)
|
2015-01-04 10:35:14 +00:00
|
|
|
|
}
|
|
|
|
|
// No `where` so: `struct Foo<T>;`
|
2015-12-30 23:11:53 +00:00
|
|
|
|
} else if self.eat(&token::Semi) {
|
2015-10-10 00:28:40 +00:00
|
|
|
|
VariantData::Unit(ast::DUMMY_NODE_ID)
|
2015-01-04 10:35:14 +00:00
|
|
|
|
// Record-style struct definition
|
|
|
|
|
} else if self.token == token::OpenDelim(token::Brace) {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
VariantData::Struct(self.parse_record_struct_body()?, ast::DUMMY_NODE_ID)
|
2015-01-04 10:35:14 +00:00
|
|
|
|
// Tuple-style struct definition with optional where-clause.
|
2015-09-07 19:15:36 +00:00
|
|
|
|
} else if self.token == token::OpenDelim(token::Paren) {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let body = VariantData::Tuple(self.parse_tuple_struct_body()?, ast::DUMMY_NODE_ID);
|
|
|
|
|
generics.where_clause = self.parse_where_clause()?;
|
|
|
|
|
self.expect(&token::Semi)?;
|
2015-11-09 15:43:32 +00:00
|
|
|
|
body
|
2015-09-07 19:15:36 +00:00
|
|
|
|
} else {
|
|
|
|
|
let token_str = self.this_token_to_string();
|
2018-02-19 07:08:23 +00:00
|
|
|
|
let mut err = self.fatal(&format!(
|
|
|
|
|
"expected `where`, `{{`, `(`, or `;` after struct name, found `{}`",
|
|
|
|
|
token_str
|
|
|
|
|
));
|
|
|
|
|
err.span_label(self.span, "expected `where`, `{`, `(`, or `;` after struct name");
|
|
|
|
|
return Err(err);
|
2015-01-04 10:35:14 +00:00
|
|
|
|
};
|
2014-08-11 16:32:26 +00:00
|
|
|
|
|
2016-02-09 10:36:51 +00:00
|
|
|
|
Ok((class_name, ItemKind::Struct(vdata, generics), None))
|
2015-01-04 10:35:14 +00:00
|
|
|
|
}
|
2012-08-16 00:10:23 +00:00
|
|
|
|
|
2016-08-08 22:18:47 +00:00
|
|
|
|
/// Parse union Foo { ... }
|
|
|
|
|
fn parse_item_union(&mut self) -> PResult<'a, ItemInfo> {
|
|
|
|
|
let class_name = self.parse_ident()?;
|
2017-02-17 23:12:47 +00:00
|
|
|
|
|
2016-08-08 22:18:47 +00:00
|
|
|
|
let mut generics = self.parse_generics()?;
|
|
|
|
|
|
|
|
|
|
let vdata = if self.token.is_keyword(keywords::Where) {
|
|
|
|
|
generics.where_clause = self.parse_where_clause()?;
|
|
|
|
|
VariantData::Struct(self.parse_record_struct_body()?, ast::DUMMY_NODE_ID)
|
|
|
|
|
} else if self.token == token::OpenDelim(token::Brace) {
|
|
|
|
|
VariantData::Struct(self.parse_record_struct_body()?, ast::DUMMY_NODE_ID)
|
|
|
|
|
} else {
|
|
|
|
|
let token_str = self.this_token_to_string();
|
2018-02-19 07:08:23 +00:00
|
|
|
|
let mut err = self.fatal(&format!(
|
|
|
|
|
"expected `where` or `{{` after union name, found `{}`", token_str));
|
|
|
|
|
err.span_label(self.span, "expected `where` or `{` after union name");
|
|
|
|
|
return Err(err);
|
2016-08-08 22:18:47 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
Ok((class_name, ItemKind::Union(vdata, generics), None))
|
|
|
|
|
}
|
|
|
|
|
|
2017-11-21 14:49:15 +00:00
|
|
|
|
fn consume_block(&mut self, delim: token::DelimToken) {
|
|
|
|
|
let mut brace_depth = 0;
|
|
|
|
|
if !self.eat(&token::OpenDelim(delim)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
loop {
|
|
|
|
|
if self.eat(&token::OpenDelim(delim)) {
|
|
|
|
|
brace_depth += 1;
|
|
|
|
|
} else if self.eat(&token::CloseDelim(delim)) {
|
|
|
|
|
if brace_depth == 0 {
|
|
|
|
|
return;
|
|
|
|
|
} else {
|
|
|
|
|
brace_depth -= 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
} else if self.eat(&token::Eof) || self.eat(&token::CloseDelim(token::NoDelim)) {
|
|
|
|
|
return;
|
|
|
|
|
} else {
|
|
|
|
|
self.bump();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-02-28 15:58:47 +00:00
|
|
|
|
pub fn parse_record_struct_body(&mut self) -> PResult<'a, Vec<StructField>> {
|
2015-01-04 10:35:14 +00:00
|
|
|
|
let mut fields = Vec::new();
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat(&token::OpenDelim(token::Brace)) {
|
2014-10-29 10:37:54 +00:00
|
|
|
|
while self.token != token::CloseDelim(token::Brace) {
|
2017-11-21 14:49:15 +00:00
|
|
|
|
let field = self.parse_struct_decl_field().map_err(|e| {
|
2016-10-18 04:47:58 +00:00
|
|
|
|
self.recover_stmt();
|
|
|
|
|
e
|
2017-11-21 14:49:15 +00:00
|
|
|
|
});
|
|
|
|
|
match field {
|
|
|
|
|
Ok(field) => fields.push(field),
|
|
|
|
|
Err(mut err) => {
|
|
|
|
|
err.emit();
|
|
|
|
|
}
|
|
|
|
|
}
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2017-11-21 14:49:15 +00:00
|
|
|
|
self.eat(&token::CloseDelim(token::Brace));
|
2015-01-04 10:35:14 +00:00
|
|
|
|
} else {
|
|
|
|
|
let token_str = self.this_token_to_string();
|
2018-02-19 07:08:23 +00:00
|
|
|
|
let mut err = self.fatal(&format!(
|
|
|
|
|
"expected `where`, or `{{` after struct name, found `{}`", token_str));
|
|
|
|
|
err.span_label(self.span, "expected `where`, or `{` after struct name");
|
|
|
|
|
return Err(err);
|
2015-01-04 10:35:14 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(fields)
|
2015-01-04 10:35:14 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-02-28 15:58:47 +00:00
|
|
|
|
pub fn parse_tuple_struct_body(&mut self) -> PResult<'a, Vec<StructField>> {
|
2015-01-04 10:35:14 +00:00
|
|
|
|
// This is the case where we find `struct Foo<T>(T) where T: Copy;`
|
2015-09-07 17:08:57 +00:00
|
|
|
|
// Unit like structs are handled in parse_item_struct function
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let fields = self.parse_unspanned_seq(
|
2015-09-07 17:08:57 +00:00
|
|
|
|
&token::OpenDelim(token::Paren),
|
|
|
|
|
&token::CloseDelim(token::Paren),
|
2016-02-23 04:24:42 +00:00
|
|
|
|
SeqSep::trailing_allowed(token::Comma),
|
2015-09-07 17:08:57 +00:00
|
|
|
|
|p| {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let attrs = p.parse_outer_attributes()?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = p.span;
|
2017-03-18 04:13:00 +00:00
|
|
|
|
let vis = p.parse_visibility(true)?;
|
|
|
|
|
let ty = p.parse_ty()?;
|
2016-04-06 08:19:10 +00:00
|
|
|
|
Ok(StructField {
|
2018-05-09 23:26:18 +00:00
|
|
|
|
span: lo.to(ty.span),
|
2017-08-07 05:54:09 +00:00
|
|
|
|
vis,
|
2016-04-02 13:47:53 +00:00
|
|
|
|
ident: None,
|
2015-09-07 17:08:57 +00:00
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2017-08-07 05:54:09 +00:00
|
|
|
|
ty,
|
|
|
|
|
attrs,
|
2016-04-06 08:19:10 +00:00
|
|
|
|
})
|
2016-03-23 03:01:37 +00:00
|
|
|
|
})?;
|
2015-01-04 10:35:14 +00:00
|
|
|
|
|
2015-09-07 17:08:57 +00:00
|
|
|
|
Ok(fields)
|
2012-02-01 03:30:40 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse a structure field declaration
|
2013-12-30 22:04:00 +00:00
|
|
|
|
pub fn parse_single_struct_field(&mut self,
|
2017-03-15 00:22:48 +00:00
|
|
|
|
lo: Span,
|
2014-01-09 13:05:33 +00:00
|
|
|
|
vis: Visibility,
|
2014-02-28 21:09:09 +00:00
|
|
|
|
attrs: Vec<Attribute> )
|
2015-12-20 21:00:43 +00:00
|
|
|
|
-> PResult<'a, StructField> {
|
2018-04-21 13:09:34 +00:00
|
|
|
|
let mut seen_comma: bool = false;
|
2016-08-08 12:35:15 +00:00
|
|
|
|
let a_var = self.parse_name_and_ty(lo, vis, attrs)?;
|
2018-04-21 13:09:34 +00:00
|
|
|
|
if self.token == token::Comma {
|
|
|
|
|
seen_comma = true;
|
|
|
|
|
}
|
2013-12-30 23:09:41 +00:00
|
|
|
|
match self.token {
|
2014-10-27 08:22:52 +00:00
|
|
|
|
token::Comma => {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2013-02-25 03:27:43 +00:00
|
|
|
|
}
|
2014-10-29 10:37:54 +00:00
|
|
|
|
token::CloseDelim(token::Brace) => {}
|
2017-11-23 21:15:31 +00:00
|
|
|
|
token::DocComment(_) => {
|
2018-04-21 13:09:34 +00:00
|
|
|
|
let previous_span = self.prev_span;
|
2017-11-23 21:15:31 +00:00
|
|
|
|
let mut err = self.span_fatal_err(self.span, Error::UselessDocComment);
|
2017-11-24 15:34:24 +00:00
|
|
|
|
self.bump(); // consume the doc comment
|
2018-04-21 13:09:34 +00:00
|
|
|
|
let comma_after_doc_seen = self.eat(&token::Comma);
|
|
|
|
|
// `seen_comma` is always false, because we are inside doc block
|
|
|
|
|
// condition is here to make code more readable
|
|
|
|
|
if seen_comma == false && comma_after_doc_seen == true {
|
|
|
|
|
seen_comma = true;
|
|
|
|
|
}
|
|
|
|
|
if comma_after_doc_seen || self.token == token::CloseDelim(token::Brace) {
|
2017-11-23 21:15:31 +00:00
|
|
|
|
err.emit();
|
|
|
|
|
} else {
|
2018-04-21 13:09:34 +00:00
|
|
|
|
if seen_comma == false {
|
|
|
|
|
let sp = self.sess.codemap().next_point(previous_span);
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
err.span_suggestion_with_applicability(
|
|
|
|
|
sp,
|
|
|
|
|
"missing comma here",
|
|
|
|
|
",".into(),
|
|
|
|
|
Applicability::MachineApplicable
|
|
|
|
|
);
|
2018-04-21 13:09:34 +00:00
|
|
|
|
}
|
2017-11-23 21:15:31 +00:00
|
|
|
|
return Err(err);
|
|
|
|
|
}
|
|
|
|
|
}
|
2018-05-20 04:43:11 +00:00
|
|
|
|
_ => {
|
|
|
|
|
let sp = self.sess.codemap().next_point(self.prev_span);
|
|
|
|
|
let mut err = self.struct_span_err(sp, &format!("expected `,`, or `}}`, found `{}`",
|
|
|
|
|
self.this_token_to_string()));
|
|
|
|
|
if self.token.is_ident() {
|
|
|
|
|
// This is likely another field; emit the diagnostic and keep going
|
|
|
|
|
err.span_suggestion(sp, "try adding a comma", ",".into());
|
|
|
|
|
err.emit();
|
|
|
|
|
} else {
|
|
|
|
|
return Err(err)
|
|
|
|
|
}
|
|
|
|
|
}
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(a_var)
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2012-03-29 01:50:33 +00:00
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse an element of a struct definition
|
2016-02-28 15:58:47 +00:00
|
|
|
|
fn parse_struct_decl_field(&mut self) -> PResult<'a, StructField> {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let attrs = self.parse_outer_attributes()?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
2017-03-18 04:13:00 +00:00
|
|
|
|
let vis = self.parse_visibility(false)?;
|
2016-08-08 12:35:15 +00:00
|
|
|
|
self.parse_single_struct_field(lo, vis, attrs)
|
2012-02-01 03:30:40 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-03-18 04:13:00 +00:00
|
|
|
|
/// Parse `pub`, `pub(crate)` and `pub(in path)` plus shortcuts `pub(self)` for `pub(in self)`
|
|
|
|
|
/// and `pub(super)` for `pub(in super)`. If the following element can't be a tuple (i.e. it's
|
|
|
|
|
/// a function definition, it's not a tuple struct field) and the contents within the parens
|
|
|
|
|
/// isn't valid, emit a proper diagnostic.
|
2017-04-02 04:21:12 +00:00
|
|
|
|
pub fn parse_visibility(&mut self, can_take_tuple: bool) -> PResult<'a, Visibility> {
|
2017-04-02 04:46:51 +00:00
|
|
|
|
maybe_whole!(self, NtVis, |x| x);
|
|
|
|
|
|
2017-11-04 20:56:45 +00:00
|
|
|
|
self.expected_tokens.push(TokenType::Keyword(keywords::Crate));
|
|
|
|
|
if self.is_crate_vis() {
|
|
|
|
|
self.bump(); // `crate`
|
2018-01-29 05:12:09 +00:00
|
|
|
|
return Ok(respan(self.prev_span, VisibilityKind::Crate(CrateSugar::JustCrate)));
|
2017-10-19 21:43:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-04-11 00:39:35 +00:00
|
|
|
|
if !self.eat_keyword(keywords::Pub) {
|
2018-01-29 05:12:09 +00:00
|
|
|
|
return Ok(respan(self.prev_span, VisibilityKind::Inherited))
|
2017-03-07 23:50:13 +00:00
|
|
|
|
}
|
2018-01-29 05:12:09 +00:00
|
|
|
|
let lo = self.prev_span;
|
2017-03-07 23:50:13 +00:00
|
|
|
|
|
|
|
|
|
if self.check(&token::OpenDelim(token::Paren)) {
|
2017-03-18 04:13:00 +00:00
|
|
|
|
// We don't `self.bump()` the `(` yet because this might be a struct definition where
|
|
|
|
|
// `()` or a tuple might be allowed. For example, `struct Struct(pub (), pub (usize));`.
|
|
|
|
|
// Because of this, we only `bump` the `(` if we're assured it is appropriate to do so
|
|
|
|
|
// by the following tokens.
|
2017-03-07 23:50:13 +00:00
|
|
|
|
if self.look_ahead(1, |t| t.is_keyword(keywords::Crate)) {
|
|
|
|
|
// `pub(crate)`
|
|
|
|
|
self.bump(); // `(`
|
|
|
|
|
self.bump(); // `crate`
|
|
|
|
|
self.expect(&token::CloseDelim(token::Paren))?; // `)`
|
2018-01-29 05:12:09 +00:00
|
|
|
|
let vis = respan(
|
|
|
|
|
lo.to(self.prev_span),
|
|
|
|
|
VisibilityKind::Crate(CrateSugar::PubCrate),
|
|
|
|
|
);
|
2017-03-07 23:50:13 +00:00
|
|
|
|
return Ok(vis)
|
|
|
|
|
} else if self.look_ahead(1, |t| t.is_keyword(keywords::In)) {
|
|
|
|
|
// `pub(in path)`
|
|
|
|
|
self.bump(); // `(`
|
|
|
|
|
self.bump(); // `in`
|
2018-03-09 23:02:39 +00:00
|
|
|
|
let path = self.parse_path(PathStyle::Mod)?; // `path`
|
2017-03-07 23:50:13 +00:00
|
|
|
|
self.expect(&token::CloseDelim(token::Paren))?; // `)`
|
2018-01-29 05:12:09 +00:00
|
|
|
|
let vis = respan(lo.to(self.prev_span), VisibilityKind::Restricted {
|
2018-01-27 07:15:00 +00:00
|
|
|
|
path: P(path),
|
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2018-01-29 05:12:09 +00:00
|
|
|
|
});
|
2017-03-07 23:50:13 +00:00
|
|
|
|
return Ok(vis)
|
|
|
|
|
} else if self.look_ahead(2, |t| t == &token::CloseDelim(token::Paren)) &&
|
|
|
|
|
self.look_ahead(1, |t| t.is_keyword(keywords::Super) ||
|
2018-01-27 07:13:50 +00:00
|
|
|
|
t.is_keyword(keywords::SelfValue))
|
|
|
|
|
{
|
2017-03-07 23:50:13 +00:00
|
|
|
|
// `pub(self)` or `pub(super)`
|
|
|
|
|
self.bump(); // `(`
|
2018-03-09 23:02:39 +00:00
|
|
|
|
let path = self.parse_path(PathStyle::Mod)?; // `super`/`self`
|
2017-03-07 23:50:13 +00:00
|
|
|
|
self.expect(&token::CloseDelim(token::Paren))?; // `)`
|
2018-01-29 05:12:09 +00:00
|
|
|
|
let vis = respan(lo.to(self.prev_span), VisibilityKind::Restricted {
|
2018-01-27 07:15:00 +00:00
|
|
|
|
path: P(path),
|
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2018-01-29 05:12:09 +00:00
|
|
|
|
});
|
2017-03-07 23:50:13 +00:00
|
|
|
|
return Ok(vis)
|
2017-03-18 04:13:00 +00:00
|
|
|
|
} else if !can_take_tuple { // Provide this diagnostic if this is not a tuple struct
|
|
|
|
|
// `pub(something) fn ...` or `struct X { pub(something) y: Z }`
|
|
|
|
|
self.bump(); // `(`
|
|
|
|
|
let msg = "incorrect visibility restriction";
|
|
|
|
|
let suggestion = r##"some possible visibility restrictions are:
|
|
|
|
|
`pub(crate)`: visible only on the current crate
|
|
|
|
|
`pub(super)`: visible only in the current module's parent
|
|
|
|
|
`pub(in path::to::module)`: visible only on the specified path"##;
|
|
|
|
|
let path = self.parse_path(PathStyle::Mod)?;
|
|
|
|
|
let path_span = self.prev_span;
|
2017-05-16 13:12:24 +00:00
|
|
|
|
let help_msg = format!("make this visible only to module `{}` with `in`", path);
|
2017-03-18 04:13:00 +00:00
|
|
|
|
self.expect(&token::CloseDelim(token::Paren))?; // `)`
|
2017-05-12 18:05:39 +00:00
|
|
|
|
let mut err = self.span_fatal_help(path_span, msg, suggestion);
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
err.span_suggestion_with_applicability(
|
|
|
|
|
path_span, &help_msg, format!("in {}", path), Applicability::MachineApplicable
|
|
|
|
|
);
|
2017-03-18 04:13:00 +00:00
|
|
|
|
err.emit(); // emit diagnostic, but continue with public visibility
|
2016-04-23 05:40:55 +00:00
|
|
|
|
}
|
2016-04-11 00:39:35 +00:00
|
|
|
|
}
|
2017-03-07 23:50:13 +00:00
|
|
|
|
|
2018-01-29 05:12:09 +00:00
|
|
|
|
Ok(respan(lo, VisibilityKind::Public))
|
2012-02-23 05:47:23 +00:00
|
|
|
|
}
|
2013-03-22 19:56:10 +00:00
|
|
|
|
|
2017-12-02 19:15:03 +00:00
|
|
|
|
/// Parse defaultness: `default` or nothing.
|
|
|
|
|
fn parse_defaultness(&mut self) -> Defaultness {
|
|
|
|
|
// `pub` is included for better error messages
|
|
|
|
|
if self.check_keyword(keywords::Default) &&
|
|
|
|
|
self.look_ahead(1, |t| t.is_keyword(keywords::Impl) ||
|
|
|
|
|
t.is_keyword(keywords::Const) ||
|
|
|
|
|
t.is_keyword(keywords::Fn) ||
|
|
|
|
|
t.is_keyword(keywords::Unsafe) ||
|
|
|
|
|
t.is_keyword(keywords::Extern) ||
|
|
|
|
|
t.is_keyword(keywords::Type) ||
|
|
|
|
|
t.is_keyword(keywords::Pub)) {
|
|
|
|
|
self.bump(); // `default`
|
|
|
|
|
Defaultness::Default
|
2015-12-18 22:38:28 +00:00
|
|
|
|
} else {
|
2017-12-02 19:15:03 +00:00
|
|
|
|
Defaultness::Final
|
2015-12-18 22:38:28 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-13 09:34:51 +00:00
|
|
|
|
/// Given a termination token, parse all of the items in a module
|
2017-03-15 00:22:48 +00:00
|
|
|
|
fn parse_mod_items(&mut self, term: &token::Token, inner_lo: Span) -> PResult<'a, Mod> {
|
2014-12-23 13:07:30 +00:00
|
|
|
|
let mut items = vec![];
|
2016-03-23 03:01:37 +00:00
|
|
|
|
while let Some(item) = self.parse_item()? {
|
2015-03-13 09:34:51 +00:00
|
|
|
|
items.push(item);
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2010-09-23 20:15:51 +00:00
|
|
|
|
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if !self.eat(term) {
|
2015-03-13 09:34:51 +00:00
|
|
|
|
let token_str = self.this_token_to_string();
|
2017-11-25 15:38:30 +00:00
|
|
|
|
let mut err = self.fatal(&format!("expected item, found `{}`", token_str));
|
|
|
|
|
if token_str == ";" {
|
2018-02-19 07:08:23 +00:00
|
|
|
|
let msg = "consider removing this semicolon";
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
err.span_suggestion_short_with_applicability(
|
|
|
|
|
self.span, msg, "".to_string(), Applicability::MachineApplicable
|
|
|
|
|
);
|
2018-02-19 07:08:23 +00:00
|
|
|
|
} else {
|
|
|
|
|
err.span_label(self.span, "expected item");
|
2017-11-25 15:38:30 +00:00
|
|
|
|
}
|
2017-11-25 15:47:05 +00:00
|
|
|
|
return Err(err);
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2011-02-04 16:10:04 +00:00
|
|
|
|
|
2016-06-21 22:08:13 +00:00
|
|
|
|
let hi = if self.span == syntax_pos::DUMMY_SP {
|
2015-07-06 02:13:19 +00:00
|
|
|
|
inner_lo
|
|
|
|
|
} else {
|
2017-03-15 00:22:48 +00:00
|
|
|
|
self.prev_span
|
2015-07-06 02:13:19 +00:00
|
|
|
|
};
|
|
|
|
|
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(ast::Mod {
|
2017-03-15 00:22:48 +00:00
|
|
|
|
inner: inner_lo.to(hi),
|
2017-08-07 05:54:09 +00:00
|
|
|
|
items,
|
2015-03-28 21:58:51 +00:00
|
|
|
|
})
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-12-20 21:00:43 +00:00
|
|
|
|
fn parse_item_const(&mut self, m: Option<Mutability>) -> PResult<'a, ItemInfo> {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let id = self.parse_ident()?;
|
|
|
|
|
self.expect(&token::Colon)?;
|
2017-01-16 23:13:41 +00:00
|
|
|
|
let ty = self.parse_ty()?;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::Eq)?;
|
|
|
|
|
let e = self.parse_expr()?;
|
2016-07-01 23:40:45 +00:00
|
|
|
|
self.expect(&token::Semi)?;
|
rustc: Add `const` globals to the language
This change is an implementation of [RFC 69][rfc] which adds a third kind of
global to the language, `const`. This global is most similar to what the old
`static` was, and if you're unsure about what to use then you should use a
`const`.
The semantics of these three kinds of globals are:
* A `const` does not represent a memory location, but only a value. Constants
are translated as rvalues, which means that their values are directly inlined
at usage location (similar to a #define in C/C++). Constant values are, well,
constant, and can not be modified. Any "modification" is actually a
modification to a local value on the stack rather than the actual constant
itself.
Almost all values are allowed inside constants, whether they have interior
mutability or not. There are a few minor restrictions listed in the RFC, but
they should in general not come up too often.
* A `static` now always represents a memory location (unconditionally). Any
references to the same `static` are actually a reference to the same memory
location. Only values whose types ascribe to `Sync` are allowed in a `static`.
This restriction is in place because many threads may access a `static`
concurrently. Lifting this restriction (and allowing unsafe access) is a
future extension not implemented at this time.
* A `static mut` continues to always represent a memory location. All references
to a `static mut` continue to be `unsafe`.
This is a large breaking change, and many programs will need to be updated
accordingly. A summary of the breaking changes is:
* Statics may no longer be used in patterns. Statics now always represent a
memory location, which can sometimes be modified. To fix code, repurpose the
matched-on-`static` to a `const`.
static FOO: uint = 4;
match n {
FOO => { /* ... */ }
_ => { /* ... */ }
}
change this code to:
const FOO: uint = 4;
match n {
FOO => { /* ... */ }
_ => { /* ... */ }
}
* Statics may no longer refer to other statics by value. Due to statics being
able to change at runtime, allowing them to reference one another could
possibly lead to confusing semantics. If you are in this situation, use a
constant initializer instead. Note, however, that statics may reference other
statics by address, however.
* Statics may no longer be used in constant expressions, such as array lengths.
This is due to the same restrictions as listed above. Use a `const` instead.
[breaking-change]
[rfc]: https://github.com/rust-lang/rfcs/pull/246
2014-10-06 15:17:01 +00:00
|
|
|
|
let item = match m {
|
2016-02-09 10:36:51 +00:00
|
|
|
|
Some(m) => ItemKind::Static(ty, m, e),
|
|
|
|
|
None => ItemKind::Const(ty, e),
|
rustc: Add `const` globals to the language
This change is an implementation of [RFC 69][rfc] which adds a third kind of
global to the language, `const`. This global is most similar to what the old
`static` was, and if you're unsure about what to use then you should use a
`const`.
The semantics of these three kinds of globals are:
* A `const` does not represent a memory location, but only a value. Constants
are translated as rvalues, which means that their values are directly inlined
at usage location (similar to a #define in C/C++). Constant values are, well,
constant, and can not be modified. Any "modification" is actually a
modification to a local value on the stack rather than the actual constant
itself.
Almost all values are allowed inside constants, whether they have interior
mutability or not. There are a few minor restrictions listed in the RFC, but
they should in general not come up too often.
* A `static` now always represents a memory location (unconditionally). Any
references to the same `static` are actually a reference to the same memory
location. Only values whose types ascribe to `Sync` are allowed in a `static`.
This restriction is in place because many threads may access a `static`
concurrently. Lifting this restriction (and allowing unsafe access) is a
future extension not implemented at this time.
* A `static mut` continues to always represent a memory location. All references
to a `static mut` continue to be `unsafe`.
This is a large breaking change, and many programs will need to be updated
accordingly. A summary of the breaking changes is:
* Statics may no longer be used in patterns. Statics now always represent a
memory location, which can sometimes be modified. To fix code, repurpose the
matched-on-`static` to a `const`.
static FOO: uint = 4;
match n {
FOO => { /* ... */ }
_ => { /* ... */ }
}
change this code to:
const FOO: uint = 4;
match n {
FOO => { /* ... */ }
_ => { /* ... */ }
}
* Statics may no longer refer to other statics by value. Due to statics being
able to change at runtime, allowing them to reference one another could
possibly lead to confusing semantics. If you are in this situation, use a
constant initializer instead. Note, however, that statics may reference other
statics by address, however.
* Statics may no longer be used in constant expressions, such as array lengths.
This is due to the same restrictions as listed above. Use a `const` instead.
[breaking-change]
[rfc]: https://github.com/rust-lang/rfcs/pull/246
2014-10-06 15:17:01 +00:00
|
|
|
|
};
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok((id, item, None))
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse a `mod <foo> { ... }` or `mod <foo>;` item
|
2015-12-20 21:00:43 +00:00
|
|
|
|
fn parse_item_mod(&mut self, outer_attrs: &[Attribute]) -> PResult<'a, ItemInfo> {
|
2016-09-14 22:36:42 +00:00
|
|
|
|
let (in_cfg, outer_attrs) = {
|
|
|
|
|
let mut strip_unconfigured = ::config::StripUnconfigured {
|
|
|
|
|
sess: self.sess,
|
|
|
|
|
should_test: false, // irrelevant
|
|
|
|
|
features: None, // don't perform gated feature checking
|
|
|
|
|
};
|
|
|
|
|
let outer_attrs = strip_unconfigured.process_cfg_attrs(outer_attrs.to_owned());
|
2017-01-18 00:13:36 +00:00
|
|
|
|
(!self.cfg_mods || strip_unconfigured.in_cfg(&outer_attrs), outer_attrs)
|
2016-09-14 22:36:42 +00:00
|
|
|
|
};
|
2016-06-29 09:28:50 +00:00
|
|
|
|
|
2013-12-30 23:17:53 +00:00
|
|
|
|
let id_span = self.span;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let id = self.parse_ident()?;
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
if self.check(&token::Semi) {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2017-05-17 22:37:24 +00:00
|
|
|
|
if in_cfg && self.recurse_into_file_modules {
|
2016-09-14 22:36:42 +00:00
|
|
|
|
// This mod is in an external file. Let's go get it!
|
2016-11-14 09:31:03 +00:00
|
|
|
|
let ModulePathSuccess { path, directory_ownership, warn } =
|
2016-11-05 04:16:26 +00:00
|
|
|
|
self.submod_path(id, &outer_attrs, id_span)?;
|
2016-11-14 09:31:03 +00:00
|
|
|
|
let (module, mut attrs) =
|
2016-11-05 04:16:26 +00:00
|
|
|
|
self.eval_src_mod(path, directory_ownership, id.to_string(), id_span)?;
|
2016-11-14 09:31:03 +00:00
|
|
|
|
if warn {
|
2017-12-02 19:15:03 +00:00
|
|
|
|
let attr = Attribute {
|
2016-11-14 09:31:03 +00:00
|
|
|
|
id: attr::mk_attr_id(),
|
|
|
|
|
style: ast::AttrStyle::Outer,
|
2018-03-19 00:54:56 +00:00
|
|
|
|
path: ast::Path::from_ident(Ident::from_str("warn_directory_ownership")),
|
2017-03-03 09:23:59 +00:00
|
|
|
|
tokens: TokenStream::empty(),
|
2016-11-14 09:31:03 +00:00
|
|
|
|
is_sugared_doc: false,
|
|
|
|
|
span: syntax_pos::DUMMY_SP,
|
|
|
|
|
};
|
|
|
|
|
attr::mark_known(&attr);
|
|
|
|
|
attrs.push(attr);
|
|
|
|
|
}
|
2016-11-05 04:16:26 +00:00
|
|
|
|
Ok((id, module, Some(attrs)))
|
2016-09-14 22:36:42 +00:00
|
|
|
|
} else {
|
|
|
|
|
let placeholder = ast::Mod { inner: syntax_pos::DUMMY_SP, items: Vec::new() };
|
|
|
|
|
Ok((id, ItemKind::Mod(placeholder), None))
|
|
|
|
|
}
|
2012-11-10 00:31:44 +00:00
|
|
|
|
} else {
|
2016-11-05 04:16:26 +00:00
|
|
|
|
let old_directory = self.directory.clone();
|
|
|
|
|
self.push_directory(id, &outer_attrs);
|
2017-05-17 22:37:24 +00:00
|
|
|
|
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::OpenDelim(token::Brace))?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let mod_inner_lo = self.span;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let attrs = self.parse_inner_attributes()?;
|
2016-11-05 04:16:26 +00:00
|
|
|
|
let module = self.parse_mod_items(&token::CloseDelim(token::Brace), mod_inner_lo)?;
|
2017-05-17 22:37:24 +00:00
|
|
|
|
|
2016-11-05 04:16:26 +00:00
|
|
|
|
self.directory = old_directory;
|
|
|
|
|
Ok((id, ItemKind::Mod(module), Some(attrs)))
|
2012-11-10 00:31:44 +00:00
|
|
|
|
}
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-11-05 04:16:26 +00:00
|
|
|
|
fn push_directory(&mut self, id: Ident, attrs: &[Attribute]) {
|
2016-11-14 09:31:03 +00:00
|
|
|
|
if let Some(path) = attr::first_attr_value_str_by_name(attrs, "path") {
|
2018-05-18 06:19:35 +00:00
|
|
|
|
self.directory.path.to_mut().push(&path.as_str());
|
2017-11-28 02:14:24 +00:00
|
|
|
|
self.directory.ownership = DirectoryOwnership::Owned { relative: None };
|
2016-09-27 21:14:45 +00:00
|
|
|
|
} else {
|
2018-05-26 12:12:38 +00:00
|
|
|
|
self.directory.path.to_mut().push(&id.as_str());
|
2016-09-27 21:14:45 +00:00
|
|
|
|
}
|
2012-12-11 20:20:27 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-12-02 19:15:03 +00:00
|
|
|
|
pub fn submod_path_from_attr(attrs: &[Attribute], dir_path: &Path) -> Option<PathBuf> {
|
2017-03-24 08:31:26 +00:00
|
|
|
|
attr::first_attr_value_str_by_name(attrs, "path").map(|d| dir_path.join(&d.as_str()))
|
2015-07-03 00:50:18 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Returns either a path to a module, or .
|
2017-11-28 02:14:24 +00:00
|
|
|
|
pub fn default_submod_path(
|
|
|
|
|
id: ast::Ident,
|
|
|
|
|
relative: Option<ast::Ident>,
|
|
|
|
|
dir_path: &Path,
|
|
|
|
|
codemap: &CodeMap) -> ModulePath
|
|
|
|
|
{
|
|
|
|
|
// If we're in a foo.rs file instead of a mod.rs file,
|
|
|
|
|
// we need to look for submodules in
|
|
|
|
|
// `./foo/<id>.rs` and `./foo/<id>/mod.rs` rather than
|
|
|
|
|
// `./<id>.rs` and `./<id>/mod.rs`.
|
|
|
|
|
let relative_prefix_string;
|
|
|
|
|
let relative_prefix = if let Some(ident) = relative {
|
2018-05-26 12:12:38 +00:00
|
|
|
|
relative_prefix_string = format!("{}{}", ident.as_str(), path::MAIN_SEPARATOR);
|
2017-11-28 02:14:24 +00:00
|
|
|
|
&relative_prefix_string
|
|
|
|
|
} else {
|
|
|
|
|
""
|
|
|
|
|
};
|
|
|
|
|
|
2015-07-28 16:07:20 +00:00
|
|
|
|
let mod_name = id.to_string();
|
2017-11-28 02:14:24 +00:00
|
|
|
|
let default_path_str = format!("{}{}.rs", relative_prefix, mod_name);
|
|
|
|
|
let secondary_path_str = format!("{}{}{}mod.rs",
|
|
|
|
|
relative_prefix, mod_name, path::MAIN_SEPARATOR);
|
2015-07-03 00:50:18 +00:00
|
|
|
|
let default_path = dir_path.join(&default_path_str);
|
|
|
|
|
let secondary_path = dir_path.join(&secondary_path_str);
|
|
|
|
|
let default_exists = codemap.file_exists(&default_path);
|
|
|
|
|
let secondary_exists = codemap.file_exists(&secondary_path);
|
|
|
|
|
|
|
|
|
|
let result = match (default_exists, secondary_exists) {
|
2016-11-05 04:16:26 +00:00
|
|
|
|
(true, false) => Ok(ModulePathSuccess {
|
|
|
|
|
path: default_path,
|
2017-11-28 02:14:24 +00:00
|
|
|
|
directory_ownership: DirectoryOwnership::Owned {
|
|
|
|
|
relative: Some(id),
|
|
|
|
|
},
|
2016-11-14 09:31:03 +00:00
|
|
|
|
warn: false,
|
2016-11-05 04:16:26 +00:00
|
|
|
|
}),
|
|
|
|
|
(false, true) => Ok(ModulePathSuccess {
|
|
|
|
|
path: secondary_path,
|
2017-11-28 02:14:24 +00:00
|
|
|
|
directory_ownership: DirectoryOwnership::Owned {
|
|
|
|
|
relative: None,
|
|
|
|
|
},
|
2016-11-14 09:31:03 +00:00
|
|
|
|
warn: false,
|
2016-11-05 04:16:26 +00:00
|
|
|
|
}),
|
2017-02-12 14:18:41 +00:00
|
|
|
|
(false, false) => Err(Error::FileNotFoundForModule {
|
2017-02-12 13:33:17 +00:00
|
|
|
|
mod_name: mod_name.clone(),
|
|
|
|
|
default_path: default_path_str,
|
|
|
|
|
secondary_path: secondary_path_str,
|
|
|
|
|
dir_path: format!("{}", dir_path.display()),
|
2015-07-03 00:50:18 +00:00
|
|
|
|
}),
|
2017-02-12 14:18:41 +00:00
|
|
|
|
(true, true) => Err(Error::DuplicatePaths {
|
2017-02-12 13:33:17 +00:00
|
|
|
|
mod_name: mod_name.clone(),
|
|
|
|
|
default_path: default_path_str,
|
|
|
|
|
secondary_path: secondary_path_str,
|
2015-07-03 00:50:18 +00:00
|
|
|
|
}),
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
ModulePath {
|
|
|
|
|
name: mod_name,
|
|
|
|
|
path_exists: default_exists || secondary_exists,
|
2017-08-07 05:54:09 +00:00
|
|
|
|
result,
|
2015-07-03 00:50:18 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn submod_path(&mut self,
|
|
|
|
|
id: ast::Ident,
|
2017-12-02 19:15:03 +00:00
|
|
|
|
outer_attrs: &[Attribute],
|
2017-05-17 22:37:24 +00:00
|
|
|
|
id_sp: Span)
|
|
|
|
|
-> PResult<'a, ModulePathSuccess> {
|
2016-11-05 04:16:26 +00:00
|
|
|
|
if let Some(path) = Parser::submod_path_from_attr(outer_attrs, &self.directory.path) {
|
|
|
|
|
return Ok(ModulePathSuccess {
|
|
|
|
|
directory_ownership: match path.file_name().and_then(|s| s.to_str()) {
|
2018-01-09 18:54:13 +00:00
|
|
|
|
// All `#[path]` files are treated as though they are a `mod.rs` file.
|
|
|
|
|
// This means that `mod foo;` declarations inside `#[path]`-included
|
|
|
|
|
// files are siblings,
|
|
|
|
|
//
|
|
|
|
|
// Note that this will produce weirdness when a file named `foo.rs` is
|
|
|
|
|
// `#[path]` included and contains a `mod foo;` declaration.
|
|
|
|
|
// If you encounter this, it's your own darn fault :P
|
|
|
|
|
Some(_) => DirectoryOwnership::Owned { relative: None },
|
2016-11-14 09:31:03 +00:00
|
|
|
|
_ => DirectoryOwnership::UnownedViaMod(true),
|
2016-11-05 04:16:26 +00:00
|
|
|
|
},
|
2017-08-07 05:54:09 +00:00
|
|
|
|
path,
|
2016-11-14 09:31:03 +00:00
|
|
|
|
warn: false,
|
2016-11-05 04:16:26 +00:00
|
|
|
|
});
|
2015-07-03 00:50:18 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-11-28 02:14:24 +00:00
|
|
|
|
let relative = match self.directory.ownership {
|
|
|
|
|
DirectoryOwnership::Owned { relative } => {
|
|
|
|
|
// Push the usage onto the list of non-mod.rs mod uses.
|
|
|
|
|
// This is used later for feature-gate error reporting.
|
|
|
|
|
if let Some(cur_file_ident) = relative {
|
|
|
|
|
self.sess
|
|
|
|
|
.non_modrs_mods.borrow_mut()
|
|
|
|
|
.push((cur_file_ident, id_sp));
|
|
|
|
|
}
|
|
|
|
|
relative
|
|
|
|
|
},
|
|
|
|
|
DirectoryOwnership::UnownedViaBlock |
|
|
|
|
|
DirectoryOwnership::UnownedViaMod(_) => None,
|
|
|
|
|
};
|
|
|
|
|
let paths = Parser::default_submod_path(
|
|
|
|
|
id, relative, &self.directory.path, self.sess.codemap());
|
2015-07-03 00:50:18 +00:00
|
|
|
|
|
2017-11-28 02:14:24 +00:00
|
|
|
|
match self.directory.ownership {
|
|
|
|
|
DirectoryOwnership::Owned { .. } => {
|
|
|
|
|
paths.result.map_err(|err| self.span_fatal_err(id_sp, err))
|
|
|
|
|
},
|
|
|
|
|
DirectoryOwnership::UnownedViaBlock => {
|
|
|
|
|
let msg =
|
|
|
|
|
"Cannot declare a non-inline module inside a block \
|
|
|
|
|
unless it has a path attribute";
|
|
|
|
|
let mut err = self.diagnostic().struct_span_err(id_sp, msg);
|
|
|
|
|
if paths.path_exists {
|
|
|
|
|
let msg = format!("Maybe `use` the module `{}` instead of redeclaring it",
|
|
|
|
|
paths.name);
|
|
|
|
|
err.span_note(id_sp, &msg);
|
2016-11-14 09:31:03 +00:00
|
|
|
|
}
|
2017-11-28 02:14:24 +00:00
|
|
|
|
Err(err)
|
2016-11-14 09:31:03 +00:00
|
|
|
|
}
|
2017-11-28 02:14:24 +00:00
|
|
|
|
DirectoryOwnership::UnownedViaMod(warn) => {
|
|
|
|
|
if warn {
|
|
|
|
|
if let Ok(result) = paths.result {
|
|
|
|
|
return Ok(ModulePathSuccess { warn: true, ..result });
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
let mut err = self.diagnostic().struct_span_err(id_sp,
|
|
|
|
|
"cannot declare a new module at this location");
|
|
|
|
|
if id_sp != syntax_pos::DUMMY_SP {
|
|
|
|
|
let src_path = self.sess.codemap().span_to_filename(id_sp);
|
|
|
|
|
if let FileName::Real(src_path) = src_path {
|
|
|
|
|
if let Some(stem) = src_path.file_stem() {
|
|
|
|
|
let mut dest_path = src_path.clone();
|
|
|
|
|
dest_path.set_file_name(stem);
|
|
|
|
|
dest_path.push("mod.rs");
|
|
|
|
|
err.span_note(id_sp,
|
2017-12-14 07:09:19 +00:00
|
|
|
|
&format!("maybe move this module `{}` to its own \
|
|
|
|
|
directory via `{}`", src_path.display(),
|
|
|
|
|
dest_path.display()));
|
2017-11-28 02:14:24 +00:00
|
|
|
|
}
|
2017-12-14 07:09:19 +00:00
|
|
|
|
}
|
2017-01-03 11:19:13 +00:00
|
|
|
|
}
|
2017-11-28 02:14:24 +00:00
|
|
|
|
if paths.path_exists {
|
|
|
|
|
err.span_note(id_sp,
|
|
|
|
|
&format!("... or maybe `use` the module `{}` instead \
|
|
|
|
|
of possibly redeclaring it",
|
|
|
|
|
paths.name));
|
|
|
|
|
}
|
|
|
|
|
Err(err)
|
2016-12-09 00:12:38 +00:00
|
|
|
|
}
|
2015-07-03 00:50:18 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2012-11-19 01:56:50 +00:00
|
|
|
|
|
2015-07-03 00:50:18 +00:00
|
|
|
|
/// Read a module from a source file.
|
|
|
|
|
fn eval_src_mod(&mut self,
|
2016-11-05 04:16:26 +00:00
|
|
|
|
path: PathBuf,
|
|
|
|
|
directory_ownership: DirectoryOwnership,
|
|
|
|
|
name: String,
|
2015-07-03 00:50:18 +00:00
|
|
|
|
id_sp: Span)
|
2017-12-02 19:15:03 +00:00
|
|
|
|
-> PResult<'a, (ast::ItemKind, Vec<Attribute> )> {
|
2014-03-20 22:05:37 +00:00
|
|
|
|
let mut included_mod_stack = self.sess.included_mod_stack.borrow_mut();
|
2016-06-14 05:43:30 +00:00
|
|
|
|
if let Some(i) = included_mod_stack.iter().position(|p| *p == path) {
|
|
|
|
|
let mut err = String::from("circular modules: ");
|
|
|
|
|
let len = included_mod_stack.len();
|
|
|
|
|
for p in &included_mod_stack[i.. len] {
|
|
|
|
|
err.push_str(&p.to_string_lossy());
|
|
|
|
|
err.push_str(" -> ");
|
2013-07-04 17:51:11 +00:00
|
|
|
|
}
|
2016-06-14 05:43:30 +00:00
|
|
|
|
err.push_str(&path.to_string_lossy());
|
|
|
|
|
return Err(self.span_fatal(id_sp, &err[..]));
|
2013-07-04 17:51:11 +00:00
|
|
|
|
}
|
2014-03-20 22:05:37 +00:00
|
|
|
|
included_mod_stack.push(path.clone());
|
|
|
|
|
drop(included_mod_stack);
|
2013-07-04 17:51:11 +00:00
|
|
|
|
|
2016-11-05 04:16:26 +00:00
|
|
|
|
let mut p0 =
|
|
|
|
|
new_sub_parser_from_file(self.sess, &path, directory_ownership, Some(name), id_sp);
|
2017-01-18 00:13:36 +00:00
|
|
|
|
p0.cfg_mods = self.cfg_mods;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let mod_inner_lo = p0.span;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let mod_attrs = p0.parse_inner_attributes()?;
|
|
|
|
|
let m0 = p0.parse_mod_items(&token::Eof, mod_inner_lo)?;
|
2014-03-20 22:05:37 +00:00
|
|
|
|
self.sess.included_mod_stack.borrow_mut().pop();
|
2016-02-09 10:36:51 +00:00
|
|
|
|
Ok((ast::ItemKind::Mod(m0), mod_attrs))
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse a function declaration from a foreign module
|
2017-03-15 00:22:48 +00:00
|
|
|
|
fn parse_item_foreign_fn(&mut self, vis: ast::Visibility, lo: Span, attrs: Vec<Attribute>)
|
|
|
|
|
-> PResult<'a, ForeignItem> {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect_keyword(keywords::Fn)?;
|
2013-08-02 21:30:00 +00:00
|
|
|
|
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let (ident, mut generics) = self.parse_fn_header()?;
|
|
|
|
|
let decl = self.parse_fn_decl(true)?;
|
|
|
|
|
generics.where_clause = self.parse_where_clause()?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let hi = self.span;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::Semi)?;
|
2016-02-11 20:33:09 +00:00
|
|
|
|
Ok(ast::ForeignItem {
|
2017-08-07 05:54:09 +00:00
|
|
|
|
ident,
|
|
|
|
|
attrs,
|
2016-02-09 10:31:19 +00:00
|
|
|
|
node: ForeignItemKind::Fn(decl, generics),
|
2014-09-13 16:06:01 +00:00
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span: lo.to(hi),
|
2017-08-07 05:54:09 +00:00
|
|
|
|
vis,
|
2016-02-11 20:33:09 +00:00
|
|
|
|
})
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-08-09 22:43:06 +00:00
|
|
|
|
/// Parse a static item from a foreign module.
|
|
|
|
|
/// Assumes that the `static` keyword is already parsed.
|
2017-03-15 00:22:48 +00:00
|
|
|
|
fn parse_item_foreign_static(&mut self, vis: ast::Visibility, lo: Span, attrs: Vec<Attribute>)
|
|
|
|
|
-> PResult<'a, ForeignItem> {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
let mutbl = self.eat_keyword(keywords::Mut);
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let ident = self.parse_ident()?;
|
|
|
|
|
self.expect(&token::Colon)?;
|
2017-01-16 23:13:41 +00:00
|
|
|
|
let ty = self.parse_ty()?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let hi = self.span;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::Semi)?;
|
2016-02-11 20:33:09 +00:00
|
|
|
|
Ok(ForeignItem {
|
2017-08-07 05:54:09 +00:00
|
|
|
|
ident,
|
|
|
|
|
attrs,
|
2016-02-09 10:31:19 +00:00
|
|
|
|
node: ForeignItemKind::Static(ty, mutbl),
|
2014-05-16 17:45:16 +00:00
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span: lo.to(hi),
|
2017-08-07 05:54:09 +00:00
|
|
|
|
vis,
|
2016-02-11 20:33:09 +00:00
|
|
|
|
})
|
2012-08-25 22:09:33 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-09-03 18:53:58 +00:00
|
|
|
|
/// Parse a type from a foreign module
|
|
|
|
|
fn parse_item_foreign_type(&mut self, vis: ast::Visibility, lo: Span, attrs: Vec<Attribute>)
|
|
|
|
|
-> PResult<'a, ForeignItem> {
|
|
|
|
|
self.expect_keyword(keywords::Type)?;
|
|
|
|
|
|
|
|
|
|
let ident = self.parse_ident()?;
|
|
|
|
|
let hi = self.span;
|
|
|
|
|
self.expect(&token::Semi)?;
|
|
|
|
|
Ok(ast::ForeignItem {
|
|
|
|
|
ident: ident,
|
|
|
|
|
attrs: attrs,
|
|
|
|
|
node: ForeignItemKind::Ty,
|
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
|
|
|
|
span: lo.to(hi),
|
|
|
|
|
vis: vis
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
2014-02-02 22:52:06 +00:00
|
|
|
|
/// Parse extern crate links
|
|
|
|
|
///
|
2015-03-12 01:11:40 +00:00
|
|
|
|
/// # Examples
|
2014-02-02 22:52:06 +00:00
|
|
|
|
///
|
2015-03-27 00:35:13 +00:00
|
|
|
|
/// extern crate foo;
|
|
|
|
|
/// extern crate bar as foo;
|
2014-02-02 22:52:06 +00:00
|
|
|
|
fn parse_item_extern_crate(&mut self,
|
2017-03-15 00:22:48 +00:00
|
|
|
|
lo: Span,
|
2015-03-27 00:35:13 +00:00
|
|
|
|
visibility: Visibility,
|
|
|
|
|
attrs: Vec<Attribute>)
|
2018-03-09 15:51:48 +00:00
|
|
|
|
-> PResult<'a, P<Item>> {
|
|
|
|
|
let orig_name = self.parse_ident()?;
|
|
|
|
|
let (item_name, orig_name) = if let Some(rename) = self.parse_rename()? {
|
|
|
|
|
(rename, Some(orig_name.name))
|
2015-03-27 00:35:13 +00:00
|
|
|
|
} else {
|
2018-03-09 15:51:48 +00:00
|
|
|
|
(orig_name, None)
|
2012-08-29 19:22:05 +00:00
|
|
|
|
};
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::Semi)?;
|
2012-08-14 18:07:41 +00:00
|
|
|
|
|
2018-03-09 15:51:48 +00:00
|
|
|
|
let span = lo.to(self.prev_span);
|
|
|
|
|
Ok(self.mk_item(span, item_name, ItemKind::ExternCrate(orig_name), visibility, attrs))
|
2014-02-02 22:52:06 +00:00
|
|
|
|
}
|
2012-11-28 01:25:55 +00:00
|
|
|
|
|
2014-02-02 22:52:06 +00:00
|
|
|
|
/// Parse `extern` for foreign ABIs
|
|
|
|
|
/// modules.
|
|
|
|
|
///
|
|
|
|
|
/// `extern` is expected to have been
|
|
|
|
|
/// consumed before calling this method
|
|
|
|
|
///
|
|
|
|
|
/// # Examples:
|
|
|
|
|
///
|
|
|
|
|
/// extern "C" {}
|
|
|
|
|
/// extern {}
|
|
|
|
|
fn parse_item_foreign_mod(&mut self,
|
2017-03-15 00:22:48 +00:00
|
|
|
|
lo: Span,
|
2017-12-02 19:15:03 +00:00
|
|
|
|
opt_abi: Option<Abi>,
|
2014-02-02 22:52:06 +00:00
|
|
|
|
visibility: Visibility,
|
2015-03-13 09:34:51 +00:00
|
|
|
|
mut attrs: Vec<Attribute>)
|
2015-12-20 21:00:43 +00:00
|
|
|
|
-> PResult<'a, P<Item>> {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::OpenDelim(token::Brace))?;
|
2012-08-14 18:07:41 +00:00
|
|
|
|
|
2016-02-05 12:13:36 +00:00
|
|
|
|
let abi = opt_abi.unwrap_or(Abi::C);
|
2012-11-28 01:25:55 +00:00
|
|
|
|
|
2016-03-23 03:01:37 +00:00
|
|
|
|
attrs.extend(self.parse_inner_attributes()?);
|
2015-03-13 09:34:51 +00:00
|
|
|
|
|
|
|
|
|
let mut foreign_items = vec![];
|
2016-03-23 03:01:37 +00:00
|
|
|
|
while let Some(item) = self.parse_foreign_item()? {
|
2015-03-13 09:34:51 +00:00
|
|
|
|
foreign_items.push(item);
|
|
|
|
|
}
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::CloseDelim(token::Brace))?;
|
2013-11-26 22:54:32 +00:00
|
|
|
|
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let prev_span = self.prev_span;
|
2015-03-13 09:34:51 +00:00
|
|
|
|
let m = ast::ForeignMod {
|
2017-08-07 05:54:09 +00:00
|
|
|
|
abi,
|
2015-03-13 09:34:51 +00:00
|
|
|
|
items: foreign_items
|
|
|
|
|
};
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let invalid = keywords::Invalid.ident();
|
|
|
|
|
Ok(self.mk_item(lo.to(prev_span), invalid, ItemKind::ForeignMod(m), visibility, attrs))
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2011-02-01 18:40:04 +00:00
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse type Foo = Bar;
|
2015-12-20 21:00:43 +00:00
|
|
|
|
fn parse_item_type(&mut self) -> PResult<'a, ItemInfo> {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let ident = self.parse_ident()?;
|
|
|
|
|
let mut tps = self.parse_generics()?;
|
|
|
|
|
tps.where_clause = self.parse_where_clause()?;
|
|
|
|
|
self.expect(&token::Eq)?;
|
2017-01-16 23:13:41 +00:00
|
|
|
|
let ty = self.parse_ty()?;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::Semi)?;
|
2016-02-09 10:36:51 +00:00
|
|
|
|
Ok((ident, ItemKind::Ty(ty, tps), None))
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2012-04-19 04:26:25 +00:00
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse the part of an "enum" decl following the '{'
|
2015-12-20 21:00:43 +00:00
|
|
|
|
fn parse_enum_def(&mut self, _generics: &ast::Generics) -> PResult<'a, EnumDef> {
|
2014-02-28 21:09:09 +00:00
|
|
|
|
let mut variants = Vec::new();
|
2013-06-05 04:43:41 +00:00
|
|
|
|
let mut all_nullary = true;
|
2014-09-20 20:29:26 +00:00
|
|
|
|
let mut any_disr = None;
|
2014-10-29 10:37:54 +00:00
|
|
|
|
while self.token != token::CloseDelim(token::Brace) {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let variant_attrs = self.parse_outer_attributes()?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let vlo = self.span;
|
2012-08-09 02:51:19 +00:00
|
|
|
|
|
2015-10-01 15:47:27 +00:00
|
|
|
|
let struct_def;
|
2013-06-05 04:43:41 +00:00
|
|
|
|
let mut disr_expr = None;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let ident = self.parse_ident()?;
|
2015-11-09 15:43:32 +00:00
|
|
|
|
if self.check(&token::OpenDelim(token::Brace)) {
|
2013-03-28 18:29:21 +00:00
|
|
|
|
// Parse a struct variant.
|
|
|
|
|
all_nullary = false;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
struct_def = VariantData::Struct(self.parse_record_struct_body()?,
|
2015-11-09 15:43:32 +00:00
|
|
|
|
ast::DUMMY_NODE_ID);
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
} else if self.check(&token::OpenDelim(token::Paren)) {
|
2013-03-28 18:29:21 +00:00
|
|
|
|
all_nullary = false;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
struct_def = VariantData::Tuple(self.parse_tuple_struct_body()?,
|
2015-11-09 15:43:32 +00:00
|
|
|
|
ast::DUMMY_NODE_ID);
|
2015-12-30 23:11:53 +00:00
|
|
|
|
} else if self.eat(&token::Eq) {
|
2018-05-17 18:28:50 +00:00
|
|
|
|
disr_expr = Some(AnonConst {
|
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
|
|
|
|
value: self.parse_expr()?,
|
|
|
|
|
});
|
|
|
|
|
any_disr = disr_expr.as_ref().map(|c| c.value.span);
|
2015-11-09 15:43:32 +00:00
|
|
|
|
struct_def = VariantData::Unit(ast::DUMMY_NODE_ID);
|
2013-03-28 18:29:21 +00:00
|
|
|
|
} else {
|
2015-11-09 15:43:32 +00:00
|
|
|
|
struct_def = VariantData::Unit(ast::DUMMY_NODE_ID);
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2012-01-25 13:10:33 +00:00
|
|
|
|
|
2014-01-09 13:05:33 +00:00
|
|
|
|
let vr = ast::Variant_ {
|
2018-03-18 22:21:30 +00:00
|
|
|
|
ident,
|
2013-01-16 00:05:20 +00:00
|
|
|
|
attrs: variant_attrs,
|
2015-10-08 00:20:57 +00:00
|
|
|
|
data: struct_def,
|
2017-08-07 05:54:09 +00:00
|
|
|
|
disr_expr,
|
2013-01-16 00:05:20 +00:00
|
|
|
|
};
|
2017-03-15 00:22:48 +00:00
|
|
|
|
variants.push(respan(vlo.to(self.prev_span), vr));
|
2012-01-25 13:10:33 +00:00
|
|
|
|
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if !self.eat(&token::Comma) { break; }
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::CloseDelim(token::Brace))?;
|
2014-09-20 20:29:26 +00:00
|
|
|
|
match any_disr {
|
|
|
|
|
Some(disr_span) if !all_nullary =>
|
|
|
|
|
self.span_err(disr_span,
|
2017-11-22 17:59:14 +00:00
|
|
|
|
"discriminator values can only be used with a field-less enum"),
|
2014-09-20 20:29:26 +00:00
|
|
|
|
_ => ()
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2012-08-08 21:17:52 +00:00
|
|
|
|
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(ast::EnumDef { variants: variants })
|
2012-08-08 21:17:52 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parse an "enum" declaration
|
2015-12-20 21:00:43 +00:00
|
|
|
|
fn parse_item_enum(&mut self) -> PResult<'a, ItemInfo> {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let id = self.parse_ident()?;
|
|
|
|
|
let mut generics = self.parse_generics()?;
|
|
|
|
|
generics.where_clause = self.parse_where_clause()?;
|
|
|
|
|
self.expect(&token::OpenDelim(token::Brace))?;
|
2012-08-08 21:17:52 +00:00
|
|
|
|
|
2016-10-18 04:47:58 +00:00
|
|
|
|
let enum_definition = self.parse_enum_def(&generics).map_err(|e| {
|
|
|
|
|
self.recover_stmt();
|
|
|
|
|
self.eat(&token::CloseDelim(token::Brace));
|
|
|
|
|
e
|
|
|
|
|
})?;
|
2016-02-09 10:36:51 +00:00
|
|
|
|
Ok((id, ItemKind::Enum(enum_definition, generics), None))
|
2012-01-10 21:50:40 +00:00
|
|
|
|
}
|
2010-11-24 19:36:35 +00:00
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parses a string as an ABI spec on an extern type or module. Consumes
|
|
|
|
|
/// the `extern` keyword, if one is found.
|
2017-12-02 19:15:03 +00:00
|
|
|
|
fn parse_opt_abi(&mut self) -> PResult<'a, Option<Abi>> {
|
2013-12-30 23:09:41 +00:00
|
|
|
|
match self.token {
|
2014-11-19 04:48:38 +00:00
|
|
|
|
token::Literal(token::Str_(s), suf) | token::Literal(token::StrRaw(s, _), suf) => {
|
|
|
|
|
let sp = self.span;
|
|
|
|
|
self.expect_no_suffix(sp, "ABI spec", suf);
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2015-07-28 16:07:20 +00:00
|
|
|
|
match abi::lookup(&s.as_str()) {
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Some(abi) => Ok(Some(abi)),
|
2014-04-02 08:19:41 +00:00
|
|
|
|
None => {
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let prev_span = self.prev_span;
|
2014-04-02 08:19:41 +00:00
|
|
|
|
self.span_err(
|
2016-09-21 02:09:22 +00:00
|
|
|
|
prev_span,
|
2015-07-27 00:49:38 +00:00
|
|
|
|
&format!("invalid ABI: expected one of [{}], \
|
2014-05-16 17:45:16 +00:00
|
|
|
|
found `{}`",
|
2015-07-10 12:19:21 +00:00
|
|
|
|
abi::all_names().join(", "),
|
2015-07-28 16:07:20 +00:00
|
|
|
|
s));
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(None)
|
2014-04-02 08:19:41 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2013-03-14 02:25:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-03-28 21:58:51 +00:00
|
|
|
|
_ => Ok(None),
|
2014-04-02 08:19:41 +00:00
|
|
|
|
}
|
2013-03-14 02:25:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
2017-10-07 14:36:28 +00:00
|
|
|
|
fn is_static_global(&mut self) -> bool {
|
|
|
|
|
if self.check_keyword(keywords::Static) {
|
|
|
|
|
// Check if this could be a closure
|
|
|
|
|
!self.look_ahead(1, |token| {
|
|
|
|
|
if token.is_keyword(keywords::Move) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
match *token {
|
|
|
|
|
token::BinOp(token::Or) | token::OrOr => true,
|
|
|
|
|
_ => false,
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
} else {
|
|
|
|
|
false
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-13 09:34:51 +00:00
|
|
|
|
/// Parse one of the items allowed by the flags.
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// NB: this function no longer parses the items inside an
|
|
|
|
|
/// extern crate.
|
2014-12-23 13:07:30 +00:00
|
|
|
|
fn parse_item_(&mut self, attrs: Vec<Attribute>,
|
2015-12-20 21:00:43 +00:00
|
|
|
|
macros_allowed: bool, attributes_allowed: bool) -> PResult<'a, Option<P<Item>>> {
|
2016-11-02 03:03:55 +00:00
|
|
|
|
maybe_whole!(self, NtItem, |item| {
|
2017-12-16 23:21:29 +00:00
|
|
|
|
let mut item = item.into_inner();
|
2016-07-03 21:38:37 +00:00
|
|
|
|
let mut attrs = attrs;
|
|
|
|
|
mem::swap(&mut item.attrs, &mut attrs);
|
|
|
|
|
item.attrs.extend(attrs);
|
2016-11-02 03:03:55 +00:00
|
|
|
|
Some(P(item))
|
|
|
|
|
});
|
2013-08-08 17:28:06 +00:00
|
|
|
|
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
2012-08-03 20:58:14 +00:00
|
|
|
|
|
2017-03-18 04:13:00 +00:00
|
|
|
|
let visibility = self.parse_visibility(false)?;
|
2013-04-01 22:50:58 +00:00
|
|
|
|
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::Use) {
|
2014-12-23 13:07:30 +00:00
|
|
|
|
// USE ITEM
|
2018-03-09 23:02:39 +00:00
|
|
|
|
let item_ = ItemKind::Use(P(self.parse_use_tree()?));
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::Semi)?;
|
2014-12-23 13:07:30 +00:00
|
|
|
|
|
2018-03-10 15:44:44 +00:00
|
|
|
|
let span = lo.to(self.prev_span);
|
|
|
|
|
let item = self.mk_item(span, keywords::Invalid.ident(), item_, visibility, attrs);
|
2015-03-28 21:58:51 +00:00
|
|
|
|
return Ok(Some(item));
|
2012-08-03 20:58:14 +00:00
|
|
|
|
}
|
2014-12-23 13:07:30 +00:00
|
|
|
|
|
2018-01-01 14:42:32 +00:00
|
|
|
|
if self.check_keyword(keywords::Extern) && self.is_extern_non_path() {
|
|
|
|
|
self.bump(); // `extern`
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::Crate) {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
return Ok(Some(self.parse_item_extern_crate(lo, visibility, attrs)?));
|
2014-02-02 22:52:06 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let opt_abi = self.parse_opt_abi()?;
|
2012-08-03 20:58:14 +00:00
|
|
|
|
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::Fn) {
|
2013-04-01 22:50:58 +00:00
|
|
|
|
// EXTERN FUNCTION ITEM
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let fn_span = self.prev_span;
|
2016-02-05 12:13:36 +00:00
|
|
|
|
let abi = opt_abi.unwrap_or(Abi::C);
|
2013-04-01 22:50:58 +00:00
|
|
|
|
let (ident, item_, extra_attrs) =
|
2016-08-10 23:20:12 +00:00
|
|
|
|
self.parse_item_fn(Unsafety::Normal,
|
|
|
|
|
respan(fn_span, Constness::NotConst),
|
|
|
|
|
abi)?;
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let prev_span = self.prev_span;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let item = self.mk_item(lo.to(prev_span),
|
2013-12-30 22:04:00 +00:00
|
|
|
|
ident,
|
|
|
|
|
item_,
|
|
|
|
|
visibility,
|
|
|
|
|
maybe_append(attrs, extra_attrs));
|
2015-03-28 21:58:51 +00:00
|
|
|
|
return Ok(Some(item));
|
Make the parser’s ‘expected <foo>, found <bar>’ errors more accurate
As an example of what this changes, the following code:
let x: [int ..4];
Currently spits out ‘expected `]`, found `..`’. However, a comma would also be
valid there, as would a number of other tokens. This change adjusts the parser
to produce more accurate errors, so that that example now produces ‘expected one
of `(`, `+`, `,`, `::`, or `]`, found `..`’.
2014-12-03 09:47:53 +00:00
|
|
|
|
} else if self.check(&token::OpenDelim(token::Brace)) {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
return Ok(Some(self.parse_item_foreign_mod(lo, opt_abi, visibility, attrs)?));
|
2013-04-01 22:50:58 +00:00
|
|
|
|
}
|
2014-02-02 22:52:06 +00:00
|
|
|
|
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.unexpected()?;
|
2013-04-01 22:50:58 +00:00
|
|
|
|
}
|
2014-02-02 22:52:06 +00:00
|
|
|
|
|
2017-10-07 14:36:28 +00:00
|
|
|
|
if self.is_static_global() {
|
|
|
|
|
self.bump();
|
2013-10-03 09:53:46 +00:00
|
|
|
|
// STATIC ITEM
|
2016-02-09 16:44:47 +00:00
|
|
|
|
let m = if self.eat_keyword(keywords::Mut) {
|
|
|
|
|
Mutability::Mutable
|
|
|
|
|
} else {
|
|
|
|
|
Mutability::Immutable
|
|
|
|
|
};
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let (ident, item_, extra_attrs) = self.parse_item_const(Some(m))?;
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let prev_span = self.prev_span;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let item = self.mk_item(lo.to(prev_span),
|
2014-10-02 22:06:08 +00:00
|
|
|
|
ident,
|
|
|
|
|
item_,
|
|
|
|
|
visibility,
|
|
|
|
|
maybe_append(attrs, extra_attrs));
|
2015-03-28 21:58:51 +00:00
|
|
|
|
return Ok(Some(item));
|
2014-10-02 22:06:08 +00:00
|
|
|
|
}
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::Const) {
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let const_span = self.prev_span;
|
2015-10-24 08:52:07 +00:00
|
|
|
|
if self.check_keyword(keywords::Fn)
|
|
|
|
|
|| (self.check_keyword(keywords::Unsafe)
|
|
|
|
|
&& self.look_ahead(1, |t| t.is_keyword(keywords::Fn))) {
|
2015-02-25 20:05:07 +00:00
|
|
|
|
// CONST FUNCTION ITEM
|
2017-12-02 19:15:03 +00:00
|
|
|
|
let unsafety = self.parse_unsafety();
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2015-02-25 20:05:07 +00:00
|
|
|
|
let (ident, item_, extra_attrs) =
|
2016-08-10 23:20:12 +00:00
|
|
|
|
self.parse_item_fn(unsafety,
|
|
|
|
|
respan(const_span, Constness::Const),
|
|
|
|
|
Abi::Rust)?;
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let prev_span = self.prev_span;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let item = self.mk_item(lo.to(prev_span),
|
2015-02-25 20:05:07 +00:00
|
|
|
|
ident,
|
|
|
|
|
item_,
|
|
|
|
|
visibility,
|
|
|
|
|
maybe_append(attrs, extra_attrs));
|
2015-05-05 12:47:04 +00:00
|
|
|
|
return Ok(Some(item));
|
2015-02-25 20:05:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-10-02 22:06:08 +00:00
|
|
|
|
// CONST ITEM
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::Mut) {
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let prev_span = self.prev_span;
|
|
|
|
|
self.diagnostic().struct_span_err(prev_span, "const globals cannot be mutable")
|
2016-04-20 18:49:16 +00:00
|
|
|
|
.help("did you mean to declare a static?")
|
2015-12-20 21:00:43 +00:00
|
|
|
|
.emit();
|
2014-10-02 22:06:08 +00:00
|
|
|
|
}
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let (ident, item_, extra_attrs) = self.parse_item_const(None)?;
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let prev_span = self.prev_span;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let item = self.mk_item(lo.to(prev_span),
|
2013-12-30 22:04:00 +00:00
|
|
|
|
ident,
|
|
|
|
|
item_,
|
|
|
|
|
visibility,
|
|
|
|
|
maybe_append(attrs, extra_attrs));
|
2015-03-28 21:58:51 +00:00
|
|
|
|
return Ok(Some(item));
|
2013-03-20 01:00:18 +00:00
|
|
|
|
}
|
2015-01-16 03:04:28 +00:00
|
|
|
|
if self.check_keyword(keywords::Unsafe) &&
|
2017-10-15 18:03:03 +00:00
|
|
|
|
(self.look_ahead(1, |t| t.is_keyword(keywords::Trait)) ||
|
|
|
|
|
self.look_ahead(1, |t| t.is_keyword(keywords::Auto)))
|
2014-12-10 00:59:20 +00:00
|
|
|
|
{
|
|
|
|
|
// UNSAFE TRAIT ITEM
|
2017-12-02 19:15:03 +00:00
|
|
|
|
self.bump(); // `unsafe`
|
2017-10-15 18:03:03 +00:00
|
|
|
|
let is_auto = if self.eat_keyword(keywords::Trait) {
|
|
|
|
|
IsAuto::No
|
|
|
|
|
} else {
|
2017-12-04 22:55:14 +00:00
|
|
|
|
self.expect_keyword(keywords::Auto)?;
|
|
|
|
|
self.expect_keyword(keywords::Trait)?;
|
2017-10-15 18:03:03 +00:00
|
|
|
|
IsAuto::Yes
|
|
|
|
|
};
|
2014-12-10 00:59:20 +00:00
|
|
|
|
let (ident, item_, extra_attrs) =
|
2017-12-02 19:15:03 +00:00
|
|
|
|
self.parse_item_trait(is_auto, Unsafety::Unsafe)?;
|
2017-10-12 22:00:30 +00:00
|
|
|
|
let prev_span = self.prev_span;
|
|
|
|
|
let item = self.mk_item(lo.to(prev_span),
|
|
|
|
|
ident,
|
|
|
|
|
item_,
|
|
|
|
|
visibility,
|
|
|
|
|
maybe_append(attrs, extra_attrs));
|
|
|
|
|
return Ok(Some(item));
|
|
|
|
|
}
|
2017-12-02 19:15:03 +00:00
|
|
|
|
if self.check_keyword(keywords::Impl) ||
|
|
|
|
|
self.check_keyword(keywords::Unsafe) &&
|
|
|
|
|
self.look_ahead(1, |t| t.is_keyword(keywords::Impl)) ||
|
|
|
|
|
self.check_keyword(keywords::Default) &&
|
|
|
|
|
self.look_ahead(1, |t| t.is_keyword(keywords::Impl)) ||
|
|
|
|
|
self.check_keyword(keywords::Default) &&
|
|
|
|
|
self.look_ahead(1, |t| t.is_keyword(keywords::Unsafe)) {
|
2014-12-10 11:15:06 +00:00
|
|
|
|
// IMPL ITEM
|
2017-12-02 19:15:03 +00:00
|
|
|
|
let defaultness = self.parse_defaultness();
|
|
|
|
|
let unsafety = self.parse_unsafety();
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect_keyword(keywords::Impl)?;
|
2017-12-02 19:15:03 +00:00
|
|
|
|
let (ident, item, extra_attrs) = self.parse_item_impl(unsafety, defaultness)?;
|
|
|
|
|
let span = lo.to(self.prev_span);
|
|
|
|
|
return Ok(Some(self.mk_item(span, ident, item, visibility,
|
|
|
|
|
maybe_append(attrs, extra_attrs))));
|
2014-12-10 11:15:06 +00:00
|
|
|
|
}
|
2015-01-16 03:04:28 +00:00
|
|
|
|
if self.check_keyword(keywords::Fn) {
|
2013-03-29 17:35:23 +00:00
|
|
|
|
// FUNCTION ITEM
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let fn_span = self.prev_span;
|
2013-03-14 02:25:28 +00:00
|
|
|
|
let (ident, item_, extra_attrs) =
|
2016-08-10 23:20:12 +00:00
|
|
|
|
self.parse_item_fn(Unsafety::Normal,
|
|
|
|
|
respan(fn_span, Constness::NotConst),
|
|
|
|
|
Abi::Rust)?;
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let prev_span = self.prev_span;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let item = self.mk_item(lo.to(prev_span),
|
2013-12-30 22:04:00 +00:00
|
|
|
|
ident,
|
|
|
|
|
item_,
|
|
|
|
|
visibility,
|
|
|
|
|
maybe_append(attrs, extra_attrs));
|
2015-03-28 21:58:51 +00:00
|
|
|
|
return Ok(Some(item));
|
2013-03-20 01:00:18 +00:00
|
|
|
|
}
|
2015-01-16 03:04:28 +00:00
|
|
|
|
if self.check_keyword(keywords::Unsafe)
|
2015-01-28 01:01:48 +00:00
|
|
|
|
&& self.look_ahead(1, |t| *t != token::OpenDelim(token::Brace)) {
|
2013-04-01 22:50:58 +00:00
|
|
|
|
// UNSAFE FUNCTION ITEM
|
2017-12-02 19:15:03 +00:00
|
|
|
|
self.bump(); // `unsafe`
|
2018-02-19 18:07:45 +00:00
|
|
|
|
// `{` is also expected after `unsafe`, in case of error, include it in the diagnostic
|
|
|
|
|
self.check(&token::OpenDelim(token::Brace));
|
2015-12-30 23:11:53 +00:00
|
|
|
|
let abi = if self.eat_keyword(keywords::Extern) {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.parse_opt_abi()?.unwrap_or(Abi::C)
|
2014-05-07 01:43:56 +00:00
|
|
|
|
} else {
|
2016-02-05 12:13:36 +00:00
|
|
|
|
Abi::Rust
|
2014-05-07 01:43:56 +00:00
|
|
|
|
};
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect_keyword(keywords::Fn)?;
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let fn_span = self.prev_span;
|
2013-03-14 02:25:28 +00:00
|
|
|
|
let (ident, item_, extra_attrs) =
|
2016-08-10 23:20:12 +00:00
|
|
|
|
self.parse_item_fn(Unsafety::Unsafe,
|
|
|
|
|
respan(fn_span, Constness::NotConst),
|
|
|
|
|
abi)?;
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let prev_span = self.prev_span;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let item = self.mk_item(lo.to(prev_span),
|
2013-12-30 22:04:00 +00:00
|
|
|
|
ident,
|
|
|
|
|
item_,
|
|
|
|
|
visibility,
|
|
|
|
|
maybe_append(attrs, extra_attrs));
|
2015-03-28 21:58:51 +00:00
|
|
|
|
return Ok(Some(item));
|
2013-03-20 01:00:18 +00:00
|
|
|
|
}
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::Mod) {
|
2013-02-11 21:36:24 +00:00
|
|
|
|
// MODULE ITEM
|
2014-02-28 20:54:01 +00:00
|
|
|
|
let (ident, item_, extra_attrs) =
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.parse_item_mod(&attrs[..])?;
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let prev_span = self.prev_span;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let item = self.mk_item(lo.to(prev_span),
|
2013-12-30 22:04:00 +00:00
|
|
|
|
ident,
|
|
|
|
|
item_,
|
|
|
|
|
visibility,
|
|
|
|
|
maybe_append(attrs, extra_attrs));
|
2015-03-28 21:58:51 +00:00
|
|
|
|
return Ok(Some(item));
|
2013-03-20 01:00:18 +00:00
|
|
|
|
}
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::Type) {
|
2013-02-11 21:36:24 +00:00
|
|
|
|
// TYPE ITEM
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let (ident, item_, extra_attrs) = self.parse_item_type()?;
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let prev_span = self.prev_span;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let item = self.mk_item(lo.to(prev_span),
|
2013-12-30 22:04:00 +00:00
|
|
|
|
ident,
|
|
|
|
|
item_,
|
|
|
|
|
visibility,
|
|
|
|
|
maybe_append(attrs, extra_attrs));
|
2015-03-28 21:58:51 +00:00
|
|
|
|
return Ok(Some(item));
|
2013-03-20 01:00:18 +00:00
|
|
|
|
}
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::Enum) {
|
2013-02-11 21:36:24 +00:00
|
|
|
|
// ENUM ITEM
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let (ident, item_, extra_attrs) = self.parse_item_enum()?;
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let prev_span = self.prev_span;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let item = self.mk_item(lo.to(prev_span),
|
2013-12-30 22:04:00 +00:00
|
|
|
|
ident,
|
|
|
|
|
item_,
|
|
|
|
|
visibility,
|
|
|
|
|
maybe_append(attrs, extra_attrs));
|
2015-03-28 21:58:51 +00:00
|
|
|
|
return Ok(Some(item));
|
2013-03-20 01:00:18 +00:00
|
|
|
|
}
|
2017-10-15 18:03:03 +00:00
|
|
|
|
if self.check_keyword(keywords::Trait)
|
|
|
|
|
|| (self.check_keyword(keywords::Auto)
|
|
|
|
|
&& self.look_ahead(1, |t| t.is_keyword(keywords::Trait)))
|
|
|
|
|
{
|
|
|
|
|
let is_auto = if self.eat_keyword(keywords::Trait) {
|
|
|
|
|
IsAuto::No
|
|
|
|
|
} else {
|
2017-12-04 22:55:14 +00:00
|
|
|
|
self.expect_keyword(keywords::Auto)?;
|
|
|
|
|
self.expect_keyword(keywords::Trait)?;
|
2017-10-15 18:03:03 +00:00
|
|
|
|
IsAuto::Yes
|
|
|
|
|
};
|
2013-02-11 21:36:24 +00:00
|
|
|
|
// TRAIT ITEM
|
2014-12-10 00:59:20 +00:00
|
|
|
|
let (ident, item_, extra_attrs) =
|
2017-12-02 19:15:03 +00:00
|
|
|
|
self.parse_item_trait(is_auto, Unsafety::Normal)?;
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let prev_span = self.prev_span;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let item = self.mk_item(lo.to(prev_span),
|
2013-12-30 22:04:00 +00:00
|
|
|
|
ident,
|
|
|
|
|
item_,
|
|
|
|
|
visibility,
|
|
|
|
|
maybe_append(attrs, extra_attrs));
|
2015-03-28 21:58:51 +00:00
|
|
|
|
return Ok(Some(item));
|
2013-03-20 01:00:18 +00:00
|
|
|
|
}
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::Struct) {
|
2013-02-11 21:36:24 +00:00
|
|
|
|
// STRUCT ITEM
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let (ident, item_, extra_attrs) = self.parse_item_struct()?;
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let prev_span = self.prev_span;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let item = self.mk_item(lo.to(prev_span),
|
2016-08-08 22:18:47 +00:00
|
|
|
|
ident,
|
|
|
|
|
item_,
|
|
|
|
|
visibility,
|
|
|
|
|
maybe_append(attrs, extra_attrs));
|
|
|
|
|
return Ok(Some(item));
|
|
|
|
|
}
|
2016-10-19 20:33:41 +00:00
|
|
|
|
if self.is_union_item() {
|
2016-08-08 22:18:47 +00:00
|
|
|
|
// UNION ITEM
|
2016-08-18 15:31:47 +00:00
|
|
|
|
self.bump();
|
2016-08-08 22:18:47 +00:00
|
|
|
|
let (ident, item_, extra_attrs) = self.parse_item_union()?;
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let prev_span = self.prev_span;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let item = self.mk_item(lo.to(prev_span),
|
2013-12-30 22:04:00 +00:00
|
|
|
|
ident,
|
|
|
|
|
item_,
|
|
|
|
|
visibility,
|
|
|
|
|
maybe_append(attrs, extra_attrs));
|
2015-03-28 21:58:51 +00:00
|
|
|
|
return Ok(Some(item));
|
2013-03-20 01:00:18 +00:00
|
|
|
|
}
|
2017-09-06 21:11:16 +00:00
|
|
|
|
if let Some(macro_def) = self.eat_macro_def(&attrs, &visibility, lo)? {
|
2017-03-05 05:15:58 +00:00
|
|
|
|
return Ok(Some(macro_def));
|
|
|
|
|
}
|
|
|
|
|
|
2018-02-16 14:56:50 +00:00
|
|
|
|
// Verify whether we have encountered a struct or method definition where the user forgot to
|
2017-11-15 01:49:29 +00:00
|
|
|
|
// add the `struct` or `fn` keyword after writing `pub`: `pub S {}`
|
2018-01-29 05:12:09 +00:00
|
|
|
|
if visibility.node == VisibilityKind::Public &&
|
2017-11-21 14:49:15 +00:00
|
|
|
|
self.check_ident() &&
|
|
|
|
|
self.look_ahead(1, |t| *t != token::Not)
|
|
|
|
|
{
|
2017-11-15 01:49:29 +00:00
|
|
|
|
// Space between `pub` keyword and the identifier
|
|
|
|
|
//
|
|
|
|
|
// pub S {}
|
|
|
|
|
// ^^^ `sp` points here
|
|
|
|
|
let sp = self.prev_span.between(self.span);
|
2017-11-22 17:49:27 +00:00
|
|
|
|
let full_sp = self.prev_span.to(self.span);
|
|
|
|
|
let ident_sp = self.span;
|
2017-11-15 01:49:29 +00:00
|
|
|
|
if self.look_ahead(1, |t| *t == token::OpenDelim(token::Brace)) {
|
|
|
|
|
// possible public struct definition where `struct` was forgotten
|
|
|
|
|
let ident = self.parse_ident().unwrap();
|
2017-11-21 14:49:15 +00:00
|
|
|
|
let msg = format!("add `struct` here to parse `{}` as a public struct",
|
|
|
|
|
ident);
|
|
|
|
|
let mut err = self.diagnostic()
|
|
|
|
|
.struct_span_err(sp, "missing `struct` for struct definition");
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
err.span_suggestion_short_with_applicability(
|
|
|
|
|
sp, &msg, " struct ".into(), Applicability::MaybeIncorrect // speculative
|
|
|
|
|
);
|
2017-11-21 16:03:02 +00:00
|
|
|
|
return Err(err);
|
2017-11-15 01:49:29 +00:00
|
|
|
|
} else if self.look_ahead(1, |t| *t == token::OpenDelim(token::Paren)) {
|
|
|
|
|
let ident = self.parse_ident().unwrap();
|
2017-11-21 14:49:15 +00:00
|
|
|
|
self.consume_block(token::Paren);
|
2017-11-21 16:03:02 +00:00
|
|
|
|
let (kw, kw_name, ambiguous) = if self.check(&token::RArrow) ||
|
|
|
|
|
self.check(&token::OpenDelim(token::Brace))
|
|
|
|
|
{
|
|
|
|
|
("fn", "method", false)
|
2017-11-21 14:49:15 +00:00
|
|
|
|
} else if self.check(&token::Colon) {
|
|
|
|
|
let kw = "struct";
|
2017-11-21 16:03:02 +00:00
|
|
|
|
(kw, kw, false)
|
2017-11-21 14:49:15 +00:00
|
|
|
|
} else {
|
2017-11-21 16:03:02 +00:00
|
|
|
|
("fn` or `struct", "method or struct", true)
|
2017-11-21 14:49:15 +00:00
|
|
|
|
};
|
|
|
|
|
|
2017-11-21 16:03:02 +00:00
|
|
|
|
let msg = format!("missing `{}` for {} definition", kw, kw_name);
|
2017-11-21 14:49:15 +00:00
|
|
|
|
let mut err = self.diagnostic().struct_span_err(sp, &msg);
|
|
|
|
|
if !ambiguous {
|
2017-11-21 16:03:02 +00:00
|
|
|
|
let suggestion = format!("add `{}` here to parse `{}` as a public {}",
|
|
|
|
|
kw,
|
2017-11-21 14:49:15 +00:00
|
|
|
|
ident,
|
2017-11-21 16:03:02 +00:00
|
|
|
|
kw_name);
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
err.span_suggestion_short_with_applicability(
|
|
|
|
|
sp, &suggestion, format!(" {} ", kw), Applicability::MachineApplicable
|
|
|
|
|
);
|
2017-11-22 17:49:27 +00:00
|
|
|
|
} else {
|
|
|
|
|
if let Ok(snippet) = self.sess.codemap().span_to_snippet(ident_sp) {
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
err.span_suggestion_with_applicability(
|
2017-11-22 17:49:27 +00:00
|
|
|
|
full_sp,
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
"if you meant to call a macro, try",
|
|
|
|
|
format!("{}!", snippet),
|
|
|
|
|
// this is the `ambiguous` conditional branch
|
|
|
|
|
Applicability::MaybeIncorrect
|
|
|
|
|
);
|
2017-11-22 17:49:27 +00:00
|
|
|
|
} else {
|
|
|
|
|
err.help("if you meant to call a macro, remove the `pub` \
|
|
|
|
|
and add a trailing `!` after the identifier");
|
|
|
|
|
}
|
2017-11-15 01:49:29 +00:00
|
|
|
|
}
|
2017-11-21 16:03:02 +00:00
|
|
|
|
return Err(err);
|
2017-11-15 01:49:29 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
self.parse_macro_use_or_failure(attrs, macros_allowed, attributes_allowed, lo, visibility)
|
2013-04-01 22:50:58 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-03-13 09:34:51 +00:00
|
|
|
|
/// Parse a foreign item.
|
2018-03-11 02:16:26 +00:00
|
|
|
|
pub fn parse_foreign_item(&mut self) -> PResult<'a, Option<ForeignItem>> {
|
|
|
|
|
maybe_whole!(self, NtForeignItem, |ni| Some(ni));
|
|
|
|
|
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let attrs = self.parse_outer_attributes()?;
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
2017-03-18 04:13:00 +00:00
|
|
|
|
let visibility = self.parse_visibility(false)?;
|
2013-04-01 22:50:58 +00:00
|
|
|
|
|
2017-08-09 22:43:06 +00:00
|
|
|
|
// FOREIGN STATIC ITEM
|
|
|
|
|
// Treat `const` as `static` for error recovery, but don't add it to expected tokens.
|
|
|
|
|
if self.check_keyword(keywords::Static) || self.token.is_keyword(keywords::Const) {
|
|
|
|
|
if self.token.is_keyword(keywords::Const) {
|
|
|
|
|
self.diagnostic()
|
|
|
|
|
.struct_span_err(self.span, "extern items cannot be `const`")
|
suggestion applicabilities for libsyntax and librustc, run-rustfix tests
Consider this a down payment on #50723. To recap, an `Applicability`
enum was recently (#50204) added, to convey to Rustfix and other tools
whether we think it's OK for them to blindly apply the suggestion, or
whether to prompt a human for guidance (because the suggestion might
contain placeholders that we can't infer, or because we think it has a
sufficiently high probability of being wrong even though it's—
presumably—right often enough to be worth emitting in the first place).
When a suggestion is marked as `MaybeIncorrect`, we try to use comments
to indicate precisely why (although there are a few places where we just
say `// speculative` because the present author's subjective judgement
balked at the idea that the suggestion has no false positives).
The `run-rustfix` directive is opporunistically set on some relevant UI
tests (and a couple tests that were in the `test/ui/suggestions`
directory, even if the suggestions didn't originate in librustc or
libsyntax). This is less trivial than it sounds, because a surprising
number of test files aren't equipped to be tested as fixed even when
they contain successfully fixable errors, because, e.g., there are more,
not-directly-related errors after fixing. Some test files need an
attribute or underscore to avoid unused warnings tripping up the "fixed
code is still producing diagnostics" check despite the fixes being
correct; this is an interesting contrast-to/inconsistency-with the
behavior of UI tests (which secretly pass `-A unused`), a behavior which
we probably ought to resolve one way or the other (filed issue #50926).
A few suggestion labels are reworded (e.g., to avoid phrasing it as a
question, which which is discouraged by the style guidelines listed in
`.span_suggestion`'s doc-comment).
2018-05-19 21:52:24 +00:00
|
|
|
|
.span_suggestion_with_applicability(
|
|
|
|
|
self.span,
|
|
|
|
|
"try using a static value",
|
|
|
|
|
"static".to_owned(),
|
|
|
|
|
Applicability::MachineApplicable
|
|
|
|
|
).emit();
|
2017-08-09 22:43:06 +00:00
|
|
|
|
}
|
|
|
|
|
self.bump(); // `static` or `const`
|
2016-03-23 03:01:37 +00:00
|
|
|
|
return Ok(Some(self.parse_item_foreign_static(visibility, lo, attrs)?));
|
2013-04-01 22:50:58 +00:00
|
|
|
|
}
|
2017-08-09 22:43:06 +00:00
|
|
|
|
// FOREIGN FUNCTION ITEM
|
2016-05-02 06:45:38 +00:00
|
|
|
|
if self.check_keyword(keywords::Fn) {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
return Ok(Some(self.parse_item_foreign_fn(visibility, lo, attrs)?));
|
2013-03-20 01:00:18 +00:00
|
|
|
|
}
|
2017-09-03 18:53:58 +00:00
|
|
|
|
// FOREIGN TYPE ITEM
|
|
|
|
|
if self.check_keyword(keywords::Type) {
|
|
|
|
|
return Ok(Some(self.parse_item_foreign_type(visibility, lo, attrs)?));
|
|
|
|
|
}
|
2014-12-23 13:07:30 +00:00
|
|
|
|
|
2018-03-11 02:16:26 +00:00
|
|
|
|
match self.parse_assoc_macro_invoc("extern", Some(&visibility), &mut false)? {
|
|
|
|
|
Some(mac) => {
|
|
|
|
|
Ok(Some(
|
|
|
|
|
ForeignItem {
|
|
|
|
|
ident: keywords::Invalid.ident(),
|
|
|
|
|
span: lo.to(self.prev_span),
|
|
|
|
|
id: ast::DUMMY_NODE_ID,
|
|
|
|
|
attrs,
|
|
|
|
|
vis: visibility,
|
|
|
|
|
node: ForeignItemKind::Macro(mac),
|
|
|
|
|
}
|
|
|
|
|
))
|
|
|
|
|
}
|
|
|
|
|
None => {
|
|
|
|
|
if !attrs.is_empty() {
|
|
|
|
|
self.expected_item_err(&attrs);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Ok(None)
|
2015-03-13 09:34:51 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2013-04-01 22:50:58 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// This is the fall-through for parsing items.
|
2013-04-01 22:50:58 +00:00
|
|
|
|
fn parse_macro_use_or_failure(
|
2013-12-30 22:04:00 +00:00
|
|
|
|
&mut self,
|
2014-02-28 21:09:09 +00:00
|
|
|
|
attrs: Vec<Attribute> ,
|
2013-04-01 22:50:58 +00:00
|
|
|
|
macros_allowed: bool,
|
2015-11-03 16:39:51 +00:00
|
|
|
|
attributes_allowed: bool,
|
2017-03-15 00:22:48 +00:00
|
|
|
|
lo: Span,
|
2014-01-09 13:05:33 +00:00
|
|
|
|
visibility: Visibility
|
2015-12-20 21:00:43 +00:00
|
|
|
|
) -> PResult<'a, Option<P<Item>>> {
|
2016-09-22 07:05:05 +00:00
|
|
|
|
if macros_allowed && self.token.is_path_start() {
|
2013-02-11 21:36:24 +00:00
|
|
|
|
// MACRO INVOCATION ITEM
|
2012-11-22 03:38:27 +00:00
|
|
|
|
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let prev_span = self.prev_span;
|
2018-01-29 05:12:09 +00:00
|
|
|
|
self.complain_if_pub_macro(&visibility.node, prev_span);
|
2015-02-13 04:43:57 +00:00
|
|
|
|
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let mac_lo = self.span;
|
2015-11-26 19:14:10 +00:00
|
|
|
|
|
2012-07-05 19:10:33 +00:00
|
|
|
|
// item macro.
|
2016-09-22 07:05:05 +00:00
|
|
|
|
let pth = self.parse_path(PathStyle::Mod)?;
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.expect(&token::Not)?;
|
2012-11-19 05:36:26 +00:00
|
|
|
|
|
|
|
|
|
// a 'special' identifier (like what `macro_rules!` uses)
|
|
|
|
|
// is optional. We should eventually unify invoc syntax
|
|
|
|
|
// and remove this.
|
2016-04-16 01:10:59 +00:00
|
|
|
|
let id = if self.token.is_ident() {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
self.parse_ident()?
|
2012-11-21 19:49:19 +00:00
|
|
|
|
} else {
|
2016-04-18 21:42:18 +00:00
|
|
|
|
keywords::Invalid.ident() // no special identifier
|
2012-11-09 04:12:45 +00:00
|
|
|
|
};
|
2013-02-11 21:36:24 +00:00
|
|
|
|
// eat a matched-delimiter token tree:
|
2017-01-31 02:21:24 +00:00
|
|
|
|
let (delim, tts) = self.expect_delimited_token_tree()?;
|
2018-05-22 15:01:21 +00:00
|
|
|
|
if delim != MacDelimiter::Brace {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if !self.eat(&token::Semi) {
|
2017-07-20 04:54:01 +00:00
|
|
|
|
self.span_err(self.prev_span,
|
2014-11-14 17:18:10 +00:00
|
|
|
|
"macros that expand to items must either \
|
|
|
|
|
be surrounded with braces or followed by \
|
|
|
|
|
a semicolon");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let hi = self.prev_span;
|
2018-05-22 15:01:21 +00:00
|
|
|
|
let mac = respan(mac_lo.to(hi), Mac_ { path: pth, tts, delim });
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let item = self.mk_item(lo.to(hi), id, ItemKind::Mac(mac), visibility, attrs);
|
2015-03-28 21:58:51 +00:00
|
|
|
|
return Ok(Some(item));
|
2013-03-20 01:00:18 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// FAILURE TO PARSE ITEM
|
2018-01-29 05:12:09 +00:00
|
|
|
|
match visibility.node {
|
|
|
|
|
VisibilityKind::Inherited => {}
|
2016-03-31 19:10:38 +00:00
|
|
|
|
_ => {
|
2017-07-20 04:54:01 +00:00
|
|
|
|
return Err(self.span_fatal(self.prev_span, "unmatched visibility `pub`"));
|
2013-06-12 02:13:42 +00:00
|
|
|
|
}
|
2013-03-20 01:00:18 +00:00
|
|
|
|
}
|
2015-03-13 09:34:51 +00:00
|
|
|
|
|
2015-11-03 16:39:51 +00:00
|
|
|
|
if !attributes_allowed && !attrs.is_empty() {
|
2015-03-13 09:34:51 +00:00
|
|
|
|
self.expected_item_err(&attrs);
|
|
|
|
|
}
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(None)
|
2012-08-14 00:11:52 +00:00
|
|
|
|
}
|
|
|
|
|
|
2018-03-11 02:16:26 +00:00
|
|
|
|
/// Parse a macro invocation inside a `trait`, `impl` or `extern` block
|
|
|
|
|
fn parse_assoc_macro_invoc(&mut self, item_kind: &str, vis: Option<&Visibility>,
|
|
|
|
|
at_end: &mut bool) -> PResult<'a, Option<Mac>>
|
|
|
|
|
{
|
|
|
|
|
if self.token.is_path_start() && !self.is_extern_non_path() {
|
|
|
|
|
let prev_span = self.prev_span;
|
|
|
|
|
let lo = self.span;
|
|
|
|
|
let pth = self.parse_path(PathStyle::Mod)?;
|
|
|
|
|
|
|
|
|
|
if pth.segments.len() == 1 {
|
|
|
|
|
if !self.eat(&token::Not) {
|
|
|
|
|
return Err(self.missing_assoc_item_kind_err(item_kind, prev_span));
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
self.expect(&token::Not)?;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if let Some(vis) = vis {
|
|
|
|
|
self.complain_if_pub_macro(&vis.node, prev_span);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*at_end = true;
|
|
|
|
|
|
|
|
|
|
// eat a matched-delimiter token tree:
|
|
|
|
|
let (delim, tts) = self.expect_delimited_token_tree()?;
|
2018-05-22 15:01:21 +00:00
|
|
|
|
if delim != MacDelimiter::Brace {
|
2018-03-11 02:16:26 +00:00
|
|
|
|
self.expect(&token::Semi)?
|
|
|
|
|
}
|
|
|
|
|
|
2018-05-22 15:01:21 +00:00
|
|
|
|
Ok(Some(respan(lo.to(self.prev_span), Mac_ { path: pth, tts, delim })))
|
2018-03-11 02:16:26 +00:00
|
|
|
|
} else {
|
|
|
|
|
Ok(None)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-07-12 16:50:05 +00:00
|
|
|
|
fn collect_tokens<F, R>(&mut self, f: F) -> PResult<'a, (R, TokenStream)>
|
|
|
|
|
where F: FnOnce(&mut Self) -> PResult<'a, R>
|
|
|
|
|
{
|
|
|
|
|
// Record all tokens we parse when parsing this item.
|
|
|
|
|
let mut tokens = Vec::new();
|
|
|
|
|
match self.token_cursor.frame.last_token {
|
|
|
|
|
LastToken::Collecting(_) => {
|
|
|
|
|
panic!("cannot collect tokens recursively yet")
|
|
|
|
|
}
|
|
|
|
|
LastToken::Was(ref mut last) => tokens.extend(last.take()),
|
|
|
|
|
}
|
|
|
|
|
self.token_cursor.frame.last_token = LastToken::Collecting(tokens);
|
|
|
|
|
let prev = self.token_cursor.stack.len();
|
|
|
|
|
let ret = f(self);
|
|
|
|
|
let last_token = if self.token_cursor.stack.len() == prev {
|
|
|
|
|
&mut self.token_cursor.frame.last_token
|
|
|
|
|
} else {
|
|
|
|
|
&mut self.token_cursor.stack[prev].last_token
|
|
|
|
|
};
|
|
|
|
|
let mut tokens = match *last_token {
|
|
|
|
|
LastToken::Collecting(ref mut v) => mem::replace(v, Vec::new()),
|
|
|
|
|
LastToken::Was(_) => panic!("our vector went away?"),
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// If we're not at EOF our current token wasn't actually consumed by
|
|
|
|
|
// `f`, but it'll still be in our list that we pulled out. In that case
|
|
|
|
|
// put it back.
|
|
|
|
|
if self.token == token::Eof {
|
|
|
|
|
*last_token = LastToken::Was(None);
|
|
|
|
|
} else {
|
|
|
|
|
*last_token = LastToken::Was(tokens.pop());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Ok((ret?, tokens.into_iter().collect()))
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-20 21:00:43 +00:00
|
|
|
|
pub fn parse_item(&mut self) -> PResult<'a, Option<P<Item>>> {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
let attrs = self.parse_outer_attributes()?;
|
2017-07-12 16:50:05 +00:00
|
|
|
|
|
|
|
|
|
let (ret, tokens) = self.collect_tokens(|this| {
|
|
|
|
|
this.parse_item_(attrs, true, false)
|
|
|
|
|
})?;
|
|
|
|
|
|
|
|
|
|
// Once we've parsed an item and recorded the tokens we got while
|
|
|
|
|
// parsing we may want to store `tokens` into the item we're about to
|
|
|
|
|
// return. Note, though, that we specifically didn't capture tokens
|
|
|
|
|
// related to outer attributes. The `tokens` field here may later be
|
|
|
|
|
// used with procedural macros to convert this item back into a token
|
|
|
|
|
// stream, but during expansion we may be removing attributes as we go
|
|
|
|
|
// along.
|
|
|
|
|
//
|
|
|
|
|
// If we've got inner attributes then the `tokens` we've got above holds
|
|
|
|
|
// these inner attributes. If an inner attribute is expanded we won't
|
|
|
|
|
// actually remove it from the token stream, so we'll just keep yielding
|
|
|
|
|
// it (bad!). To work around this case for now we just avoid recording
|
|
|
|
|
// `tokens` if we detect any inner attributes. This should help keep
|
|
|
|
|
// expansion correct, but we should fix this bug one day!
|
|
|
|
|
Ok(ret.map(|item| {
|
|
|
|
|
item.map(|mut i| {
|
|
|
|
|
if !i.attrs.iter().any(|attr| attr.style == AttrStyle::Inner) {
|
|
|
|
|
i.tokens = Some(tokens);
|
|
|
|
|
}
|
|
|
|
|
i
|
|
|
|
|
})
|
|
|
|
|
}))
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2018-03-10 15:44:44 +00:00
|
|
|
|
/// `::{` or `::*`
|
|
|
|
|
fn is_import_coupler(&mut self) -> bool {
|
|
|
|
|
self.check(&token::ModSep) &&
|
|
|
|
|
self.look_ahead(1, |t| *t == token::OpenDelim(token::Brace) ||
|
|
|
|
|
*t == token::BinOp(token::Star))
|
2016-04-17 00:48:40 +00:00
|
|
|
|
}
|
2015-03-28 21:58:51 +00:00
|
|
|
|
|
2017-09-26 21:04:00 +00:00
|
|
|
|
/// Parse UseTree
|
|
|
|
|
///
|
2018-03-10 15:44:44 +00:00
|
|
|
|
/// USE_TREE = [`::`] `*` |
|
|
|
|
|
/// [`::`] `{` USE_TREE_LIST `}` |
|
2017-09-26 21:04:00 +00:00
|
|
|
|
/// PATH `::` `*` |
|
|
|
|
|
/// PATH `::` `{` USE_TREE_LIST `}` |
|
|
|
|
|
/// PATH [`as` IDENT]
|
2018-03-09 23:02:39 +00:00
|
|
|
|
fn parse_use_tree(&mut self) -> PResult<'a, UseTree> {
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
2017-09-26 21:04:00 +00:00
|
|
|
|
|
2018-03-10 15:44:44 +00:00
|
|
|
|
let mut prefix = ast::Path { segments: Vec::new(), span: lo.shrink_to_lo() };
|
|
|
|
|
let kind = if self.check(&token::OpenDelim(token::Brace)) ||
|
|
|
|
|
self.check(&token::BinOp(token::Star)) ||
|
|
|
|
|
self.is_import_coupler() {
|
|
|
|
|
// `use *;` or `use ::*;` or `use {...};` or `use ::{...};`
|
2017-09-26 21:04:00 +00:00
|
|
|
|
if self.eat(&token::ModSep) {
|
2018-03-10 15:44:44 +00:00
|
|
|
|
prefix.segments.push(PathSegment::crate_root(lo.shrink_to_lo()));
|
2017-09-26 21:04:00 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if self.eat(&token::BinOp(token::Star)) {
|
|
|
|
|
UseTreeKind::Glob
|
2016-10-23 21:43:41 +00:00
|
|
|
|
} else {
|
2018-03-10 15:44:44 +00:00
|
|
|
|
UseTreeKind::Nested(self.parse_use_tree_list()?)
|
2017-09-26 21:04:00 +00:00
|
|
|
|
}
|
2016-04-17 00:48:40 +00:00
|
|
|
|
} else {
|
2018-03-10 15:44:44 +00:00
|
|
|
|
// `use path::*;` or `use path::{...};` or `use path;` or `use path as bar;`
|
|
|
|
|
prefix = self.parse_path(PathStyle::Mod)?;
|
2017-09-26 21:04:00 +00:00
|
|
|
|
|
|
|
|
|
if self.eat(&token::ModSep) {
|
|
|
|
|
if self.eat(&token::BinOp(token::Star)) {
|
|
|
|
|
UseTreeKind::Glob
|
2016-04-17 00:48:40 +00:00
|
|
|
|
} else {
|
2018-03-10 15:44:44 +00:00
|
|
|
|
UseTreeKind::Nested(self.parse_use_tree_list()?)
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2016-04-17 00:48:40 +00:00
|
|
|
|
} else {
|
2018-03-09 15:58:44 +00:00
|
|
|
|
UseTreeKind::Simple(self.parse_rename()?)
|
2011-08-16 22:21:30 +00:00
|
|
|
|
}
|
2017-09-26 21:04:00 +00:00
|
|
|
|
};
|
|
|
|
|
|
2018-03-10 15:44:44 +00:00
|
|
|
|
Ok(UseTree { prefix, kind, span: lo.to(self.prev_span) })
|
2017-09-26 21:04:00 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Parse UseTreeKind::Nested(list)
|
|
|
|
|
///
|
|
|
|
|
/// USE_TREE_LIST = Ø | (USE_TREE `,`)* USE_TREE [`,`]
|
|
|
|
|
fn parse_use_tree_list(&mut self) -> PResult<'a, Vec<(UseTree, ast::NodeId)>> {
|
|
|
|
|
self.parse_unspanned_seq(&token::OpenDelim(token::Brace),
|
|
|
|
|
&token::CloseDelim(token::Brace),
|
|
|
|
|
SeqSep::trailing_allowed(token::Comma), |this| {
|
2018-03-09 23:02:39 +00:00
|
|
|
|
Ok((this.parse_use_tree()?, ast::DUMMY_NODE_ID))
|
2017-09-26 21:04:00 +00:00
|
|
|
|
})
|
2015-08-01 05:20:25 +00:00
|
|
|
|
}
|
|
|
|
|
|
2015-12-20 21:00:43 +00:00
|
|
|
|
fn parse_rename(&mut self) -> PResult<'a, Option<Ident>> {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
if self.eat_keyword(keywords::As) {
|
2018-03-08 11:27:23 +00:00
|
|
|
|
match self.token {
|
2018-03-10 05:56:40 +00:00
|
|
|
|
token::Ident(ident, false) if ident.name == keywords::Underscore.name() => {
|
2018-03-08 11:27:23 +00:00
|
|
|
|
self.bump(); // `_`
|
2018-04-05 00:20:21 +00:00
|
|
|
|
Ok(Some(Ident::new(ident.name.gensymed(), ident.span)))
|
2018-03-08 11:27:23 +00:00
|
|
|
|
}
|
|
|
|
|
_ => self.parse_ident().map(Some),
|
2018-03-10 21:18:05 +00:00
|
|
|
|
}
|
2015-08-01 05:20:25 +00:00
|
|
|
|
} else {
|
|
|
|
|
Ok(None)
|
2014-08-13 02:25:05 +00:00
|
|
|
|
}
|
2013-04-01 22:50:58 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-09 20:12:30 +00:00
|
|
|
|
/// Parses a source module as a crate. This is the main
|
|
|
|
|
/// entry point for the parser.
|
2015-12-20 21:00:43 +00:00
|
|
|
|
pub fn parse_crate_mod(&mut self) -> PResult<'a, Crate> {
|
2017-03-15 00:22:48 +00:00
|
|
|
|
let lo = self.span;
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok(ast::Crate {
|
2016-03-23 03:01:37 +00:00
|
|
|
|
attrs: self.parse_inner_attributes()?,
|
|
|
|
|
module: self.parse_mod_items(&token::Eof, lo)?,
|
2017-03-15 00:22:48 +00:00
|
|
|
|
span: lo.to(self.span),
|
2015-03-28 21:58:51 +00:00
|
|
|
|
})
|
2011-06-23 22:42:55 +00:00
|
|
|
|
}
|
2011-06-15 18:19:50 +00:00
|
|
|
|
|
2016-11-16 10:52:37 +00:00
|
|
|
|
pub fn parse_optional_str(&mut self) -> Option<(Symbol, ast::StrStyle, Option<ast::Name>)> {
|
2014-11-19 04:48:38 +00:00
|
|
|
|
let ret = match self.token {
|
2016-11-16 10:52:37 +00:00
|
|
|
|
token::Literal(token::Str_(s), suf) => (s, ast::StrStyle::Cooked, suf),
|
|
|
|
|
token::Literal(token::StrRaw(s, n), suf) => (s, ast::StrStyle::Raw(n), suf),
|
2015-12-30 23:11:53 +00:00
|
|
|
|
_ => return None
|
2013-10-08 00:49:10 +00:00
|
|
|
|
};
|
2015-12-30 23:11:53 +00:00
|
|
|
|
self.bump();
|
|
|
|
|
Some(ret)
|
2013-07-12 21:43:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-11-16 10:52:37 +00:00
|
|
|
|
pub fn parse_str(&mut self) -> PResult<'a, (Symbol, StrStyle)> {
|
2015-12-30 23:11:53 +00:00
|
|
|
|
match self.parse_optional_str() {
|
2014-11-19 04:48:38 +00:00
|
|
|
|
Some((s, style, suf)) => {
|
2016-09-21 02:09:22 +00:00
|
|
|
|
let sp = self.prev_span;
|
2015-09-03 07:54:53 +00:00
|
|
|
|
self.expect_no_suffix(sp, "string literal", suf);
|
2015-03-28 21:58:51 +00:00
|
|
|
|
Ok((s, style))
|
2014-11-19 04:48:38 +00:00
|
|
|
|
}
|
2018-02-19 07:08:23 +00:00
|
|
|
|
_ => {
|
|
|
|
|
let msg = "expected string literal";
|
|
|
|
|
let mut err = self.fatal(msg);
|
|
|
|
|
err.span_label(self.span, msg);
|
|
|
|
|
Err(err)
|
|
|
|
|
}
|
2011-02-25 01:00:24 +00:00
|
|
|
|
}
|
2012-05-23 22:06:11 +00:00
|
|
|
|
}
|
2011-01-11 02:18:16 +00:00
|
|
|
|
}
|