language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-28 22:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

parameterize Parser on an Error type

Browse source
This commit is contained in:
Folkert 2021-02-07 22:08:28 +01:00
parent da28486184
commit 148fffe969
17 changed files with 372 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

18
compiler/parse/src/ident.rs
View file

@ -1,7 +1,7 @@
use crate::ast::Attempting;
use crate::keyword;
use crate::parser::Progress::{self, *};
use crate::parser::{peek_utf8_char, unexpected, Bag, FailReason, ParseResult, Parser, State};
use crate::parser::{peek_utf8_char, unexpected, Bag, ParseResult, Parser, State, SyntaxError};
use bumpalo::collections::string::String;
use bumpalo::collections::vec::Vec;
use bumpalo::Bump;
@ -71,7 +71,7 @@ impl<'a> Ident<'a> {
pub fn parse_ident<'a>(
arena: &'a Bump,
mut state: State<'a>,
) -> ParseResult<'a, (Ident<'a>, Option<char>)> {
) -> ParseResult<'a, (Ident<'a>, Option<char>), SyntaxError> {
let mut part_buf = String::new_in(arena); // The current "part" (parts are dot-separated.)
let mut capitalized_parts: Vec<&'a str> = Vec::new_in(arena);
let mut noncapitalized_parts: Vec<&'a str> = Vec::new_in(arena);
@ -279,7 +279,7 @@ fn malformed<'a>(
mut state: State<'a>,
capitalized_parts: Vec<&'a str>,
noncapitalized_parts: Vec<&'a str>,
) -> ParseResult<'a, (Ident<'a>, Option<char>)> {
) -> ParseResult<'a, (Ident<'a>, Option<char>), SyntaxError> {
// Reconstruct the original string that we've been parsing.
let mut full_string = String::new_in(arena);
@ -321,7 +321,7 @@ fn malformed<'a>(
))
}
pub fn ident<'a>() -> impl Parser<'a, Ident<'a>> {
pub fn ident<'a>() -> impl Parser<'a, Ident<'a>, SyntaxError> {
move |arena: &'a Bump, state: State<'a>| {
// Discard next_char; we don't need it.
let (progress, (string, _), state) = parse_ident(arena, state)?;
@ -330,7 +330,7 @@ pub fn ident<'a>() -> impl Parser<'a, Ident<'a>> {
}
}
pub fn global_tag_or_ident<'a, F>(pred: F) -> impl Parser<'a, &'a str>
pub fn global_tag_or_ident<'a, F>(pred: F) -> impl Parser<'a, &'a str, SyntaxError>
where
F: Fn(char) -> bool,
{
@ -382,7 +382,7 @@ where
///
/// * A record field, e.g. "email" in `.email` or in `email:`
/// * A named pattern match, e.g. "foo" in `foo =` or `foo ->` or `\foo ->`
pub fn lowercase_ident<'a>() -> impl Parser<'a, &'a str> {
pub fn lowercase_ident<'a>() -> impl Parser<'a, &'a str, SyntaxError> {
move |arena, state| {
let (progress, ident, state) =
global_tag_or_ident(|first_char| first_char.is_lowercase()).parse(arena, state)?;
@ -401,7 +401,7 @@ pub fn lowercase_ident<'a>() -> impl Parser<'a, &'a str> {
let region = Region::zero();
Err((
MadeProgress,
Bag::from_state(arena, &state, FailReason::ReservedKeyword(region)),
Bag::from_state(arena, &state, SyntaxError::ReservedKeyword(region)),
state,
))
} else {
@ -415,11 +415,11 @@ pub fn lowercase_ident<'a>() -> impl Parser<'a, &'a str> {
/// * A module name
/// * A type name
/// * A global tag
pub fn uppercase_ident<'a>() -> impl Parser<'a, &'a str> {
pub fn uppercase_ident<'a>() -> impl Parser<'a, &'a str, SyntaxError> {
global_tag_or_ident(|first_char| first_char.is_uppercase())
}
pub fn unqualified_ident<'a>() -> impl Parser<'a, &'a str> {
pub fn unqualified_ident<'a>() -> impl Parser<'a, &'a str, SyntaxError> {
global_tag_or_ident(|first_char| first_char.is_alphabetic())
}