Skip to content

Update from Rf_findVar and Rf_findVarInFrame while maintaining backward compatibility for R < 4.5.0 #1616

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
perrydv wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

Update from Rf_findVar and Rf_findVarInFrame while maintaining backward compatibility for R < 4.5.0 #1616

Show file tree
Hide file tree
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
30 changes: 15 additions & 15 deletions packages/nimble/R/cppDefs_nimbleList.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ cppNimbleListClass <- setRefClass('cppNimbleListClass',
## ptrToSmartPtrBase = dynamic_cast<nimSmartPtrBase*>(ptrToSmartPtr);
## ptrToPtr = ptrToSmartPtr->getVoidPtrToRealPtr();
## reinterpret_cast<nfRefClass_84*>(*static_cast<void**>(ptrToPtr))->NO_hw();

## PROTECT(SptrToSmartPtrBase = R_MakeExternalPtr(ptrToSmartPtrBase, R_NilValue, R_NilValue));
## PROTECT(SptrToPtr = R_MakeExternalPtr(ptrToPtr, R_NilValue, R_NilValue));
## PROTECT(Sans = Rf_allocVector(VECSXP,2));
Expand All @@ -83,11 +83,11 @@ cppNimbleListClass <- setRefClass('cppNimbleListClass',
'PROTECT(SptrToSmartPtrBase = R_MakeExternalPtr(ptrToSmartPtrBase, R_NilValue, R_NilValue));',
'PROTECT(SptrToPtr = R_MakeExternalPtr(ptrToPtr, R_NilValue, R_NilValue));'))
allocVectorLine <- cppLiteral(paste0('PROTECT(Sans = Rf_allocVector(VECSXP,', 2, '));'))

packListLines <- cppLiteral(c('SET_VECTOR_ELT(Sans,0,SptrToSmartPtrBase);',
'SET_VECTOR_ELT(Sans,1,SptrToPtr);'
))

codeLines <- substitute({
## Finalizer registration now happens through nimble's finalizer mapping system.
UNPROTECT(3)
Expand All @@ -99,7 +99,7 @@ cppNimbleListClass <- setRefClass('cppNimbleListClass',
args = args,
code = cppCodeBlock(code = allCode, objectDefs = CBobjectDefs, skipBrackets = TRUE),
returnType = cppSEXP(),
externC = TRUE)
externC = TRUE)
},
buildSEXPgenerator = function(finalizer = NULL) {
## Build a function that will provide a new object and return an external pointer.
Expand Down Expand Up @@ -197,7 +197,7 @@ cppNimbleListClass <- setRefClass('cppNimbleListClass',
listElementTable <- symbolTable()
listElementTable$addSymbol(cppSEXP(name = "S_newNimList"))
listElementTable$addSymbol(cppSEXP(name = "S_listName"))

newListLine[[1]] <- substitute({PROTECT(S_listName <- Rf_allocVector(STRSXP, 1));
SET_STRING_ELT(S_listName, 0, PROTECT(Rf_mkChar(LISTNAME)));},
list(LISTNAME = nimCompProc$nimbleListObj$className))
Expand Down Expand Up @@ -225,28 +225,28 @@ cppNimbleListClass <- setRefClass('cppNimbleListClass',
listElementTable <- symbolTable()
numElements <- length(elementNames)
conditionalLineList <- list()

conditionalClauseStart <- list(quote(cppLiteral('if (!RCopiedFlag){')))
conditionalClauseEnd <- list(quote(cppLiteral('}')))
environmentCPPName <- Rname2CppName('S_.xData') ## create SEXP for ref class environment
environmentCPPName <- Rname2CppName('S_.xData') ## create SEXP for ref class environment
listElementTable$addSymbol(cppSEXP(name = environmentCPPName))
envLine <- substitute({PROTECT(ENVNAME <- Rf_allocVector(STRSXP, 1));
SET_STRING_ELT(ENVNAME, 0, PROTECT(Rf_mkChar(".xData")));},
list(ENVNAME = as.name(environmentCPPName)))

for(i in seq_along(elementNames)){
Snames[i] <- Rname2CppName(paste0('S_', elementNames[i]))
listElementTable$addSymbol(cppSEXP(name = Snames[i]))
elementSymTab <- nimCompProc$symTab$getSymbolObject(elementNames[i])
conditionalLineList <- c(conditionalLineList, generateConditionalLines(nimCompProc$symTab$getSymbolObject(elementNames[i]),
listElementTable$getSymbolObject(Snames[i])))

copyToListLines[[i]] <- substitute(Rf_defineVar(Rf_install(ELEMENTNAME), VALUE, PROTECT(GET_SLOT(ROBJ, XDATA))),
list(ELEMENTNAME = elementNames[i], VALUE = as.name(Snames[i]),
ROBJ = as.name('RObjectPointer'),
XDATA = as.name(environmentCPPName)))
}

setFlagLine <- list(substitute(RCopiedFlag <- true,
list()))
returnLine <- list(substitute(return(ROBJ),
Expand Down Expand Up @@ -276,7 +276,7 @@ cppNimbleListClass <- setRefClass('cppNimbleListClass',
listElementTable <- symbolTable()
storeSexpLine <- list(quote(cppLiteral('R_PreserveObject(RObjectPointer = S_nimList_);')))

environmentCPPName <- Rname2CppName('S_.xData') ## create SEXP for ref class environment
environmentCPPName <- Rname2CppName('S_.xData') ## create SEXP for ref class environment
listElementTable$addSymbol(cppSEXP(name = environmentCPPName))
envLine <- substitute({PROTECT(ENVNAME <- Rf_allocVector(STRSXP, 1));
SET_STRING_ELT(ENVNAME, 0, PROTECT(Rf_mkChar(".xData")));},
Expand All @@ -285,8 +285,8 @@ cppNimbleListClass <- setRefClass('cppNimbleListClass',
for(i in seq_along(argNames)) {
Snames[i] <- Rname2CppName(paste0('S_', argNames[i]))
listElementTable$addSymbol(cppSEXP(name = Snames[i]))
copyFromListLines[[i]] <- substitute(PROTECT(SVAR <- Rf_findVarInFrame(PROTECT(GET_SLOT(S_nimList_, XDATA)), Rf_install(ARGNAME))),
list(ARGNAME = argNames[i],
copyFromListLines[[i]] <- substitute(PROTECT(SVAR <- NIM_FINDVARINFRAME(PROTECT(GET_SLOT(S_nimList_, XDATA)), Rf_install(ARGNAME))),
list(ARGNAME = argNames[i],
SVAR = as.name(Snames[i]),
XDATA = as.name(environmentCPPName)))
copyLine <- buildCopyLineFromSEXP(listElementTable$getSymbolObject(Snames[i]),
Expand All @@ -295,7 +295,7 @@ cppNimbleListClass <- setRefClass('cppNimbleListClass',
}
numArgs <- length(argNames)
unprotectLine <- substitute(UNPROTECT(N), list(N = 2 * numArgs + 1 + 1))
allCode <- embedListInRbracket(c(storeSexpLine, envLine,
allCode <- embedListInRbracket(c(storeSexpLine, envLine,
copyFromListLines, copyLines,
list(unprotectLine)))
functionDefs[[paste0(name, "_copyFrom")]] <<- cppFunctionDef(name = "copyFromSEXP",
Expand All @@ -311,7 +311,7 @@ cppNimbleListClass <- setRefClass('cppNimbleListClass',
elementNames <- nimCompProc$symTab$getSymbolNames()
resetNestedFlagLines <- list()
listElementTable <- symbolTable()

resetFlagLine <- list(substitute(RCopiedFlag <- false,
list()))

Expand Down
Loading
Loading