Commit 73e24cf6 authored by Radford Neal's avatar Radford Neal

get rid of SYM_NO_DOTS - just look at TYPE_ETC

parent a36e7617
......@@ -816,7 +816,6 @@ extern void helpers_wait_until_not_in_use(SEXP);
|= TYPE_ET_CETERA_HAS_ATTR)
#define UNSET_HAS_ATTRIB(x) (UPTR_FROM_SEXP(x)->sxpinfo.type_et_cetera \
&= ~TYPE_ET_CETERA_HAS_ATTR)
#define SYM_NO_DOTS(x) (UPTR_FROM_SEXP(x)->sxpinfo.type_et_cetera == SYMSXP)
#define SET_VEC_DOTS_TR_BIT(x) (UPTR_FROM_SEXP(x)->sxpinfo.type_et_cetera \
|= TYPE_ET_CETERA_VEC_DOTS_TR)
#define UNSET_VEC_DOTS_TR_BIT(x) (UPTR_FROM_SEXP(x)->sxpinfo.type_et_cetera \
......
......@@ -917,7 +917,7 @@ static SEXP attribute_noinline evalv_other (SEXP e, SEXP rho, int variant)
SEXP fn = CAR(e), args = CDR(e);
if (SYM_NO_DOTS(fn))
if (TYPE_ETC(fn) == SYMSXP) /* symbol, and not ..., ..1, ..2, etc. */
op = FINDFUN(fn,rho);
else
op = eval(fn,rho);
......
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