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

Centralize closure type

Browse source
This commit is contained in:
ayazhafiz 2022-01-30 00:48:01 -05:00
parent e54917a063
commit b50bb9a4c7
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -52,13 +52,15 @@ pub fn parse_header<'a>(
fn header<'a>() -> impl Parser<'a, Module<'a>, EHeader<'a>> { fn header<'a>() -> impl Parser<'a, Module<'a>, EHeader<'a>> {
use crate::parser::keyword_e; use crate::parser::keyword_e;
type Clos<'b> = Box<(dyn FnOnce(&'b [CommentOrNewline]) -> Module<'b> + 'b)>;
map!( map!(
and!( and!(
space0_e(0, EHeader::Space, EHeader::IndentStart), space0_e(0, EHeader::Space, EHeader::IndentStart),
one_of![ one_of![
map!( map!(
skip_first!(keyword_e("app", EHeader::Start), app_header()), skip_first!(keyword_e("app", EHeader::Start), app_header()),
|mut header: AppHeader<'a>| -> Box<dyn FnOnce(&'a [CommentOrNewline]) -> Module<'a>> { |mut header: AppHeader<'a>| -> Clos<'a> {
Box::new(|spaces| { Box::new(|spaces| {
header.before_header = spaces; header.before_header = spaces;
Module::App { header } Module::App { header }
@ -67,7 +69,7 @@ fn header<'a>() -> impl Parser<'a, Module<'a>, EHeader<'a>> {
), ),
map!( map!(
skip_first!(keyword_e("platform", EHeader::Start), platform_header()), skip_first!(keyword_e("platform", EHeader::Start), platform_header()),
|mut header: PlatformHeader<'a>| -> Box<dyn FnOnce(&'a [CommentOrNewline]) -> Module<'a>> { |mut header: PlatformHeader<'a>| -> Clos<'a> {
Box::new(|spaces| { Box::new(|spaces| {
header.before_header = spaces; header.before_header = spaces;
Module::Platform { header } Module::Platform { header }
@ -76,7 +78,7 @@ fn header<'a>() -> impl Parser<'a, Module<'a>, EHeader<'a>> {
), ),
map!( map!(
skip_first!(keyword_e("interface", EHeader::Start), interface_header()), skip_first!(keyword_e("interface", EHeader::Start), interface_header()),
|mut header: InterfaceHeader<'a>| -> Box<dyn FnOnce(&'a [CommentOrNewline]) -> Module<'a>> { |mut header: InterfaceHeader<'a>| -> Clos<'a> {
Box::new(|spaces| { Box::new(|spaces| {
header.before_header = spaces; header.before_header = spaces;
Module::Interface { header } Module::Interface { header }
@ -85,10 +87,7 @@ fn header<'a>() -> impl Parser<'a, Module<'a>, EHeader<'a>> {
) )
] ]
), ),
|(spaces, make_header): ( |(spaces, make_header): (&'a [CommentOrNewline], Clos<'a>)| { make_header(spaces) }
&'a [CommentOrNewline],
Box<dyn FnOnce(&'a [CommentOrNewline]) -> Module<'a>>
)| { make_header(spaces) }
) )
} }