Convert node_write_file

jimhester · jimhester · commit 054ef31c3ce7 · 2020-03-27T17:02:05.000-04:00
diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -29,10 +29,6 @@ xml_save_options <- function() {
     .Call(`_xml2_xml_save_options`)
 }
 
-node_write_file <- function(x, path, encoding = "UTF-8", options = 1L) {
-    invisible(.Call(`_xml2_node_write_file`, x, path, encoding, options))
-}
-
 #' Convert between relative and absolute urls.
 #'
 #' @param x A character vector of urls relative to that base
diff --git a/R/xml_write.R b/R/xml_write.R
@@ -72,7 +72,7 @@ write_xml.xml_nodeset <- function(x, file, ..., options = "format", encoding = "
     if (!(is.character(file) && length(file) == 1 && nzchar(file))) {
       stop("`file` must be a non-zero character of length 1", call. = FALSE)
     }
-    node_write_file(x[[1]]$node, file, options = options, encoding = encoding)
+    .Call(node_write_file, x[[1]]$node, file, encoding, options)
   }
 }
 
@@ -91,7 +91,7 @@ write_xml.xml_node <- function(x, file, ..., options = "format", encoding = "UTF
     if (!(is.character(file) && length(file) == 1 && nzchar(file))) {
       stop("`file` must be a non-zero character of length 1", call. = FALSE)
     }
-    node_write_file(x$node, file, options = options, encoding = encoding)
+    .Call(node_write_file, x$node, file, encoding, options)
   }
 }
 
diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -86,19 +86,6 @@ BEGIN_RCPP
     return rcpp_result_gen;
 END_RCPP
 }
-// node_write_file
-void node_write_file(XPtrNode x, std::string path, std::string encoding, int options);
-RcppExport SEXP _xml2_node_write_file(SEXP xSEXP, SEXP pathSEXP, SEXP encodingSEXP, SEXP optionsSEXP) {
-BEGIN_RCPP
-    Rcpp::RNGScope rcpp_rngScope_gen;
-    Rcpp::traits::input_parameter< XPtrNode >::type x(xSEXP);
-    Rcpp::traits::input_parameter< std::string >::type path(pathSEXP);
-    Rcpp::traits::input_parameter< std::string >::type encoding(encodingSEXP);
-    Rcpp::traits::input_parameter< int >::type options(optionsSEXP);
-    node_write_file(x, path, encoding, options);
-    return R_NilValue;
-END_RCPP
-}
 // url_absolute
 CharacterVector url_absolute(CharacterVector x, CharacterVector base);
 RcppExport SEXP _xml2_url_absolute(SEXP xSEXP, SEXP baseSEXP) {
diff --git a/src/init.c b/src/init.c
@@ -57,7 +57,7 @@ extern SEXP node_text(SEXP);
 extern SEXP node_type(SEXP);
 extern SEXP node_write_character(SEXP, SEXP, SEXP);
 extern SEXP node_write_connection(SEXP, SEXP, SEXP, SEXP);
-extern SEXP _xml2_node_write_file(SEXP, SEXP, SEXP, SEXP);
+extern SEXP node_write_file(SEXP, SEXP, SEXP, SEXP);
 extern SEXP _xml2_nodes_duplicated(SEXP);
 extern SEXP _xml2_ns_lookup(SEXP, SEXP, SEXP);
 extern SEXP _xml2_ns_lookup_uri(SEXP, SEXP, SEXP);
@@ -122,7 +122,7 @@ static const R_CallMethodDef CallEntries[] = {
     {"node_type",                 (DL_FUNC) &node_type,                 1},
     {"node_write_character",      (DL_FUNC) &node_write_character,      3},
     {"node_write_connection",     (DL_FUNC) &node_write_connection,     4},
-    {"_xml2_node_write_file",           (DL_FUNC) &_xml2_node_write_file,           4},
+    {"node_write_file",           (DL_FUNC) &node_write_file,           4},
     {"_xml2_nodes_duplicated",          (DL_FUNC) &_xml2_nodes_duplicated,          1},
     {"_xml2_ns_lookup",                 (DL_FUNC) &_xml2_ns_lookup,                 3},
     {"_xml2_ns_lookup_uri",             (DL_FUNC) &_xml2_ns_lookup_uri,             3},
diff --git a/src/xml2_output.cpp b/src/xml2_output.cpp
@@ -149,16 +149,23 @@ extern "C" SEXP doc_write_character(SEXP doc_sxp, SEXP encoding_sxp, SEXP option
   return out;
 }
 
-// [[Rcpp::export]]
-void node_write_file(XPtrNode x, std::string path, std::string encoding = "UTF-8", int options = 1) {
+// [[export]]
+extern "C" SEXP node_write_file(SEXP node_sxp, SEXP path_sxp, SEXP encoding_sxp, SEXP options_sxp) {
+  XPtrNode node(node_sxp);
+  const char* path = CHAR(STRING_ELT(path_sxp, 0));
+  const char* encoding = CHAR(STRING_ELT(encoding_sxp, 0));
+  int options = INTEGER(options_sxp)[0];
+
   xmlSaveCtxtPtr savectx = xmlSaveToFilename(
-      path.c_str(),
-      encoding.c_str(),
+      path,
+      encoding,
       options);
-  xmlSaveTree(savectx, x.checked_get());
+  xmlSaveTree(savectx, node.checked_get());
   if (xmlSaveClose(savectx) == -1) {
-    stop("Error closing file");
+    Rf_error("Error closing file");
   }
+
+  return R_NilValue;
 }
 
 // [[export]]

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ write_xml.xml_nodeset <- function(x, file, ..., options = "format", encoding = "`
`72`	`72`	`if (!(is.character(file) && length(file) == 1 && nzchar(file))) {`
`73`	`73`	stop("`file` must be a non-zero character of length 1", call. = FALSE)
`74`	`74`	`}`
`75`		`- node_write_file(x[[1]]$node, file, options = options, encoding = encoding)`
	`75`	`+ .Call(node_write_file, x[[1]]$node, file, encoding, options)`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
`@@ -91,7 +91,7 @@ write_xml.xml_node <- function(x, file, ..., options = "format", encoding = "UTF`
`91`	`91`	`if (!(is.character(file) && length(file) == 1 && nzchar(file))) {`
`92`	`92`	stop("`file` must be a non-zero character of length 1", call. = FALSE)
`93`	`93`	`}`
`94`		`- node_write_file(x$node, file, options = options, encoding = encoding)`
	`94`	`+ .Call(node_write_file, x$node, file, encoding, options)`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`