Skip to content

Commit 29a2fda

Browse files
author
luke
committed
Add R_getVar and R_getVarEx.
git-svn-id: https://svn.r-project.org/R/trunk@86769 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 5521fa6 commit 29a2fda

2 files changed

Lines changed: 33 additions & 0 deletions

File tree

‎src/include/Rinternals.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,8 @@ SEXP Rf_findVar(SEXP, SEXP);
526526
SEXP Rf_findVarInFrame(SEXP, SEXP);
527527
SEXP Rf_findVarInFrame3(SEXP, SEXP, Rboolean);
528528
Rboolean R_existsVarInFrame(SEXP, SEXP);
529+
SEXP R_getVar(SEXP, SEXP, Rboolean);
530+
SEXP R_getVarEx(SEXP, SEXP, Rboolean, SEXP);
529531
void R_removeVarFromFrame(SEXP, SEXP);
530532
SEXP Rf_getAttrib(SEXP, SEXP);
531533
SEXP Rf_GetArrayDimnames(SEXP);

‎src/main/envir.c‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2271,6 +2271,37 @@ attribute_hidden SEXP do_mget(SEXP call, SEXP op, SEXP args, SEXP rho)
22712271
return(ans);
22722272
}
22732273

2274+
SEXP R_getVarEx(SEXP sym, SEXP rho, Rboolean inherits, SEXP ifnotfound)
2275+
{
2276+
if (TYPEOF(sym) != SYMSXP)
2277+
error(_("first argument to '%s' must be a symbol"), __func__);
2278+
if (TYPEOF(rho) != ENVSXP)
2279+
error(_("second argument to '%s' must be an environment"), __func__);
2280+
2281+
SEXP val = inherits ? findVar(sym, rho) : findVarInFrame(rho, sym);
2282+
if (val == R_MissingArg)
2283+
error(_("argument \"%s\" is missing, with no default"),
2284+
EncodeChar(PRINTNAME(sym)));
2285+
else if (val == R_UnboundValue)
2286+
return ifnotfound;
2287+
else if (TYPEOF(val) == PROMSXP) {
2288+
PROTECT(val);
2289+
val = eval(val, rho);
2290+
UNPROTECT(1);
2291+
return val;
2292+
}
2293+
else return val;
2294+
}
2295+
2296+
SEXP R_getVar(SEXP sym, SEXP rho, Rboolean inherits)
2297+
{
2298+
SEXP val = R_getVarEx(sym, rho, inherits, R_UnboundValue);
2299+
if (val == R_UnboundValue)
2300+
error(_("object '%s' not found"), EncodeChar(PRINTNAME(sym)));
2301+
return val;
2302+
}
2303+
2304+
22742305
/*----------------------------------------------------------------------
22752306
22762307
do_missing

0 commit comments

Comments
 (0)