include the PACKAGE argument when registering C functions

jimhester · jimhester · commit 1f42e14d55c3 · 2020-09-28T10:45:15.000-04:00
Fixes #111
diff --git a/R/register.R b/R/register.R
@@ -54,7 +54,7 @@ cpp_register <- function(path = ".", quiet = FALSE) {
 
   init <- generate_init_functions(get_registered_functions(all_decorations, "cpp11::init", quiet))
 
-  r_functions <- generate_r_functions(funs, package)
+  r_functions <- generate_r_functions(funs, package, use_package = TRUE)
 
   dir.create(dirname(r_path), recursive = TRUE, showWarnings = FALSE)
 
diff --git a/tests/testthat/test-register.R b/tests/testthat/test-register.R
@@ -512,7 +512,7 @@ describe("cpp_register", {
 "# Generated by cpp11: do not edit by hand
 
 foo <- function() {
-  .Call(\"_testPkg_foo\")
+  .Call(\"_testPkg_foo\", PACKAGE = \"testPkg\")
 }
 ")
     cpp_bindings <- file.path(p, "src", "cpp11.cpp")

Original file line number	Diff line number	Diff line change
`@@ -512,7 +512,7 @@ describe("cpp_register", {`
`512`	`512`	`"# Generated by cpp11: do not edit by hand`
`513`	`513`
`514`	`514`	`foo <- function() {`
`515`		`- .Call(\"_testPkg_foo\")`
	`515`	`+ .Call(\"_testPkg_foo\", PACKAGE = \"testPkg\")`
`516`	`516`	`}`
`517`	`517`	`")`
`518`	`518`	`cpp_bindings <- file.path(p, "src", "cpp11.cpp")`