Skip to content

refactor: simplify is_simple and is_trivially_simple logic #825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
moritz-gross wants to merge 2 commits into
base: main
Choose a base branch
from
Open

refactor: simplify is_simple and is_trivially_simple logic #825

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9e0cc2
refactor: simplify `is_simple` and `is_trivially_simple` logic
moritz-gross Sep 26, 2026
472f8f5
Merge branch 'main' into refactor/simplify-checks-in-xpath-functions
moritz-gross Sep 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 19 additions & 36 deletions src/xpath_functions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,30 +81,10 @@ impl IsNode {
/// this is fairly detailed, so we define a few local functions (at end) to help out
/// Also, it doesn't help that the structure is a bit complicated Elements->ChildOfElement->Element/Text
pub fn is_simple(elem: Element) -> bool {
if is_trivially_simple(elem) {
return true;
}

if is_negative_of_trivially_simple(elem) {
// -3 or -x
return true;
}

if !is_tag(elem, "mrow") || elem.children().is_empty() {
return false;
}

// x y or -x or -3 x or -x y or -3 x y or x° or n° or -x° or -n°
#[allow(clippy::if_same_then_else)]
if is_times_mi(elem) {
return true; // x y
} else if is_degrees(elem) {
return true; // x° or n°
} else if is_function(elem) {
return true;
}

return false;
return is_trivially_simple(elem)
|| is_negative_of_trivially_simple(elem)
|| (is_tag(elem, "mrow")
&& (is_times_mi(elem) || is_degrees(elem) || is_function(elem)));


// returns the element's text value
Expand Down Expand Up @@ -139,19 +119,10 @@ impl IsNode {

// checks the single element to see if it is simple (mn, mi that is a single char, common fraction)
fn is_trivially_simple(elem: Element) -> bool {
if is_tag(elem, "mn") {
return true;
}
if is_tag(elem, "mi") && is_single_char(&to_str(elem)) {
// "simple" only if it is a single char (which can be multiple bytes)
return true;
}

// FIX: need to consult preference Fraction_Ordinal
if IsNode::is_common_fraction(elem, 10, 19) {
return true;
}
return false;
is_tag(elem, "mn")
|| (is_tag(elem, "mi") && is_single_char(&to_str(elem)))
|| IsNode::is_common_fraction(elem, 10, 19)
}

// true if the negative of a single element that is simple
Expand Down Expand Up @@ -1957,6 +1928,18 @@ mod tests {
});
}

/// Degree forms are simple, while longer products and identifiers exceed the limit.
#[test]
fn is_simple_shape_boundaries() -> Result<()> {
xpath_test(|| {
test_is_simple("variable with degrees", "<mrow><mi>x</mi><mo>°</mo></mrow>")?;
test_is_simple("number with degrees", "<mrow><mn>30</mn><mo>°</mo></mrow>")?;
test_is_not_simple("longer product", "<mrow><mi>x</mi><mo>&#x2062;</mo><mi>yz</mi></mrow>")?;
test_is_not_simple("non-simple function argument", "<mrow><mi>f</mi><mo>&#x2061;</mo><msqrt><mi>x</mi></msqrt></mrow>")?;
Ok(())
})
}

fn check_table_dims(mathml: &str, dims: (usize, usize)) -> Result<()> {
let package = parser::parse(mathml).map_err(|e| anyhow::anyhow!("failed to parse XML: {e}"))?;
let math_elem = get_element(&package);
Expand Down
Loading