DESCRIPTION

@@ -40,7 +40,6 @@ Imports:
     pkgload (>= 1.0.2),
     purrr (>= 0.3.3),
     R6 (>= 2.1.2),
-    Rcpp (>= 0.11.0),
     rlang,
     stringi,
     stringr (>= 1.0.0),
@@ -54,9 +53,10 @@ Suggests:
     R.methodsS3,
     R.oo
 LinkingTo: 
-    Rcpp
+    cpp11
 VignetteBuilder: 
     knitr
+SystemRequirements: C++11
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE, load = "installed")
 RoxygenNote: 7.1.0

NAMESPACE

@@ -239,7 +239,6 @@ export(vignette_roclet)
 import(rlang)
 import(stringr)
 importFrom(R6,R6Class)
-importFrom(Rcpp,sourceCpp)
 importFrom(knitr,knit)
 importFrom(knitr,opts_chunk)
 importFrom(purrr,keep)

R/cpp11.R

@@ -0,0 +1,30 @@
+# Generated by cpp11: do not edit by hand
+
+escapeExamples <- function(x) {
+  .Call("_roxygen2_escapeExamples", x)
+}
+
+findEndOfTag <- function(string, is_code) {
+  .Call("_roxygen2_findEndOfTag", string, is_code)
+}
+
+rdComplete <- function(string, is_code) {
+  .Call("_roxygen2_rdComplete", string, is_code)
+}
+
+leadingSpaces <- function(lines) {
+  .Call("_roxygen2_leadingSpaces", lines)
+}
+
+tokenise_block <- function(lines, file, offset) {
+  .Call("_roxygen2_tokenise_block", lines, file, offset)
+}
+
+find_includes <- function(path) {
+  .Call("_roxygen2_find_includes", path)
+}
+
+wrapUsage <- function(string, width, indent) {
+  .Call("_roxygen2_wrapUsage", string, width, indent)
+}
+

R/rd-usage.R

@@ -135,7 +135,7 @@ wrap_usage <- function(name, format_name, formals, suffix = NULL, width = 80L) {
     out <- args_call(format_name(name), args)
   } else if (roxy_meta_get("old_usage", FALSE)) {
     x <- args_call(format_name(name), args)
-    out <- wrapUsage(x, width = as.integer(width))
+    out <- wrapUsage(x, width = as.integer(width), indent = 2)
   } else {
     args <- paste0("  ", args)
     args <- map_chr(args, wrapUsage, width = 90, indent = 4)

R/roxygen.R

@@ -9,7 +9,6 @@
 #'
 #' @useDynLib roxygen2, .registration=TRUE
 #' @keywords internal
-#' @importFrom Rcpp sourceCpp
 #' @importFrom R6 R6Class
 #' @importFrom purrr map map_int map_chr map_lgl map2
 #' @import rlang

R/tag-parser.R

@@ -19,7 +19,7 @@ NULL
 tag_value <- function(x) {
   if (x$raw == "") {
     roxy_tag_warning(x, "requires a value")
-  } else if (!rdComplete(x$raw)) {
+  } else if (!rdComplete(x$raw, is_code = FALSE)) {
     roxy_tag_warning(x, "mismatched braces or quotes")
   } else {
     x$val <- str_trim(x$raw)
@@ -32,7 +32,7 @@ tag_value <- function(x) {
 tag_inherit <- function(x) {
   if (x$raw == "") {
     roxy_tag_warning(x, "requires a value")
-  } else if (!rdComplete(x$raw)) {
+  } else if (!rdComplete(x$raw, is_code = FALSE)) {
     roxy_tag_warning(x, "mismatched braces or quotes")
   } else {
     pieces <- str_split(str_trim(x$raw), "\\s+")[[1]]
@@ -66,7 +66,7 @@ tag_inherit <- function(x) {
 tag_name <- function(x) {
   if (x$raw == "") {
     roxy_tag_warning(x, "requires a name")
-  } else if (!rdComplete(x$raw)) {
+  } else if (!rdComplete(x$raw, is_code = FALSE)) {
     roxy_tag_warning(x, "mismatched braces or quotes")
   } else if (str_count(x$raw, "\\s+") > 1) {
     roxy_tag_warning(x, "should have only a single argument")
@@ -87,7 +87,7 @@ tag_two_part <- function(x, first, second, required = TRUE, markdown = TRUE) {
     roxy_tag_warning(x, "requires a value")
   } else if (required && !str_detect(x$raw, "[[:space:]]+")) {
     roxy_tag_warning(x, "requires ", first, " and ", second)
-  } else if (!rdComplete(x$raw)) {
+  } else if (!rdComplete(x$raw, is_code = FALSE)) {
     roxy_tag_warning(x, "mismatched braces or quotes")
   } else {
     pieces <- str_split_fixed(str_trim(x$raw), "[[:space:]]+", 2)
@@ -115,7 +115,7 @@ tag_name_description <- function(x) {
 #' @rdname tag_parsers
 #' @param min,max Minimum and maximum number of words
 tag_words <- function(x, min = 0, max = Inf) {
-  if (!rdComplete(x$raw)) {
+  if (!rdComplete(x$raw, is_code = FALSE)) {
     return(roxy_tag_warning(x, "mismatched braces or quotes"))
   }
 
@@ -137,7 +137,7 @@ tag_words_line <- function(x) {
 
   if (str_detect(x$val, "\n")) {
     roxy_tag_warning(x, "may only span a single line")
-  } else if (!rdComplete(x$val)) {
+  } else if (!rdComplete(x$val, is_code = FALSE)) {
     roxy_tag_warning(x, "mismatched braces or quotes")
   } else {
     x$val <- str_split(x$val, "\\s+")[[1]]
@@ -183,7 +183,7 @@ tag_examples <- function(x) {
   }
 
   x$val <- escape_examples(gsub("^\n", "", x$raw))
-  if (!rdComplete(x$val, TRUE)) {
+  if (!rdComplete(x$val, is_code = TRUE)) {
     roxy_tag_warning(x, "mismatched braces or quotes")
   } else {
     x
@@ -206,7 +206,7 @@ tag_markdown_with_sections <- function(x) {
 
   x$val <- markdown_if_active(x$raw, x, sections = TRUE)
   for (i in seq_along(x$val)) {
-    if (!rdComplete(x$val[i])) {
+    if (!rdComplete(x$val[i], is_code = FALSE)) {
       roxy_tag_warning(x, "mismatched braces or quotes")
       x$val[i] <- ""
     } else {
@@ -221,7 +221,7 @@ markdown_if_active <- function(text, tag, sections = FALSE) {
   if (markdown_on()) {
     markdown(text, tag, sections)
   } else {
-    if (!rdComplete(text)) {
+    if (!rdComplete(text, is_code = FALSE)) {
       roxy_tag_warning(tag, "mismatched braces or quotes")
       ""
     } else {

src/cpp11.cpp

@@ -0,0 +1,82 @@
+// Generated by cpp11: do not edit by hand
+
+
+#include "cpp11/declarations.hpp"
+
+// escapeExamples.cpp
+std::string escapeExamples(std::string x);
+extern "C" SEXP _roxygen2_escapeExamples(SEXP x) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(escapeExamples(cpp11::unmove(cpp11::as_cpp<std::string>(x))));
+  END_CPP11
+}
+// isComplete.cpp
+int findEndOfTag(std::string string, bool is_code);
+extern "C" SEXP _roxygen2_findEndOfTag(SEXP string, SEXP is_code) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(findEndOfTag(cpp11::unmove(cpp11::as_cpp<std::string>(string)), cpp11::unmove(cpp11::as_cpp<bool>(is_code))));
+  END_CPP11
+}
+// isComplete.cpp
+bool rdComplete(std::string string, bool is_code);
+extern "C" SEXP _roxygen2_rdComplete(SEXP string, SEXP is_code) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(rdComplete(cpp11::unmove(cpp11::as_cpp<std::string>(string)), cpp11::unmove(cpp11::as_cpp<bool>(is_code))));
+  END_CPP11
+}
+// leadingSpaces.cpp
+cpp11::integers leadingSpaces(cpp11::strings lines);
+extern "C" SEXP _roxygen2_leadingSpaces(SEXP lines) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(leadingSpaces(cpp11::unmove(cpp11::as_cpp<cpp11::strings>(lines))));
+  END_CPP11
+}
+// parser2.cpp
+cpp11::list tokenise_block(cpp11::strings lines, std::string file, int offset);
+extern "C" SEXP _roxygen2_tokenise_block(SEXP lines, SEXP file, SEXP offset) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(tokenise_block(cpp11::unmove(cpp11::as_cpp<cpp11::strings>(lines)), cpp11::unmove(cpp11::as_cpp<std::string>(file)), cpp11::unmove(cpp11::as_cpp<int>(offset))));
+  END_CPP11
+}
+// parser2.cpp
+cpp11::strings find_includes(std::string path);
+extern "C" SEXP _roxygen2_find_includes(SEXP path) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(find_includes(cpp11::unmove(cpp11::as_cpp<std::string>(path))));
+  END_CPP11
+}
+// wrapUsage.cpp
+std::string wrapUsage(std::string string, int width, int indent);
+extern "C" SEXP _roxygen2_wrapUsage(SEXP string, SEXP width, SEXP indent) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(wrapUsage(cpp11::unmove(cpp11::as_cpp<std::string>(string)), cpp11::unmove(cpp11::as_cpp<int>(width)), cpp11::unmove(cpp11::as_cpp<int>(indent))));
+  END_CPP11
+}
+
+extern "C" {
+/* .Call calls */
+extern SEXP _roxygen2_escapeExamples(SEXP);
+extern SEXP _roxygen2_find_includes(SEXP);
+extern SEXP _roxygen2_findEndOfTag(SEXP, SEXP);
+extern SEXP _roxygen2_leadingSpaces(SEXP);
+extern SEXP _roxygen2_rdComplete(SEXP, SEXP);
+extern SEXP _roxygen2_tokenise_block(SEXP, SEXP, SEXP);
+extern SEXP _roxygen2_wrapUsage(SEXP, SEXP, SEXP);
+
+static const R_CallMethodDef CallEntries[] = {
+    {"_roxygen2_escapeExamples", (DL_FUNC) &_roxygen2_escapeExamples, 1},
+    {"_roxygen2_find_includes",  (DL_FUNC) &_roxygen2_find_includes,  1},
+    {"_roxygen2_findEndOfTag",   (DL_FUNC) &_roxygen2_findEndOfTag,   2},
+    {"_roxygen2_leadingSpaces",  (DL_FUNC) &_roxygen2_leadingSpaces,  1},
+    {"_roxygen2_rdComplete",     (DL_FUNC) &_roxygen2_rdComplete,     2},
+    {"_roxygen2_tokenise_block", (DL_FUNC) &_roxygen2_tokenise_block, 3},
+    {"_roxygen2_wrapUsage",      (DL_FUNC) &_roxygen2_wrapUsage,      3},
+    {NULL, NULL, 0}
+};
+}
+
+extern "C" void R_init_roxygen2(DllInfo* dll){
+  R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
+  R_useDynamicSymbols(dll, FALSE);
+}
+

src/escapeExamples.cpp

@@ -1,7 +1,7 @@
-#include <Rcpp.h>
-using namespace Rcpp;
+#include <cpp11/strings.hpp>
+#include <string>
 
-// [[Rcpp::export]]
+[[cpp11::register]]
 std::string escapeExamples(std::string x) {
   std::string out;
   out.reserve(x.length() * 1.1);