Switch everything over to the new to_wasm macro.
This commit is contained in:
@@ -1,18 +1,18 @@
|
||||
use serde::Deserialize;
|
||||
use serde::Serialize;
|
||||
|
||||
use super::ast_node::WasmAstNode;
|
||||
use super::macros::to_wasm;
|
||||
use super::standard_properties::WasmStandardProperties;
|
||||
use super::to_wasm::ToWasm;
|
||||
use super::AdditionalProperties;
|
||||
use crate::compare::ElispFact;
|
||||
use crate::types::Code;
|
||||
use crate::wasm::to_wasm::ToWasmStandardProperties;
|
||||
use crate::wasm::WasmAstNode;
|
||||
|
||||
#[derive(Debug, Serialize)]
|
||||
#[serde(tag = "ast_node")]
|
||||
#[serde(rename = "org-data")]
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
pub struct WasmCode {
|
||||
standard_properties: WasmStandardProperties,
|
||||
children: Vec<WasmAstNode>,
|
||||
#[serde(flatten)]
|
||||
pub(crate) additional_properties: AdditionalProperties,
|
||||
}
|
||||
|
||||
to_wasm!(
|
||||
@@ -20,17 +20,14 @@ to_wasm!(
|
||||
Code<'s>,
|
||||
original,
|
||||
wasm_context,
|
||||
standard_properties,
|
||||
{ WasmAstNode::Code(original) },
|
||||
{ "TODO".into() },
|
||||
{
|
||||
Ok(WasmCode {
|
||||
standard_properties,
|
||||
children: Vec::new(),
|
||||
})
|
||||
Ok((
|
||||
Vec::new(),
|
||||
WasmCode {
|
||||
additional_properties: AdditionalProperties::default(),
|
||||
},
|
||||
))
|
||||
}
|
||||
);
|
||||
|
||||
impl Into<WasmAstNode> for WasmCode {
|
||||
fn into(self) -> WasmAstNode {
|
||||
WasmAstNode::Code(self)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user