language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 04:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Split parse and expand errors

Browse source
This commit is contained in:
Wilco Kusee 2019-03-03 10:40:03 +01:00
parent dffe318701
commit 725805dc79
4 changed files with 76 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/ra_mbe/src/mbe_parser.rs
View file

@ -1,10 +1,10 @@
/// This module parses a raw `tt::TokenStream` into macro-by-example token
/// stream. This is a *mostly* identify function, expect for handling of
/// `$var:tt_kind` and `$(repeat),*` constructs.
use crate::{MacroRulesError, Result};
use crate::ParseError;
use crate::tt_cursor::TtCursor;
pub(crate) fn parse(tt: &tt::Subtree) -> Result<crate::MacroRules> {
pub(crate) fn parse(tt: &tt::Subtree) -> Result<crate::MacroRules, ParseError> {
let mut parser = TtCursor::new(tt);
let mut rules = Vec::new();
while !parser.is_eof() {
@ -19,7 +19,7 @@ pub(crate) fn parse(tt: &tt::Subtree) -> Result<crate::MacroRules> {
Ok(crate::MacroRules { rules })
}
fn parse_rule(p: &mut TtCursor) -> Result<crate::Rule> {
fn parse_rule(p: &mut TtCursor) -> Result<crate::Rule, ParseError> {
let lhs = parse_subtree(p.eat_subtree()?)?;
p.expect_char('=')?;
p.expect_char('>')?;
@ -28,14 +28,14 @@ fn parse_rule(p: &mut TtCursor) -> Result<crate::Rule> {
Ok(crate::Rule { lhs, rhs })
}
fn parse_subtree(tt: &tt::Subtree) -> Result<crate::Subtree> {
fn parse_subtree(tt: &tt::Subtree) -> Result<crate::Subtree, ParseError> {
let mut token_trees = Vec::new();
let mut p = TtCursor::new(tt);
while let Ok(tt) = p.eat() {
while let Some(tt) = p.eat() {
let child: crate::TokenTree = match tt {
tt::TokenTree::Leaf(leaf) => match leaf {
tt::Leaf::Punct(tt::Punct { char: '$', .. }) => {
if p.at_ident().is_ok() {
if p.at_ident().is_some() {
crate::Leaf::from(parse_var(&mut p)?).into()
} else {
parse_repeat(&mut p)?.into()
@ -56,12 +56,12 @@ fn parse_subtree(tt: &tt::Subtree) -> Result<crate::Subtree> {
Ok(crate::Subtree { token_trees, delimiter: tt.delimiter })
}
fn parse_var(p: &mut TtCursor) -> Result<crate::Var> {
fn parse_var(p: &mut TtCursor) -> Result<crate::Var, ParseError> {
let ident = p.eat_ident().unwrap();
let text = ident.text.clone();
let kind = if p.at_char(':') {
p.bump();
if let Ok(ident) = p.eat_ident() {
if let Some(ident) = p.eat_ident() {
Some(ident.text.clone())
} else {
p.rev_bump();
@ -73,21 +73,21 @@ fn parse_var(p: &mut TtCursor) -> Result<crate::Var> {
Ok(crate::Var { text, kind })
}
fn parse_repeat(p: &mut TtCursor) -> Result<crate::Repeat> {
fn parse_repeat(p: &mut TtCursor) -> Result<crate::Repeat, ParseError> {
let subtree = p.eat_subtree().unwrap();
let mut subtree = parse_subtree(subtree)?;
subtree.delimiter = crate::Delimiter::None;
let sep = p.eat_punct()?;
let sep = p.eat_punct().ok_or(ParseError::ParseError)?;
let (separator, rep) = match sep.char {
'*' | '+' | '?' => (None, sep.char),
char => (Some(char), p.eat_punct()?.char),
char => (Some(char), p.eat_punct().ok_or(ParseError::ParseError)?.char),
};
let kind = match rep {
'*' => crate::RepeatKind::ZeroOrMore,
'+' => crate::RepeatKind::OneOrMore,
'?' => crate::RepeatKind::ZeroOrOne,
_ => return Err(MacroRulesError::ParseError),
_ => return Err(ParseError::ParseError),
};
p.bump();
Ok(crate::Repeat { subtree, kind, separator })