Use cpp11 in xml2_utils.h

r-lib · Nov 2, 2023 · e09d20c · e09d20c
1 parent 50489ac
commit e09d20c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/src/xml2_doc.cpp b/src/xml2_doc.cpp
@@ -266,7 +266,7 @@ cpp11::strings doc_url(cpp11::sexp doc_sxp) {
 }
 
 [[cpp11::register]]
-cpp11::sexp doc_new(cpp11::sexp version_sxp, cpp11::strings encoding_sxp) {
+cpp11::sexp doc_new(cpp11::strings version_sxp, cpp11::strings encoding_sxp) {
   const char* encoding = cpp11::as_cpp<const char*>(encoding_sxp);
 
   XPtrDoc x(xmlNewDoc(asXmlChar(version_sxp)));

diff --git a/src/xml2_utils.h b/src/xml2_utils.h
@@ -15,8 +15,8 @@ inline const xmlChar* asXmlChar(std::string const& x) {
   return (const xmlChar*) x.c_str();
 }
 
-inline const xmlChar* asXmlChar(SEXP x, int n = 0) {
-  return (const xmlChar*) CHAR(STRING_ELT(x, n));
+inline const xmlChar* asXmlChar(cpp11::strings x) {
+  return (const xmlChar*) cpp11::as_cpp<const char*>(x);
 }
 
 #define BEGIN_CPP try {
@@ -64,11 +64,11 @@ class Xml2String {
     return std::string((char*) string_);
   }
 
-  SEXP asRString(SEXP missing = NA_STRING) {
+  cpp11::r_string asRString(cpp11::r_string missing = NA_STRING) {
     if (string_ == NULL)
       return missing;
 
-    return Rf_mkCharCE((char*) string_, CE_UTF8);
+    return cpp11::r_string((char*) string_);
   };
 };
 
@@ -87,10 +87,10 @@ class NsMap {
   }
 
   // Initialise from an existing STRSXP
-  NsMap(SEXP x) {
-    SEXP names = Rf_getAttrib(x, R_NamesSymbol);
-    for (R_len_t i = 0; i < Rf_xlength(x); ++i) {
-      add(std::string(CHAR(STRING_ELT(names, i))), std::string(CHAR(STRING_ELT(x, i))));
+  NsMap(cpp11::strings x) {
+    cpp11::strings names = x.names();
+    for (R_len_t i = 0; i < x.size(); ++i) {
+      add(cpp11::r_string(names[i]), cpp11::r_string(x[i]));
     }
   }
 
@@ -128,20 +128,20 @@ class NsMap {
     return true;
   }
 
-  SEXP out() {
-    SEXP out = PROTECT(Rf_allocVector(STRSXP, prefix2url.size()));
-    SEXP names = PROTECT(Rf_allocVector(STRSXP, prefix2url.size()));
+  cpp11::sexp out() {
+    int n = prefix2url.size();
+    cpp11::writable::strings out(n);
+    cpp11::writable::strings names(n);
 
     size_t i = 0;
     for (prefix2url_t::const_iterator it = prefix2url.begin(); it != prefix2url.end(); ++it) {
-      SET_STRING_ELT(out, i, Rf_mkChar(it->second.c_str()));
-      SET_STRING_ELT(names, i, Rf_mkChar(it->first.c_str()));
+      out[i] = it->second.c_str();
+      names[i] = it->first.c_str();
       ++i;
     }
 
-    Rf_setAttrib(out, R_NamesSymbol, names);
+    out.names() = names;
 
-    UNPROTECT(2);
     return out;
   }
 };