language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 05:49:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Make sure to use keyword rather than word for parsing keywords

Browse source
This commit is contained in:
Joshua Warner 2024-12-28 22:24:38 -05:00
parent 9e6c249dca
commit 59fe0f06ea
No known key found for this signature in database
GPG key ID: 89AD497003F93FDD
6 changed files with 40 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/compiler/parse/src/type_annotation.rs
View file

@ -17,7 +17,7 @@ use crate::parser::{
};
use crate::parser::{
allocated, backtrackable, byte, fail, optional, specialize_err, specialize_err_ref, two_bytes,
word, EType, ETypeApply, ETypeInParens, ETypeInlineAlias, ETypeRecord, ETypeTagUnion, Parser,
EType, ETypeApply, ETypeInParens, ETypeInlineAlias, ETypeRecord, ETypeTagUnion, Parser,
Progress::*,
};
use crate::state::State;
@ -322,7 +322,10 @@ fn loc_type_in_parens<'a>(
specialize_err_ref(ETypeInParens::Type, arrow()),
Sep::FunctionArrow
),
map(word(keyword::WHERE, ETypeInParens::End), |_| Sep::Where),
map(
crate::parser::keyword(keyword::WHERE, ETypeInParens::End),
|_| Sep::Where
),
];
match sep.parse(arena, state.clone(), 0) {
@ -707,7 +710,7 @@ fn implements_clause<'a>() -> impl Parser<'a, Loc<ImplementsClause<'a>>, EType<'
),
skip_first(
// Parse "implements"; we don't care about this keyword
word(crate::keyword::IMPLEMENTS, EType::TImplementsClause),
crate::parser::keyword(crate::keyword::IMPLEMENTS, EType::TImplementsClause),
// Parse "Hash & ..."; this may be qualified from another module like "Hash.Hash"
absolute_column_min_indent(ability_chain()),
),
@ -734,7 +737,7 @@ fn implements_clause_chain<'a>(
move |arena, state: State<'a>, min_indent: u32| {
let (_, (spaces_before, ()), state) = and(
space0_e(EType::TIndentStart),
word(crate::keyword::WHERE, EType::TWhereBar),
crate::parser::keyword(crate::keyword::WHERE, EType::TWhereBar),
)
.parse(arena, state, min_indent)?;
@ -768,7 +771,7 @@ fn parse_implements_clause_chain_after_where<'a>(
pub fn implements_abilities<'a>() -> impl Parser<'a, Loc<ImplementsAbilities<'a>>, EType<'a>> {
increment_min_indent(skip_first(
// Parse "implements"; we don't care about this keyword
word(crate::keyword::IMPLEMENTS, EType::TImplementsClause),
crate::parser::keyword(crate::keyword::IMPLEMENTS, EType::TImplementsClause),
// Parse "Hash"; this may be qualified from another module like "Hash.Hash"
space0_before_e(
loc(map(