Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions xee-interpreter/src/interpreter/interpret.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1130,13 +1130,11 @@ impl<'a> Interpreter<'a> {
"Appending a whole document is not supported yet",
)));
}
xot::Value::Text(text) => {
xot::Value::Text(text) if text.get().is_empty() => {
// zero length text nodes are skipped
// Can this even exist, or does Xot not have
// them anyway?
if text.get().is_empty() {
continue;
}
continue;
}
_ => {}
}
Expand Down
4 changes: 2 additions & 2 deletions xee-interpreter/src/library/map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ fn find_helper(
function::Function::Array(array) => {
for entry in array.iter() {
let found = find_helper(entry, key.clone())?;
result.extend(found.into_iter())
result.extend(found)
}
}
function::Function::Map(map) => {
Expand All @@ -171,7 +171,7 @@ fn find_helper(
result.push(v.clone());
}
let found = find_helper(v, key.clone())?;
result.extend(found.into_iter())
result.extend(found)
}
}
_ => {}
Expand Down
9 changes: 4 additions & 5 deletions xee-xslt-ast/src/whitespace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@ pub(crate) fn strip_whitespace(xot: &mut Xot, names: &Names, node: Node) {
for edge in xot.traverse(node) {
match edge {
NodeEdge::Start(node) => match xot.value(node) {
Value::Text(text) => {
Value::Text(text)
if is_xml_whitespace(text.get())
&& !is_xml_space_preserve(xot, names, node, &xml_space_preserve)
{
to_remove.push(node);
}
&& !is_xml_space_preserve(xot, names, node, &xml_space_preserve) =>
{
to_remove.push(node);
}
Value::Element(_) => {
if let Some(xml_space) = xot.attributes(node).get(xot.xml_space_name()) {
Expand Down
Loading