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

Un-macro between

Browse source
This commit is contained in:
Jackson Wambolt 2024-04-14 21:34:32 -05:00
parent 8a144149e2
commit 60fa7ebe9e
No known key found for this signature in database
GPG key ID: 76F29A42FEE8811C
3 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/compiler/parse/src/parser.rs
View file

@ -1502,14 +1502,14 @@ macro_rules! collection_inner {
#[macro_export]
macro_rules! collection_trailing_sep_e {
($opening_brace:expr, $elem:expr, $delimiter:expr, $closing_brace:expr, $space_before:expr) => {
between!(
$crate::parser::between(
$opening_brace,
$crate::parser::reset_min_indent($crate::collection_inner!(
$elem,
$delimiter,
$space_before
)),
$closing_brace
$closing_brace,
)
};
}
@ -2524,7 +2524,7 @@ macro_rules! either {
/// # }
/// # let arena = Bump::new();
/// # fn foo<'a>(arena: &'a Bump) {
/// let parser = between!(
/// let parser = between(
/// byte(b'(', Problem::NotFound),
/// word("hello", Problem::NotFound),
/// byte(b')', Problem::NotFound)
@ -2536,14 +2536,12 @@ macro_rules! either {
/// # }
/// # foo(&arena);
/// ```
#[macro_export]
macro_rules! between {
($opening_brace:expr, $parser:expr, $closing_brace:expr) => {
$crate::parser::skip_first(
$opening_brace,
$crate::parser::skip_second($parser, $closing_brace),
)
};
pub fn between<'a, Before, Inner, After, Err: 'a>(
opening_brace: impl Parser<'a, Before, Err>,
inner: impl Parser<'a, Inner, Err>,
closing_brace: impl Parser<'a, After, Err>,
) -> impl Parser<'a, Inner, Err> {
skip_first(opening_brace, skip_second(inner, closing_brace))
}
/// Runs two parsers in succession. If both parsers succeed, the output is a tuple of both outputs.