talexander/natter
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove closures from iselector macro.

Browse Source
This commit is contained in:
Tom Alexander 2023-10-29 18:54:50 -04:00
parent 24b9782146
commit a966be8122
No known key found for this signature in database
GPG Key ID: D3A179C9A53C0EDE
4 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/intermediate/document_element.rs
View File

@ -12,23 +12,19 @@ pub(crate) enum IDocumentElement {
Section(ISection),
}
iselector!(
IDocumentElement,
DocumentElement,
|registry, original| async {
iitem!(
registry,
original,
(
organic::types::DocumentElement::Heading,
IDocumentElement::Heading,
IHeading
),
(
organic::types::DocumentElement::Section,
IDocumentElement::Section,
ISection
),
)
}
);
iselector!(IDocumentElement, DocumentElement, original, registry, {
iitem!(
registry,
original,
(
organic::types::DocumentElement::Heading,
IDocumentElement::Heading,
IHeading
),
(
organic::types::DocumentElement::Section,
IDocumentElement::Section,
ISection
),
)
});

2
src/intermediate/element.rs
View File

@ -56,7 +56,7 @@ pub(crate) enum IElement {
LatexEnvironment(ILatexEnvironment),
}
iselector!(IElement, Element, |registry, original| async {
iselector!(IElement, Element, original, registry, {
iitem!(
registry,
original,

15
src/intermediate/macros.rs
View File

@ -43,13 +43,18 @@ pub(crate) use intermediate;
///
/// This exists to make changing the type signature easier.
macro_rules! iselector {
($istruct:ident, $pstruct:ident, $fnbody:expr) => {
($istruct:ident, $pstruct:ident, $original:ident, $registry:ident, $fnbody:tt) => {
impl $istruct {
pub(crate) fn new<'reg, 'orig, 'parse, 'inp: 'reg + 'orig>(
pub(crate) fn new<'reg, 'orig, 'parse, 'inp: 'reg + 'orig + 'parse>(
registry: &'reg mut Registry<'orig, 'parse>,
original: &'orig organic::types::$pstruct<'parse>,
) -> BoxFuture<'inp, Result<$istruct, CustomError>> {
$fnbody(registry, original).boxed()
async move {
let $registry = registry;
let $original = original;
$fnbody
}
.boxed()
}
}
};
@ -61,8 +66,8 @@ macro_rules! iitem {
($registry:expr, $original:expr, $(($penum:path, $ienum:path, $istruct:ident),)*) => {
match $original {
$(
&$penum(inner) => Ok($ienum(
$istruct::new($registry, &inner).await?,
$penum(inner) => Ok($ienum(
$istruct::new($registry, inner).await?,
)),
)*
}

2
src/intermediate/object.rs
View File

@ -63,7 +63,7 @@ pub(crate) enum IObject {
Timestamp(ITimestamp),
}
iselector!(IObject, Object, |registry, original| async {
iselector!(IObject, Object, original, registry, {
iitem!(
registry,
original,