Compare properties for inline babel calls.
This commit is contained in:
parent
53b9deff10
commit
6bc6fdc87b
@ -1,3 +1,4 @@
|
|||||||
|
call_foo()
|
||||||
call_foo(arguments)
|
call_foo(arguments)
|
||||||
call_bar[header](arguments)
|
call_bar[header](arguments)
|
||||||
call_baz(arguments)[header]
|
call_baz(arguments)[header]
|
||||||
|
@ -3592,20 +3592,61 @@ fn compare_citation_reference<'b, 's>(
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn compare_inline_babel_call<'b, 's>(
|
fn compare_inline_babel_call<'b, 's>(
|
||||||
_source: &'s str,
|
source: &'s str,
|
||||||
emacs: &'b Token<'s>,
|
emacs: &'b Token<'s>,
|
||||||
rust: &'b InlineBabelCall<'s>,
|
rust: &'b InlineBabelCall<'s>,
|
||||||
) -> Result<DiffEntry<'b, 's>, Box<dyn std::error::Error>> {
|
) -> Result<DiffEntry<'b, 's>, Box<dyn std::error::Error>> {
|
||||||
let this_status = DiffStatus::Good;
|
let mut this_status = DiffStatus::Good;
|
||||||
let message = None;
|
let mut child_status = Vec::new();
|
||||||
|
let mut message = None;
|
||||||
|
|
||||||
// TODO: Compare :call :inside-header :arguments :end-header :value
|
assert_no_children(emacs, &mut this_status, &mut message)?;
|
||||||
|
|
||||||
|
for diff in compare_properties!(
|
||||||
|
source,
|
||||||
|
emacs,
|
||||||
|
rust,
|
||||||
|
(
|
||||||
|
EmacsField::Required(":call"),
|
||||||
|
|r| Some(r.call),
|
||||||
|
compare_property_quoted_string
|
||||||
|
),
|
||||||
|
(
|
||||||
|
EmacsField::Required(":inside-header"),
|
||||||
|
|r| r.inside_header,
|
||||||
|
compare_property_quoted_string
|
||||||
|
),
|
||||||
|
(
|
||||||
|
EmacsField::Required(":arguments"),
|
||||||
|
|r| r.arguments,
|
||||||
|
compare_property_quoted_string
|
||||||
|
),
|
||||||
|
(
|
||||||
|
EmacsField::Required(":end-header"),
|
||||||
|
|r| r.end_header,
|
||||||
|
compare_property_quoted_string
|
||||||
|
),
|
||||||
|
(
|
||||||
|
EmacsField::Required(":value"),
|
||||||
|
|r| Some(r.value),
|
||||||
|
compare_property_quoted_string
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
match diff {
|
||||||
|
ComparePropertiesResult::NoChange => {}
|
||||||
|
ComparePropertiesResult::SelfChange(new_status, new_message) => {
|
||||||
|
this_status = new_status;
|
||||||
|
message = new_message
|
||||||
|
}
|
||||||
|
ComparePropertiesResult::DiffEntry(diff_entry) => child_status.push(diff_entry),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Ok(DiffResult {
|
Ok(DiffResult {
|
||||||
status: this_status,
|
status: this_status,
|
||||||
name: rust.get_elisp_name(),
|
name: rust.get_elisp_name(),
|
||||||
message,
|
message,
|
||||||
children: Vec::new(),
|
children: child_status,
|
||||||
rust_source: rust.get_source(),
|
rust_source: rust.get_source(),
|
||||||
emacs_token: emacs,
|
emacs_token: emacs,
|
||||||
}
|
}
|
||||||
|
@ -45,6 +45,11 @@ pub(crate) fn inline_babel_call<'b, 'g, 'r, 's>(
|
|||||||
remaining,
|
remaining,
|
||||||
InlineBabelCall {
|
InlineBabelCall {
|
||||||
source: source.into(),
|
source: source.into(),
|
||||||
|
value: todo!(),
|
||||||
|
call: todo!(),
|
||||||
|
inside_header: todo!(),
|
||||||
|
arguments: todo!(),
|
||||||
|
end_header: todo!(),
|
||||||
},
|
},
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
@ -217,6 +217,11 @@ pub struct CitationReference<'s> {
|
|||||||
#[derive(Debug, PartialEq)]
|
#[derive(Debug, PartialEq)]
|
||||||
pub struct InlineBabelCall<'s> {
|
pub struct InlineBabelCall<'s> {
|
||||||
pub source: &'s str,
|
pub source: &'s str,
|
||||||
|
pub value: &'s str,
|
||||||
|
pub call: &'s str,
|
||||||
|
pub inside_header: Option<&'s str>,
|
||||||
|
pub arguments: Option<&'s str>,
|
||||||
|
pub end_header: Option<&'s str>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, PartialEq)]
|
#[derive(Debug, PartialEq)]
|
||||||
|
Loading…
Reference in New Issue
Block a user