Compare section.
clippy Build clippy has failed Details
rust-foreign-document-test Build rust-foreign-document-test has succeeded Details
rust-test Build rust-test has succeeded Details
rust-build Build rust-build has succeeded Details

This commit is contained in:
Tom Alexander 2023-12-27 19:10:43 -05:00
parent 5272e2f1b4
commit abfae9c6c0
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
27 changed files with 235 additions and 19 deletions

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmBabelCall<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::BabelCall(self)
}
}

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmCenterBlock<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::CenterBlock(self)
}
}

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmClock<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::Clock(self)
}
}

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmComment<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::Comment(self)
}
}

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmCommentBlock<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::CommentBlock(self)
}
}

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmDiarySexp<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::DiarySexp(self)
}
}

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmDrawer<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::Drawer(self)
}
}

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmDynamicBlock<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::DynamicBlock(self)
}
}

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmExampleBlock<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::ExampleBlock(self)
}
}

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmExportBlock<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::ExportBlock(self)
}
}

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmFixedWidthArea<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::FixedWidthArea(self)
}
}

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmFootnoteDefinition<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::FootnoteDefinition(self)
}
}

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmHorizontalRule<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::HorizontalRule(self)
}
}

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmKeyword<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::Keyword(self)
}
}

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmLatexEnvironment<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::LatexEnvironment(self)
}
}

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmParagraph<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::Paragraph(self)
}
}

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmPlainList<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::PlainList(self)
}
}

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmPlanning<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::Planning(self)
}
}

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmPropertyDrawer<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::PropertyDrawer(self)
}
}

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmQuoteBlock<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::QuoteBlock(self)
}
}

View File

@ -4,6 +4,9 @@ use super::ast_node::WasmAstNode;
use super::macros::to_wasm;
use super::standard_properties::WasmStandardProperties;
use super::to_wasm::ToWasm;
use super::AdditionalProperties;
#[cfg(feature = "wasm_test")]
use crate::compare::ElispFact;
use crate::types::Section;
use crate::wasm::to_wasm::ToWasmStandardProperties;
@ -11,8 +14,9 @@ use crate::wasm::to_wasm::ToWasmStandardProperties;
#[serde(tag = "ast_node")]
#[serde(rename = "section")]
pub struct WasmSection<'s, 'p> {
standard_properties: WasmStandardProperties,
children: Vec<WasmAstNode<'s, 'p>>,
pub(crate) standard_properties: WasmStandardProperties,
pub(crate) additional_properties: AdditionalProperties<'s, 'p>,
pub(crate) children: Vec<WasmAstNode<'s, 'p>>,
}
to_wasm!(
@ -22,9 +26,20 @@ to_wasm!(
wasm_context,
standard_properties,
{
let children = original
.children
.iter()
.map(|child| {
child
.to_wasm(wasm_context.clone())
.map(Into::<WasmAstNode<'_, '_>>::into)
})
.collect::<Result<Vec<_>, _>>()?;
Ok(WasmSection {
standard_properties,
children: Vec::new(),
additional_properties: AdditionalProperties::default(),
children,
})
}
);
@ -34,3 +49,10 @@ impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmSection<'s, 'p> {
WasmAstNode::Section(self)
}
}
#[cfg(feature = "wasm_test")]
impl<'s, 'p> ElispFact<'s> for WasmSection<'s, 'p> {
fn get_elisp_name<'b>(&'b self) -> std::borrow::Cow<'s, str> {
"section".into()
}
}

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmSpecialBlock<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::SpecialBlock(self)
}
}

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmSrcBlock<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::SrcBlock(self)
}
}

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmTable<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::Table(self)
}
}

View File

@ -1,4 +1,7 @@
use super::macros::to_wasm;
use super::WasmAstNode;
use crate::error::CustomError;
use crate::types::Element;
pub trait ToWasm<'p> {
type Output;
@ -25,3 +28,65 @@ impl<'s> ToWasmContext<'s> {
ToWasmContext { full_document }
}
}
to_wasm!(
WasmAstNode<'s, 'p>,
Element<'s>,
original,
wasm_context,
standard_properties,
{
match original {
Element::Paragraph(inner) => inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into),
Element::PlainList(inner) => inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into),
Element::CenterBlock(inner) => {
inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into)
}
Element::QuoteBlock(inner) => {
inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into)
}
Element::SpecialBlock(inner) => {
inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into)
}
Element::DynamicBlock(inner) => {
inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into)
}
Element::FootnoteDefinition(inner) => {
inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into)
}
Element::Comment(inner) => inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into),
Element::Drawer(inner) => inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into),
Element::PropertyDrawer(inner) => {
inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into)
}
Element::Table(inner) => inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into),
Element::VerseBlock(inner) => {
inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into)
}
Element::CommentBlock(inner) => {
inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into)
}
Element::ExampleBlock(inner) => {
inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into)
}
Element::ExportBlock(inner) => {
inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into)
}
Element::SrcBlock(inner) => inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into),
Element::Clock(inner) => inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into),
Element::DiarySexp(inner) => inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into),
Element::Planning(inner) => inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into),
Element::FixedWidthArea(inner) => {
inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into)
}
Element::HorizontalRule(inner) => {
inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into)
}
Element::Keyword(inner) => inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into),
Element::BabelCall(inner) => inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into),
Element::LatexEnvironment(inner) => {
inner.to_wasm(wasm_context).map(Into::<WasmAstNode>::into)
}
}
}
);

View File

@ -28,3 +28,9 @@ to_wasm!(
})
}
);
impl<'s, 'p> Into<WasmAstNode<'s, 'p>> for WasmVerseBlock<'s, 'p> {
fn into(self) -> WasmAstNode<'s, 'p> {
WasmAstNode::VerseBlock(self)
}
}

View File

@ -307,22 +307,7 @@ impl<'s, 'p> WasmElispCompare<'s, 'p> for WasmSection<'s, 'p> {
source: &'s str,
emacs: &'b Token<'s>,
) -> Result<WasmDiffResult<'s>, Box<dyn std::error::Error>> {
let result = WasmDiffResult::default();
// let result = wasm_compare!(
// source,
// emacs,
// self,
// (
// EmacsField::Required(":path"),
// |w| w.path.as_ref().and_then(|p| p.to_str()),
// wasm_compare_property_quoted_string
// ),
// (
// EmacsField::Required(":CATEGORY"),
// |w| w.category.as_ref(),
// wasm_compare_property_quoted_string
// )
// );
let result = wasm_compare!(source, emacs, self,);
Ok(result)
}