language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-29 06:44:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

finish import

Browse source
This commit is contained in:
Folkert 2021-03-09 15:23:45 +01:00
parent 71ab77b804
commit f25e88397a
1 changed files with 22 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

53
compiler/parse/src/module.rs
View file

@ -624,18 +624,9 @@ fn imports<'a>() -> impl Parser<
), ),
SyntaxError<'a>, SyntaxError<'a>,
> { > {
and!( specialize(
and!( |e, r, c| SyntaxError::Header(EHeader::Imports(e, r, c)),
skip_second!(backtrackable(space1(1)), ascii_string("imports")), imports_help(),
space1(1)
),
collection!(
ascii_char(b'['),
loc!(imports_entry()),
ascii_char(b','),
ascii_char(b']'),
1
)
) )
} }
@ -646,19 +637,27 @@ fn imports_help<'a>() -> impl Parser<
(&'a [CommentOrNewline<'a>], &'a [CommentOrNewline<'a>]), (&'a [CommentOrNewline<'a>], &'a [CommentOrNewline<'a>]),
Vec<'a, Located<ImportsEntry<'a>>>, Vec<'a, Located<ImportsEntry<'a>>>,
), ),
SyntaxError<'a>, EImports,
> { > {
let min_indent = 1;
and!( and!(
and!( spaces_around_keyword(
skip_second!(backtrackable(space1(1)), ascii_string("imports")), min_indent,
space1(1) "imports",
EImports::Imports,
EImports::Space,
EImports::IndentImports,
EImports::IndentListStart
), ),
collection!( collection_e!(
ascii_char(b'['), word1(b'[', EImports::ListStart),
loc!(imports_entry()), loc!(imports_entry()),
ascii_char(b','), word1(b',', EImports::ListEnd),
ascii_char(b']'), word1(b']', EImports::ListEnd),
1 min_indent,
EImports::Space,
EImports::IndentListEnd
) )
) )
} }
@ -730,15 +729,6 @@ fn typed_ident<'a>() -> impl Parser<'a, TypedIdent<'a>, SyntaxError<'a>> {
} }
} }
#[inline(always)]
#[allow(clippy::type_complexity)]
fn imports_entry<'a>() -> impl Parser<'a, ImportsEntry<'a>, SyntaxError<'a>> {
specialize(
|e, r, c| SyntaxError::Header(EHeader::Imports(e, r, c)),
imports_entry_help(),
)
}
fn shortname<'a>() -> impl Parser<'a, &'a str, EImports> { fn shortname<'a>() -> impl Parser<'a, &'a str, EImports> {
specialize(|_, r, c| EImports::Shortname(r, c), lowercase_ident()) specialize(|_, r, c| EImports::Shortname(r, c), lowercase_ident())
} }
@ -752,7 +742,8 @@ where
specialize(move |_, r, c| to_expectation(r, c), module_name()) specialize(move |_, r, c| to_expectation(r, c), module_name())
} }
fn imports_entry_help<'a>() -> impl Parser<'a, ImportsEntry<'a>, EImports> { #[inline(always)]
fn imports_entry<'a>() -> impl Parser<'a, ImportsEntry<'a>, EImports> {
let min_indent = 1; let min_indent = 1;
map_with_arena!( map_with_arena!(