Commit 341c19a0 authored by Radford Neal's avatar Radford Neal

make revisecontext static inline

parent ac52a67e
...@@ -1350,7 +1350,6 @@ extern0 Rboolean known_to_be_utf8 INI_as(FALSE); ...@@ -1350,7 +1350,6 @@ extern0 Rboolean known_to_be_utf8 INI_as(FALSE);
# define RealFromLogical Rf_RealFromLogical # define RealFromLogical Rf_RealFromLogical
# define RealFromString Rf_RealFromString # define RealFromString Rf_RealFromString
# define RemoveVariable Rf_RemoveVariable # define RemoveVariable Rf_RemoveVariable
# define revisecontext Rf_revisecontext
# define Seql Rf_Seql # define Seql Rf_Seql
# define Scollate Rf_Scollate # define Scollate Rf_Scollate
# define sortVector Rf_sortVector # define sortVector Rf_sortVector
...@@ -1606,7 +1605,6 @@ void Rf_wait_until_arguments_computed (SEXP); ...@@ -1606,7 +1605,6 @@ void Rf_wait_until_arguments_computed (SEXP);
#ifdef R_USE_SIGNALS #ifdef R_USE_SIGNALS
void beginbuiltincontext(RCNTXT*, SEXP); void beginbuiltincontext(RCNTXT*, SEXP);
void begincontext(RCNTXT*, int, SEXP, SEXP, SEXP, SEXP, SEXP); void begincontext(RCNTXT*, int, SEXP, SEXP, SEXP, SEXP, SEXP);
void revisecontext(SEXP, SEXP);
SEXP dynamicfindVar(SEXP, RCNTXT*); SEXP dynamicfindVar(SEXP, RCNTXT*);
void endcontext(RCNTXT*); void endcontext(RCNTXT*);
int framedepth(RCNTXT*); int framedepth(RCNTXT*);
......
...@@ -404,8 +404,6 @@ static SEXP do_savefile(SEXP call, SEXP op, SEXP args, SEXP env) ...@@ -404,8 +404,6 @@ static SEXP do_savefile(SEXP call, SEXP op, SEXP args, SEXP env)
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
/* CONTEXT PROCEDURES - others are in context.c */ /* CONTEXT PROCEDURES - others are in context.c */
/* Short form used in eval.c for contexts when evaluating BUILTIN ops. */
void beginbuiltincontext (RCNTXT * cptr, SEXP syscall) void beginbuiltincontext (RCNTXT * cptr, SEXP syscall)
{ begincontext (cptr, CTXT_BUILTIN, syscall, R_BaseEnv, { begincontext (cptr, CTXT_BUILTIN, syscall, R_BaseEnv,
R_BaseEnv, R_NilValue, R_NilValue); R_BaseEnv, R_NilValue, R_NilValue);
...@@ -469,7 +467,7 @@ void endcontext(RCNTXT * cptr) ...@@ -469,7 +467,7 @@ void endcontext(RCNTXT * cptr)
The revised context differs from the previous one only in env and sysp. */ The revised context differs from the previous one only in env and sysp. */
void revisecontext (SEXP env, SEXP sysp) static inline void revisecontext (SEXP env, SEXP sysp)
{ {
R_GlobalContext->sysparent = sysp; R_GlobalContext->sysparent = sysp;
R_GlobalContext->cloenv = env; R_GlobalContext->cloenv = env;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment