Commit 7b5710d3 authored by Radford Neal's avatar Radford Neal

bug fix

parent 55bb6c3f
...@@ -1623,7 +1623,7 @@ LibExtern SEXP R_UnboundValue; /* Variable form, for those that need it */ ...@@ -1623,7 +1623,7 @@ LibExtern SEXP R_UnboundValue; /* Variable form, for those that need it */
/* Set in const-objs.c, as done below */ /* Set in const-objs.c, as done below */
#if USE_COMPRESSED_POINTERS #if USE_COMPRESSED_POINTERS
#define R_UnboundValue ((SEXP)SGGC_CPTR_VAL(R_SGGC_SYM_INDEX,0)) #define R_UnboundValue ((SEXP)SGGC_CPTR_VAL(R_SGGC_SYM_INDEX,0*SGGC_SYM_CHUNKS))
#else #else
#define R_UnboundValue ((SEXP) &R_sym_consts[0]) /* for sym with no value */ #define R_UnboundValue ((SEXP) &R_sym_consts[0]) /* for sym with no value */
#endif #endif
...@@ -1634,7 +1634,7 @@ LibExtern SEXP R_MissingArg; /* Variable form, for those that need it */ ...@@ -1634,7 +1634,7 @@ LibExtern SEXP R_MissingArg; /* Variable form, for those that need it */
/* Set in const-objs.c, as done below */ /* Set in const-objs.c, as done below */
#if USE_COMPRESSED_POINTERS #if USE_COMPRESSED_POINTERS
#define R_MissingArg ((SEXP)SGGC_CPTR_VAL(R_SGGC_SYM_INDEX,1)) #define R_MissingArg ((SEXP)SGGC_CPTR_VAL(R_SGGC_SYM_INDEX,1*SGGC_SYM_CHUNKS))
#else #else
#define R_MissingArg ((SEXP) &R_sym_consts[1]) #define R_MissingArg ((SEXP) &R_sym_consts[1])
#endif #endif
...@@ -1643,7 +1643,7 @@ LibExtern SEXP R_MissingUnder; /* Variable form, for those that need it */ ...@@ -1643,7 +1643,7 @@ LibExtern SEXP R_MissingUnder; /* Variable form, for those that need it */
/* Set in const-objs.c, as done below */ /* Set in const-objs.c, as done below */
#if USE_COMPRESSED_POINTERS #if USE_COMPRESSED_POINTERS
#define R_MissingUnder ((SEXP)SGGC_CPTR_VAL(R_SGGC_SYM_INDEX,2)) #define R_MissingUnder ((SEXP)SGGC_CPTR_VAL(R_SGGC_SYM_INDEX,2*SGGC_SYM_CHUNKS))
#else #else
#define R_MissingUnder ((SEXP) &R_sym_consts[2]) #define R_MissingUnder ((SEXP) &R_sym_consts[2])
#endif #endif
......
...@@ -694,7 +694,7 @@ void InitNames() ...@@ -694,7 +694,7 @@ void InitNames()
PRINTNAME(R_MissingArg) = R_BlankString; PRINTNAME(R_MissingArg) = R_BlankString;
IS_PRINTNAME(R_BlankString) = 1; IS_PRINTNAME(R_BlankString) = 1;
SET_SYMVALUE(R_MissingArg, R_MissingArg); SET_SYMVALUE(R_MissingArg, R_MissingArg);
# if !USE_AUX_FOR_ATTRIB # if !USE_AUX_FOR_ATTRIB && !USE_COMPRESSED_POINTERS
LENGTH(R_MissingArg) = 1; LENGTH(R_MissingArg) = 1;
# endif # endif
...@@ -703,8 +703,8 @@ void InitNames() ...@@ -703,8 +703,8 @@ void InitNames()
PRINTNAME(R_MissingUnder) = R_UnderscoreString; PRINTNAME(R_MissingUnder) = R_UnderscoreString;
IS_PRINTNAME(R_UnderscoreString) = 1; IS_PRINTNAME(R_UnderscoreString) = 1;
SET_SYMVALUE(R_MissingUnder, R_MissingArg); SET_SYMVALUE(R_MissingUnder, R_MissingArg);
# if !USE_AUX_FOR_ATTRIB # if !USE_AUX_FOR_ATTRIB && !USE_COMPRESSED_POINTERS
LENGTH(R_MissingUnder) = 1; LENGTH(R_MissingArg) = 1;
# endif # endif
/* R_RestartToken */ /* R_RestartToken */
......
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