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

Remove intermediate lifetime.

This commit is contained in:
Tom Alexander 2023-10-29 14:14:10 -04:00
parent 6109902945
commit 645ae26701
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
60 changed files with 266 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/intermediate/angle_link.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IAngleLink {}
impl IAngleLink {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::AngleLink<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::AngleLink<'parse>,
) -> Result<IAngleLink, CustomError> {
Ok(IAngleLink {})
}

55
src/intermediate/ast_node.rs
View File

@ -112,20 +112,23 @@ pub(crate) enum IAstNode {
Timestamp(ITimestamp),
}
trait IntoIAstNode<'intermediate, 'parse> {
fn new<'b>(
&'intermediate self,
registry: &'b mut Registry<'intermediate, 'parse>,
) -> BoxFuture<'b, Result<IAstNode, CustomError>>;
pub(crate) trait IntoIAstNode {
fn into_ast_node<'parse, 'b>(
&'b self,
registry: &'b mut Registry<'parse>,
) -> BoxFuture<'b, Result<IAstNode, CustomError>>
where
Self: 'parse;
}
impl<'intermediate, 'parse> IntoIAstNode<'intermediate, 'parse>
for organic::types::DocumentElement<'parse>
{
fn new<'b>(
&'intermediate self,
registry: &'b mut Registry<'intermediate, 'parse>,
) -> BoxFuture<'b, Result<IAstNode, CustomError>> {
impl IntoIAstNode for organic::types::DocumentElement<'_> {
fn into_ast_node<'parse, 'b>(
&'b self,
registry: &'b mut Registry<'parse>,
) -> BoxFuture<'b, Result<IAstNode, CustomError>>
where
Self: 'parse,
{
async move {
match self {
organic::types::DocumentElement::Heading(inner) => {
@ -140,13 +143,14 @@ impl<'intermediate, 'parse> IntoIAstNode<'intermediate, 'parse>
}
}
impl<'intermediate, 'parse> IntoIAstNode<'intermediate, 'parse>
for organic::types::Element<'parse>
{
fn new<'b>(
&'intermediate self,
registry: &'b mut Registry<'intermediate, 'parse>,
) -> BoxFuture<'b, Result<IAstNode, CustomError>> {
impl IntoIAstNode for organic::types::Element<'_> {
fn into_ast_node<'parse, 'b>(
&'b self,
registry: &'b mut Registry<'parse>,
) -> BoxFuture<'b, Result<IAstNode, CustomError>>
where
Self: 'parse,
{
async move {
match self {
organic::types::Element::Paragraph(inner) => {
@ -227,11 +231,14 @@ impl<'intermediate, 'parse> IntoIAstNode<'intermediate, 'parse>
}
}
impl<'intermediate, 'parse> IntoIAstNode<'intermediate, 'parse> for organic::types::Object<'parse> {
fn new<'b>(
&'intermediate self,
registry: &'b mut Registry<'intermediate, 'parse>,
) -> BoxFuture<'b, Result<IAstNode, CustomError>> {
impl IntoIAstNode for organic::types::Object<'_> {
fn into_ast_node<'parse, 'b>(
&'b self,
registry: &'b mut Registry<'parse>,
) -> BoxFuture<'b, Result<IAstNode, CustomError>>
where
Self: 'parse,
{
async move {
match self {
organic::types::Object::Bold(inner) => {

6
src/intermediate/babel_call.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IBabelCall {}
impl IBabelCall {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::BabelCall<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::BabelCall<'parse>,
) -> Result<IBabelCall, CustomError> {
Ok(IBabelCall {})
}

6
src/intermediate/bold.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IBold {}
impl IBold {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::Bold<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::Bold<'parse>,
) -> Result<IBold, CustomError> {
Ok(IBold {})
}

6
src/intermediate/center_block.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct ICenterBlock {}
impl ICenterBlock {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::CenterBlock<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::CenterBlock<'parse>,
) -> Result<ICenterBlock, CustomError> {
Ok(ICenterBlock {})
}

6
src/intermediate/citation.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct ICitation {}
impl ICitation {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::Citation<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::Citation<'parse>,
) -> Result<ICitation, CustomError> {
Ok(ICitation {})
}

6
src/intermediate/citation_reference.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct ICitationReference {}
impl ICitationReference {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::CitationReference<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::CitationReference<'parse>,
) -> Result<ICitationReference, CustomError> {
Ok(ICitationReference {})
}

6
src/intermediate/clock.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IClock {}
impl IClock {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::Clock<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::Clock<'parse>,
) -> Result<IClock, CustomError> {
Ok(IClock {})
}

6
src/intermediate/code.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct ICode {}
impl ICode {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::Code<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::Code<'parse>,
) -> Result<ICode, CustomError> {
Ok(ICode {})
}

6
src/intermediate/comment.rs
View File

@ -7,9 +7,9 @@ use super::registry::Registry;
pub(crate) struct IComment {}
impl IComment {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
comment: &organic::types::Comment<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
comment: &'b organic::types::Comment<'parse>,
) -> Result<IComment, CustomError> {
Ok(IComment {})
}

6
src/intermediate/comment_block.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct ICommentBlock {}
impl ICommentBlock {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::CommentBlock<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::CommentBlock<'parse>,
) -> Result<ICommentBlock, CustomError> {
Ok(ICommentBlock {})
}

6
src/intermediate/diary_sexp.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IDiarySexp {}
impl IDiarySexp {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::DiarySexp<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::DiarySexp<'parse>,
) -> Result<IDiarySexp, CustomError> {
Ok(IDiarySexp {})
}

6
src/intermediate/document_element.rs
View File

@ -12,9 +12,9 @@ pub(crate) enum IDocumentElement {
}
impl IDocumentElement {
pub(crate) fn new<'intermediate, 'parse, 'b>(
registry: &'b mut Registry<'intermediate, 'parse>,
original: &'intermediate organic::types::DocumentElement<'parse>,
pub(crate) fn new<'parse, 'b>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::DocumentElement<'parse>,
) -> BoxFuture<'b, Result<IDocumentElement, CustomError>> {
async move {
match original {

6
src/intermediate/drawer.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IDrawer {}
impl IDrawer {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::Drawer<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::Drawer<'parse>,
) -> Result<IDrawer, CustomError> {
Ok(IDrawer {})
}

6
src/intermediate/dynamic_block.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IDynamicBlock {}
impl IDynamicBlock {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::DynamicBlock<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::DynamicBlock<'parse>,
) -> Result<IDynamicBlock, CustomError> {
Ok(IDynamicBlock {})
}

6
src/intermediate/element.rs
View File

@ -56,9 +56,9 @@ pub(crate) enum IElement {
}
impl IElement {
pub(crate) fn new<'intermediate, 'parse, 'b>(
registry: &'b mut Registry<'intermediate, 'parse>,
elem: &'intermediate organic::types::Element<'parse>,
pub(crate) fn new<'parse, 'b>(
registry: &'b mut Registry<'parse>,
elem: &'b organic::types::Element<'parse>,
) -> BoxFuture<'b, Result<IElement, CustomError>> {
async move {
match elem {

6
src/intermediate/entity.rs
View File

@ -8,9 +8,9 @@ pub(crate) struct IEntity {
}
impl IEntity {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::Entity<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::Entity<'parse>,
) -> Result<IEntity, CustomError> {
Ok(IEntity {
html: original.html.to_owned(),

6
src/intermediate/example_block.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IExampleBlock {}
impl IExampleBlock {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::ExampleBlock<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::ExampleBlock<'parse>,
) -> Result<IExampleBlock, CustomError> {
Ok(IExampleBlock {})
}

6
src/intermediate/export_block.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IExportBlock {}
impl IExportBlock {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::ExportBlock<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::ExportBlock<'parse>,
) -> Result<IExportBlock, CustomError> {
Ok(IExportBlock {})
}

6
src/intermediate/export_snippet.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IExportSnippet {}
impl IExportSnippet {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::ExportSnippet<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::ExportSnippet<'parse>,
) -> Result<IExportSnippet, CustomError> {
Ok(IExportSnippet {})
}

6
src/intermediate/fixed_width_area.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IFixedWidthArea {}
impl IFixedWidthArea {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::FixedWidthArea<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::FixedWidthArea<'parse>,
) -> Result<IFixedWidthArea, CustomError> {
Ok(IFixedWidthArea {})
}

39
src/intermediate/footnote_definition.rs
View File

@ -1,7 +1,6 @@
use crate::error::CustomError;
use super::ast_node::IAstNode;
use super::registry::FootnoteDefinitionContents;
use super::registry::Registry;
use super::IElement;
use super::IObject;
@ -10,11 +9,13 @@ use super::IObject;
pub(crate) struct IFootnoteDefinition {}
impl IFootnoteDefinition {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &'intermediate organic::types::FootnoteDefinition<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::FootnoteDefinition<'parse>,
) -> Result<IFootnoteDefinition, CustomError> {
registry.register_footnote_definition(original.label, &original.children);
registry
.register_footnote_definition(original.label, &original.children)
.await?;
Ok(IFootnoteDefinition {})
}
}
@ -26,33 +27,11 @@ pub(crate) struct IRealFootnoteDefinition {
}
impl IRealFootnoteDefinition {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
footnote_id: usize,
original: &FootnoteDefinitionContents<'intermediate, 'parse>,
contents: Vec<IAstNode>,
) -> Result<IRealFootnoteDefinition, CustomError> {
let contents = match original {
FootnoteDefinitionContents::FromReference(inner) => {
let contents = {
let mut ret = Vec::new();
for obj in inner.iter() {
ret.push(IAstNode::Object(IObject::new(registry, obj).await?));
}
ret
};
contents
}
FootnoteDefinitionContents::FromDefinition(inner) => {
let contents = {
let mut ret = Vec::new();
for obj in inner.iter() {
ret.push(IAstNode::Element(IElement::new(registry, obj).await?));
}
ret
};
contents
}
};
Ok(IRealFootnoteDefinition {
footnote_id,
contents,

10
src/intermediate/footnote_reference.rs
View File

@ -9,11 +9,13 @@ pub(crate) struct IFootnoteReference {
}
impl IFootnoteReference {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &'intermediate organic::types::FootnoteReference<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::FootnoteReference<'parse>,
) -> Result<IFootnoteReference, CustomError> {
let footnote_id = registry.get_footnote_reference_id(original.label, &original.definition);
let footnote_id = registry
.get_footnote_reference_id(original.label, &original.definition)
.await?;
Ok(IFootnoteReference {
footnote_id,
duplicate_offset: 0, // TODO

6
src/intermediate/heading.rs
View File

@ -12,9 +12,9 @@ pub(crate) struct IHeading {
}
impl IHeading {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &'intermediate organic::types::Heading<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::Heading<'parse>,
) -> Result<IHeading, CustomError> {
let title = {
let mut ret = Vec::new();

6
src/intermediate/horizontal_rule.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IHorizontalRule {}
impl IHorizontalRule {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::HorizontalRule<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::HorizontalRule<'parse>,
) -> Result<IHorizontalRule, CustomError> {
Ok(IHorizontalRule {})
}

6
src/intermediate/inline_babel_call.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IInlineBabelCall {}
impl IInlineBabelCall {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::InlineBabelCall<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::InlineBabelCall<'parse>,
) -> Result<IInlineBabelCall, CustomError> {
Ok(IInlineBabelCall {})
}

6
src/intermediate/inline_source_block.rs
View File

@ -8,9 +8,9 @@ pub(crate) struct IInlineSourceBlock {
}
impl IInlineSourceBlock {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::InlineSourceBlock<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::InlineSourceBlock<'parse>,
) -> Result<IInlineSourceBlock, CustomError> {
Ok(IInlineSourceBlock {
value: original.value.to_owned(),

6
src/intermediate/italic.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IItalic {}
impl IItalic {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::Italic<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::Italic<'parse>,
) -> Result<IItalic, CustomError> {
Ok(IItalic {})
}

6
src/intermediate/keyword.rs
View File

@ -7,9 +7,9 @@ use super::registry::Registry;
pub(crate) struct IKeyword {}
impl IKeyword {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
keyword: &organic::types::Keyword<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
keyword: &'b organic::types::Keyword<'parse>,
) -> Result<IKeyword, CustomError> {
Ok(IKeyword {})
}

6
src/intermediate/latex_environment.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct ILatexEnvironment {}
impl ILatexEnvironment {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::LatexEnvironment<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::LatexEnvironment<'parse>,
) -> Result<ILatexEnvironment, CustomError> {
Ok(ILatexEnvironment {})
}

6
src/intermediate/latex_fragment.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct ILatexFragment {}
impl ILatexFragment {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::LatexFragment<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::LatexFragment<'parse>,
) -> Result<ILatexFragment, CustomError> {
Ok(ILatexFragment {})
}

6
src/intermediate/line_break.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct ILineBreak {}
impl ILineBreak {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::LineBreak<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::LineBreak<'parse>,
) -> Result<ILineBreak, CustomError> {
Ok(ILineBreak {})
}

6
src/intermediate/object.rs
View File

@ -62,9 +62,9 @@ pub(crate) enum IObject {
}
impl IObject {
pub(crate) fn new<'intermediate, 'parse, 'b>(
registry: &'b mut Registry<'intermediate, 'parse>,
obj: &'intermediate organic::types::Object<'parse>,
pub(crate) fn new<'parse, 'b>(
registry: &'b mut Registry<'parse>,
obj: &'b organic::types::Object<'parse>,
) -> BoxFuture<'b, Result<IObject, CustomError>> {
async move {
match obj {

6
src/intermediate/org_macro.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IOrgMacro {}
impl IOrgMacro {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::OrgMacro<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::OrgMacro<'parse>,
) -> Result<IOrgMacro, CustomError> {
Ok(IOrgMacro {})
}

6
src/intermediate/page.rs
View File

@ -21,10 +21,10 @@ pub(crate) struct BlogPostPage {
}
impl BlogPostPage {
pub(crate) async fn new<'intermediate, 'parse, P: Into<PathBuf>>(
pub(crate) async fn new<'b, 'parse, P: Into<PathBuf>>(
path: P,
registry: &mut Registry<'intermediate, 'parse>,
document: &'intermediate organic::types::Document<'parse>,
registry: &'b mut Registry<'parse>,
document: &'b organic::types::Document<'parse>,
) -> Result<BlogPostPage, CustomError> {
let path = path.into();
let mut children = Vec::new();

6
src/intermediate/paragraph.rs
View File

@ -9,9 +9,9 @@ pub(crate) struct IParagraph {
}
impl IParagraph {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &'intermediate organic::types::Paragraph<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::Paragraph<'parse>,
) -> Result<IParagraph, CustomError> {
let children = {
let mut ret = Vec::new();

6
src/intermediate/plain_link.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IPlainLink {}
impl IPlainLink {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::PlainLink<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::PlainLink<'parse>,
) -> Result<IPlainLink, CustomError> {
Ok(IPlainLink {})
}

6
src/intermediate/plain_list.rs
View File

@ -10,9 +10,9 @@ pub(crate) struct IPlainList {
}
impl IPlainList {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &'intermediate organic::types::PlainList<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::PlainList<'parse>,
) -> Result<IPlainList, CustomError> {
let children = {
let mut ret = Vec::new();

6
src/intermediate/plain_list_item.rs
View File

@ -11,9 +11,9 @@ pub(crate) struct IPlainListItem {
}
impl IPlainListItem {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &'intermediate organic::types::PlainListItem<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::PlainListItem<'parse>,
) -> Result<IPlainListItem, CustomError> {
let tag = {
let mut ret = Vec::new();

6
src/intermediate/plain_text.rs
View File

@ -9,9 +9,9 @@ pub(crate) struct IPlainText {
}
impl IPlainText {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
plain_text: &organic::types::PlainText<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
plain_text: &'b organic::types::PlainText<'parse>,
) -> Result<IPlainText, CustomError> {
Ok(IPlainText {
source: coalesce_whitespace(plain_text.source).into_owned(),

6
src/intermediate/planning.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IPlanning {}
impl IPlanning {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::Planning<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::Planning<'parse>,
) -> Result<IPlanning, CustomError> {
Ok(IPlanning {})
}

6
src/intermediate/property_drawer.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IPropertyDrawer {}
impl IPropertyDrawer {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::PropertyDrawer<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::PropertyDrawer<'parse>,
) -> Result<IPropertyDrawer, CustomError> {
Ok(IPropertyDrawer {})
}

6
src/intermediate/quote_block.rs
View File

@ -9,9 +9,9 @@ pub(crate) struct IQuoteBlock {
}
impl IQuoteBlock {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &'intermediate organic::types::QuoteBlock<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::QuoteBlock<'parse>,
) -> Result<IQuoteBlock, CustomError> {
let children = {
let mut ret = Vec::new();

6
src/intermediate/radio_link.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IRadioLink {}
impl IRadioLink {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::RadioLink<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::RadioLink<'parse>,
) -> Result<IRadioLink, CustomError> {
Ok(IRadioLink {})
}

6
src/intermediate/radio_target.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IRadioTarget {}
impl IRadioTarget {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::RadioTarget<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::RadioTarget<'parse>,
) -> Result<IRadioTarget, CustomError> {
Ok(IRadioTarget {})
}

75
src/intermediate/registry.rs
View File

@ -1,5 +1,7 @@
use std::collections::HashMap;
use super::ast_node::IntoIAstNode;
use crate::error::CustomError;
use organic::types::Element;
use organic::types::Object;
@ -7,14 +9,14 @@ use super::ast_node::IAstNode;
type IdCounter = u16;
pub(crate) struct Registry<'intermediate, 'parse> {
pub(crate) struct Registry<'parse> {
id_counter: IdCounter,
targets: HashMap<&'parse str, String>,
footnote_ids: Vec<(Option<&'parse str>, Vec<IAstNode>)>,
}
impl<'intermediate, 'parse> Registry<'intermediate, 'parse> {
pub(crate) fn new() -> Registry<'intermediate, 'parse> {
impl<'parse> Registry<'parse> {
pub(crate) fn new() -> Registry<'parse> {
Registry {
id_counter: 0,
targets: HashMap::new(),
@ -32,16 +34,16 @@ impl<'intermediate, 'parse> Registry<'intermediate, 'parse> {
/// Get a 0-indexed ID for a footnote.
///
/// This needs to be incremented to be 1-indexed for render.
pub(crate) fn get_footnote_reference_id<'b>(
pub(crate) async fn get_footnote_reference_id<'b>(
&'b mut self,
label: Option<&'parse str>,
definition: &'intermediate Vec<Object<'parse>>,
) -> usize {
definition: &'b Vec<Object<'parse>>,
) -> Result<usize, CustomError> {
if let None = label {
// If it has no label then it must always get a new ID.
self.footnote_ids
.push((None, FootnoteDefinitionContents::FromReference(definition)));
return self.footnote_ids.len() - 1;
let contents = convert_reference_contents(self, definition).await?;
self.footnote_ids.push((None, contents));
return Ok(self.footnote_ids.len() - 1);
}
if let Some(existing_id) = self
@ -50,38 +52,65 @@ impl<'intermediate, 'parse> Registry<'intermediate, 'parse> {
.position(|(id, _definition)| *id == label)
{
if !definition.is_empty() {
let contents = convert_reference_contents(self, definition).await?;
let entry = self
.footnote_ids
.get_mut(existing_id)
.expect("If-statement proves this to be Some.");
entry.1 = FootnoteDefinitionContents::FromReference(definition);
entry.1 = contents;
}
existing_id
Ok(existing_id)
} else {
self.footnote_ids
.push((label, FootnoteDefinitionContents::FromReference(definition)));
self.footnote_ids.len() - 1
let contents = convert_reference_contents(self, definition).await?;
self.footnote_ids.push((label, contents));
Ok(self.footnote_ids.len() - 1)
}
}
/// Update the definition to a footnote but do not mark it as referenced.
pub(crate) fn register_footnote_definition<'b>(
pub(crate) async fn register_footnote_definition<'b>(
&'b mut self,
label: &'parse str,
definition: &'intermediate Vec<Element<'parse>>,
) {
if let Some((existing_id, existing_definition)) = self
definition: &'b Vec<Element<'parse>>,
) -> Result<(), CustomError> {
let contents = convert_definition_contents(self, definition).await?;
if let Some((_existing_id, existing_definition)) = self
.footnote_ids
.iter_mut()
.find(|(id, _definition)| *id == Some(label))
{
*existing_definition = FootnoteDefinitionContents::FromDefinition(definition);
*existing_definition = contents;
}
Ok(())
}
}
#[derive(Debug)]
pub(crate) enum FootnoteDefinitionContents<'intermediate, 'parse> {
FromReference(&'intermediate Vec<Object<'parse>>),
FromDefinition(&'intermediate Vec<Element<'parse>>),
async fn convert_reference_contents<'b, 'parse>(
registry: &'b mut Registry<'parse>,
contents: &'b Vec<Object<'parse>>,
) -> Result<Vec<IAstNode>, CustomError> {
let contents = {
let mut ret = Vec::new();
for obj in contents.iter() {
ret.push(obj.into_ast_node(registry).await?);
}
ret
};
Ok(contents)
}
async fn convert_definition_contents<'b, 'parse>(
registry: &'b mut Registry<'parse>,
contents: &'b Vec<Element<'parse>>,
) -> Result<Vec<IAstNode>, CustomError> {
let contents = {
let mut ret = Vec::new();
for obj in contents.iter() {
ret.push(obj.into_ast_node(registry).await?);
}
ret
};
Ok(contents)
}

6
src/intermediate/regular_link.rs
View File

@ -10,9 +10,9 @@ pub(crate) struct IRegularLink {
}
impl IRegularLink {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &'intermediate organic::types::RegularLink<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::RegularLink<'parse>,
) -> Result<IRegularLink, CustomError> {
let children = {
let mut ret = Vec::new();

6
src/intermediate/section.rs
View File

@ -9,9 +9,9 @@ pub(crate) struct ISection {
}
impl ISection {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
section: &'intermediate organic::types::Section<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
section: &'b organic::types::Section<'parse>,
) -> Result<ISection, CustomError> {
let children = {
let mut ret = Vec::new();

6
src/intermediate/special_block.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct ISpecialBlock {}
impl ISpecialBlock {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::SpecialBlock<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::SpecialBlock<'parse>,
) -> Result<ISpecialBlock, CustomError> {
Ok(ISpecialBlock {})
}

6
src/intermediate/src_block.rs
View File

@ -8,9 +8,9 @@ pub(crate) struct ISrcBlock {
}
impl ISrcBlock {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::SrcBlock<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::SrcBlock<'parse>,
) -> Result<ISrcBlock, CustomError> {
let lines = original
.contents

6
src/intermediate/statistics_cookie.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IStatisticsCookie {}
impl IStatisticsCookie {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::StatisticsCookie<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::StatisticsCookie<'parse>,
) -> Result<IStatisticsCookie, CustomError> {
Ok(IStatisticsCookie {})
}

6
src/intermediate/strike_through.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IStrikeThrough {}
impl IStrikeThrough {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::StrikeThrough<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::StrikeThrough<'parse>,
) -> Result<IStrikeThrough, CustomError> {
Ok(IStrikeThrough {})
}

6
src/intermediate/subscript.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct ISubscript {}
impl ISubscript {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::Subscript<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::Subscript<'parse>,
) -> Result<ISubscript, CustomError> {
Ok(ISubscript {})
}

6
src/intermediate/superscript.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct ISuperscript {}
impl ISuperscript {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::Superscript<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::Superscript<'parse>,
) -> Result<ISuperscript, CustomError> {
Ok(ISuperscript {})
}

6
src/intermediate/table.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct ITable {}
impl ITable {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::Table<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::Table<'parse>,
) -> Result<ITable, CustomError> {
Ok(ITable {})
}

6
src/intermediate/target.rs
View File

@ -10,9 +10,9 @@ pub(crate) struct ITarget {
}
impl ITarget {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
target: &organic::types::Target<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
target: &'b organic::types::Target<'parse>,
) -> Result<ITarget, CustomError> {
let id = registry.get_target(target.value);
Ok(ITarget {

6
src/intermediate/timestamp.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct ITimestamp {}
impl ITimestamp {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::Timestamp<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::Timestamp<'parse>,
) -> Result<ITimestamp, CustomError> {
Ok(ITimestamp {})
}

6
src/intermediate/underline.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IUnderline {}
impl IUnderline {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::Underline<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::Underline<'parse>,
) -> Result<IUnderline, CustomError> {
Ok(IUnderline {})
}

6
src/intermediate/verbatim.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IVerbatim {}
impl IVerbatim {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::Verbatim<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::Verbatim<'parse>,
) -> Result<IVerbatim, CustomError> {
Ok(IVerbatim {})
}

6
src/intermediate/verse_block.rs
View File

@ -6,9 +6,9 @@ use super::registry::Registry;
pub(crate) struct IVerseBlock {}
impl IVerseBlock {
pub(crate) async fn new<'intermediate, 'parse>(
registry: &mut Registry<'intermediate, 'parse>,
original: &organic::types::VerseBlock<'parse>,
pub(crate) async fn new<'b, 'parse>(
registry: &'b mut Registry<'parse>,
original: &'b organic::types::VerseBlock<'parse>,
) -> Result<IVerseBlock, CustomError> {
Ok(IVerseBlock {})
}