Skip to content

Module(): analyse reference class once and reuse C++Class objects #1515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mdsumner wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −9
Open

Module(): analyse reference class once and reuse C++Class objects #1515

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions R/Module.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,24 +222,26 @@ Module <- function( module, PACKAGE = methods::getPackageName(where), where = to

fields <- cpp_fields( CLASS, where )
methods <- cpp_refMethods(CLASS, where)
generator <- methods::setRefClass( clname,
fields = fields,
contains = "C++Object",
methods = methods,
where = where
)
# just to make codetools happy
.self <- .refClassDef <- NULL
generator$methods(initialize =
# Supply 'initialize' together with the other methods so that the
# reference class is analysed once, instead of a second full pass
# through refClassInformation() in generator$methods(...)
methods[["initialize"]] <-
if (cpp_hasDefaultConstructor(CLASS))
function(...) Rcpp::cpp_object_initializer(.self,.refClassDef, ...)
else
function(...) {
if (nargs()) Rcpp::cpp_object_initializer(.self,.refClassDef, ...)
else Rcpp::cpp_object_dummy(.self, .refClassDef) # #nocov
}
)
rm( .self, .refClassDef )
generator <- methods::setRefClass( clname,
fields = fields,
contains = "C++Object",
methods = methods,
where = where
)

classDef <- methods::getClass(clname)

@kevinushey kevinushey Oct 3, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The generator already carries the definition that setRefClass() just created, so this avoids the by-name lookup through the global class table (which can resolve to another package's Rcpp_<name> class when two packages expose the same C++ class name).

Suggested change
classDef <- methods::getClass(clname)
classDef <- generator$def

## non-public (static) fields in class representation
Expand Down Expand Up @@ -281,7 +283,10 @@ Module <- function( module, PACKAGE = methods::getPackageName(where), where = to
CLASS <- classes[[i]]
clname <- [email protected]
demangled_name <- sub( "^Rcpp_", "", clname )
.classes_map[[ CLASS@typeid ]] <- storage[[ demangled_name ]] <- .get_Module_Class( module, demangled_name, xp )
# reuse the C++Class object already built by Module__classes_info
# rather than rebuilding it (and all of its method/field objects)
CLASS@generator <- generators[[ clname ]]
.classes_map[[ CLASS@typeid ]] <- storage[[ demangled_name ]] <- CLASS

# exposing enums values as CLASS.VALUE
# (should really be CLASS$value but I don't know how to do it)
Expand Down
Loading