Minor refactoring with XML node helpers #2207
Conversation
Codecov Report
@@ Coverage Diff @@
## main #2207 +/- ##
=======================================
Coverage 99.65% 99.65%
=======================================
Files 113 113
Lines 5161 5167 +6
=======================================
+ Hits 5143 5149 +6
Misses 18 18
|
| is_node <- function(xml) inherits(xml, "xml_node") | ||
| is_nodeset <- function(xml) inherits(xml, "xml_nodeset") | ||
| is_nodeset_like <- function(xml) { | ||
| inherits(xml, "xml_nodeset") || | ||
| (is.list(xml) && all(vapply(xml, inherits, logical(1L), what = "xml_node"))) | ||
| is_nodeset(xml) || | ||
| (is.list(xml) && all(vapply(xml, is_node, logical(1L)))) |
There was a problem hiding this comment.
These helpers can probably move to the XML utils file (#2201).
R/xp_utils.R
Outdated
| is_valid_expr <- is_node(expr) || is_nodeset(expr) | ||
| if (!is_valid_expr) { | ||
| stop( | ||
| "Expected an xml_nodeset, a list of xml_nodes or an xml_node, got an object of class(es): ", |
There was a problem hiding this comment.
The error message is inconsistent with the test (re list of nodes)
But it has five different call sites, and everywhere the same |
Well, not truly a refactoring because I am changing one error message.