Convert xml2_schema.cpp

Author: mgirlich

src/cpp11.cpp

@@ -398,10 +398,10 @@ extern "C" SEXP _xml2_node_write_character(SEXP node_sxp, SEXP encoding_sxp, SEX
   END_CPP11
 }
 // xml2_schema.cpp
-cpp11::sexp doc_validate(SEXP doc_sxp, SEXP schema_sxp);
+cpp11::logicals doc_validate(cpp11::sexp doc_sxp, cpp11::sexp schema_sxp);
 extern "C" SEXP _xml2_doc_validate(SEXP doc_sxp, SEXP schema_sxp) {
   BEGIN_CPP11
-    return cpp11::as_sexp(doc_validate(cpp11::as_cpp<cpp11::decay_t<SEXP>>(doc_sxp), cpp11::as_cpp<cpp11::decay_t<SEXP>>(schema_sxp)));
+    return cpp11::as_sexp(doc_validate(cpp11::as_cpp<cpp11::decay_t<cpp11::sexp>>(doc_sxp), cpp11::as_cpp<cpp11::decay_t<cpp11::sexp>>(schema_sxp)));
   END_CPP11
 }
 // xml2_url.cpp

src/xml2_schema.cpp

@@ -19,15 +19,13 @@ void handleSchemaError(void* userData, xmlError* error) {
 }
 
 [[cpp11::register]]
-cpp11::sexp doc_validate(SEXP doc_sxp, SEXP schema_sxp) {
+cpp11::logicals doc_validate(cpp11::sexp doc_sxp, cpp11::sexp schema_sxp) {
 
   XPtrDoc doc(doc_sxp);
   XPtrDoc schema(schema_sxp);
 
   xmlLineNumbersDefault(1);
 
-  BEGIN_CPP
-
   std::vector<std::string> vec;
 
   xmlSchemaParserCtxtPtr cptr = xmlSchemaNewDocParserCtxt(schema.checked_get());
@@ -40,23 +38,14 @@ cpp11::sexp doc_validate(SEXP doc_sxp, SEXP schema_sxp) {
 
   xmlSchemaSetValidStructuredErrors(vptr, handleSchemaError, &vec);
 
-  SEXP out = PROTECT(Rf_allocVector(LGLSXP, 1));
-
-  LOGICAL(out)[0] = xmlSchemaValidateDoc(vptr, doc.checked_get()) == 0;
+  bool valid = (xmlSchemaValidateDoc(vptr, doc.checked_get()) == 0);
+  cpp11::writable::logicals out{valid};
 
   xmlSchemaFreeParserCtxt(cptr);
   xmlSchemaFreeValidCtxt(vptr);
   xmlSchemaFree(sptr);
 
-  SEXP errors = PROTECT(Rf_allocVector(STRSXP, vec.size()));
-  for (size_t i = 0; i < vec.size(); ++i) {
-    SET_STRING_ELT(errors, i, Rf_mkCharLenCE(vec[i].c_str(), vec[i].size(), CE_UTF8));
-  }
-  Rf_setAttrib(out, Rf_install("errors"), errors);
+  out.attr("errors") = vec;
 
-
-  UNPROTECT(2);
   return out;
-
-  END_CPP
 }