Skip to content

Commit b238c39

Browse files
author
luke
committed
Moved more declarations from Rinternals.h to Defn.h.
git-svn-id: https://svn.r-project.org/R/trunk@89052 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent e840d57 commit b238c39

File tree

2 files changed

+68
-27
lines changed

2 files changed

+68
-27
lines changed

‎src/include/Defn.h‎

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,7 @@ void R_check_thread(const char *s);
574574
*/
575575

576576
/* General Cons Cell Attributes */
577+
int (MARK)(SEXP x);
577578
int (TRACKREFS)(SEXP x);
578579
void (SET_OBJECT)(SEXP x, int v);
579580
void (SET_TYPEOF)(SEXP x, int v);
@@ -591,6 +592,15 @@ void (ENABLE_REFCNT)(SEXP x);
591592
void (SET_S4_OBJECT)(SEXP x);
592593
void (UNSET_S4_OBJECT)(SEXP x);
593594

595+
SEXP Rf_S3Class(SEXP);
596+
int Rf_isBasicClass(const char *);
597+
SEXP R_S4_extends(SEXP klass, SEXP useTable);
598+
SEXP R_getClassDef_R(SEXP what);
599+
Rboolean R_has_methods_attached(void);
600+
Rboolean R_isVirtualClass(SEXP class_def, SEXP env);
601+
Rboolean R_extends (SEXP class1, SEXP class2, SEXP env);
602+
int R_check_class_and_super(SEXP x, const char **valid, SEXP rho);
603+
594604
int (ASSIGNMENT_PENDING)(SEXP x);
595605
void (SET_ASSIGNMENT_PENDING)(SEXP x, int v);
596606
int (IS_ASSIGNMENT_CALL)(SEXP x);
@@ -632,10 +642,28 @@ void SET_BNDCELL(SEXP cell, SEXP val);
632642
int (PROMISE_TAG)(SEXP e);
633643
void (SET_PROMISE_TAG)(SEXP e, int v);
634644

645+
/* metadata access */
646+
//int INTEGER_IS_SORTED(SEXP x);
647+
//int INTEGER_NO_NA(SEXP x);
648+
//int REAL_IS_SORTED(SEXP x);
649+
//int REAL_NO_NA(SEXP x);
650+
//int LOGICAL_IS_SORTED(SEXP x);
651+
//int LOGICAL_NO_NA(SEXP x);
652+
//int STRING_IS_SORTED(SEXP x);
653+
//int STRING_NO_NA(SEXP x);
654+
635655
/* List Access Functions */
636656
SEXP (CAR0)(SEXP e);
637657
void (SET_MISSING)(SEXP x, int v);
638658
SEXP CONS_NR(SEXP a, SEXP b);
659+
int (MISSING)(SEXP x);
660+
661+
/* Closure Access Functions */
662+
int (RSTEP)(SEXP x);
663+
int (RTRACE)(SEXP x);
664+
void (SET_RSTEP)(SEXP x, int v);
665+
void (SET_RTRACE)(SEXP x, int v);
666+
SEXP R_body_no_src(SEXP x); // body(x) without "srcref" etc, ../main/utils.c
639667

640668
/* Symbol Access Functions */
641669
SEXP (SYMVALUE)(SEXP x);
@@ -769,6 +797,10 @@ int *INTEGER0(SEXP x);
769797
double *REAL0(SEXP x);
770798
Rcomplex *COMPLEX0(SEXP x);
771799
Rbyte *RAW0(SEXP x);
800+
801+
Rboolean Rf_conformable(SEXP, SEXP);
802+
Rboolean Rf_isUserBinop(SEXP);
803+
int Rf_stringPositionTr(SEXP, const char *);
772804
#endif
773805

774806
#ifdef USE_RINTERNALS
@@ -1744,7 +1776,14 @@ Rboolean R_BCVersionOK(SEXP);
17441776
int R_NaN_is_R_NA(double);
17451777

17461778
/* Environment and Binding Features */
1747-
void R_RestoreHashCount(SEXP rho);
1779+
SEXP R_FindPackageEnv(SEXP info);
1780+
Rboolean R_HasFancyBindings(SEXP rho); // envir.c
1781+
void R_RestoreHashCount(SEXP rho); // envir.c
1782+
1783+
void R_XDREncodeDouble(double d, void *buf);
1784+
double R_XDRDecodeDouble(void *buf);
1785+
void R_XDREncodeInteger(int i, void *buf);
1786+
int R_XDRDecodeInteger(void *buf);
17481787

17491788
# define allocCharsxp Rf_allocCharsxp
17501789
# define asBool2 Rf_asBool2
@@ -2061,6 +2100,7 @@ void FrameClassFix(SEXP);
20612100
SEXP frameSubscript(int, SEXP, SEXP);
20622101
R_xlen_t get1index(SEXP, SEXP, R_xlen_t, int, int, SEXP);
20632102
int GetOptionCutoff(void);
2103+
int Rf_GetOptionDigits(void);
20642104
SEXP getVar(SEXP, SEXP);
20652105
SEXP getVarInFrame(SEXP, SEXP);
20662106
void InitArithmetic(void);
@@ -2073,6 +2113,7 @@ Rboolean R_current_trace_state(void);
20732113
Rboolean R_current_debug_state(void);
20742114
Rboolean R_has_methods(SEXP);
20752115
void R_InitialData(void);
2116+
SEXP Rf_installNoTrChar(SEXP);
20762117
SEXP R_possible_dispatch(SEXP, SEXP, SEXP, SEXP, Rboolean);
20772118
Rboolean inherits2(SEXP, const char *);
20782119
void InitGraphics(void);

‎src/include/Rinternals.h‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ int (NO_REFERENCES)(SEXP x);
260260
/* General Cons Cell Attributes */
261261
SEXP (ATTRIB)(SEXP x);
262262
int (OBJECT)(SEXP x);
263-
int (MARK)(SEXP x);
263+
//int (MARK)(SEXP x);
264264
int (TYPEOF)(SEXP x);
265265
int (NAMED)(SEXP x);
266266
int (REFCNT)(SEXP x);
@@ -333,7 +333,7 @@ SEXP (CADDR)(SEXP e);
333333
SEXP (CADDDR)(SEXP e);
334334
SEXP (CAD4R)(SEXP e);
335335
SEXP (CAD5R)(SEXP e);
336-
int (MISSING)(SEXP x);
336+
//int (MISSING)(SEXP x);
337337
void SET_TAG(SEXP x, SEXP y);
338338
SEXP SETCAR(SEXP x, SEXP y);
339339
SEXP SETCDR(SEXP x, SEXP y);
@@ -347,11 +347,11 @@ SEXP (FORMALS)(SEXP x);
347347
SEXP (BODY)(SEXP x);
348348
SEXP (CLOENV)(SEXP x);
349349
int (RDEBUG)(SEXP x);
350-
int (RSTEP)(SEXP x);
351-
int (RTRACE)(SEXP x);
350+
//int (RSTEP)(SEXP x);
351+
//int (RTRACE)(SEXP x);
352352
void (SET_RDEBUG)(SEXP x, int v);
353-
void (SET_RSTEP)(SEXP x, int v);
354-
void (SET_RTRACE)(SEXP x, int v);
353+
//void (SET_RSTEP)(SEXP x, int v);
354+
//void (SET_RTRACE)(SEXP x, int v);
355355
void SET_FORMALS(SEXP x, SEXP v);
356356
void SET_BODY(SEXP x, SEXP v);
357357
void SET_CLOENV(SEXP x, SEXP v);
@@ -543,13 +543,13 @@ SEXP Rf_GetColNames(SEXP);
543543
void Rf_GetMatrixDimnames(SEXP, SEXP*, SEXP*, const char**, const char**);
544544
SEXP Rf_GetOption(SEXP, SEXP); /* pre-2.13.0 compatibility */
545545
SEXP Rf_GetOption1(SEXP);
546-
int Rf_GetOptionDigits(void);
546+
//int Rf_GetOptionDigits(void);
547547
int Rf_GetOptionWidth(void);
548548
SEXP Rf_GetRowNames(SEXP);
549549
void Rf_gsetVar(SEXP, SEXP, SEXP);
550550
SEXP Rf_install(const char *);
551551
SEXP Rf_installChar(SEXP);
552-
SEXP Rf_installNoTrChar(SEXP);
552+
//SEXP Rf_installNoTrChar(SEXP);
553553
SEXP Rf_installTrChar(SEXP);
554554
Rboolean Rf_isOrdered(SEXP); // util.c
555555
Rboolean Rf_isUnordered(SEXP); // util.c
@@ -610,8 +610,8 @@ SEXP R_GetCurrentEnv(void);
610610

611611
Rboolean Rf_isS4(SEXP); // objects.c
612612
SEXP Rf_asS4(SEXP, Rboolean, int); // objects.c
613-
SEXP Rf_S3Class(SEXP);
614-
int Rf_isBasicClass(const char *);
613+
//SEXP Rf_S3Class(SEXP);
614+
//int Rf_isBasicClass(const char *);
615615

616616
/* cetype_t is an identifier reseved by POSIX, but it is
617617
well established as public. Could remap by a #define though */
@@ -694,7 +694,7 @@ SEXP R_UnwindProtect(SEXP (*fun)(void *data), void *data,
694694
SEXP R_NewEnv(SEXP, int, int);
695695
Rboolean R_IsPackageEnv(SEXP rho); // envir.c
696696
SEXP R_PackageEnvName(SEXP rho);
697-
SEXP R_FindPackageEnv(SEXP info);
697+
//SEXP R_FindPackageEnv(SEXP info);
698698
Rboolean R_IsNamespaceEnv(SEXP rho); // envir.c
699699
SEXP R_NamespaceEnvSpec(SEXP rho);
700700
SEXP R_FindNamespace(SEXP info);
@@ -706,7 +706,7 @@ void R_MakeActiveBinding(SEXP sym, SEXP fun, SEXP env);
706706
Rboolean R_BindingIsLocked(SEXP sym, SEXP env); // envir.c
707707
Rboolean R_BindingIsActive(SEXP sym, SEXP env); // envir.c
708708
SEXP R_ActiveBindingFunction(SEXP sym, SEXP env);
709-
Rboolean R_HasFancyBindings(SEXP rho); // envir.c
709+
//Rboolean R_HasFancyBindings(SEXP rho); // envir.c
710710

711711

712712
/* ../main/errors.c : */
@@ -719,10 +719,10 @@ void Rf_warningcall_immediate(SEXP, const char *, ...) R_PRINTF_FORMAT(2, 3);
719719
#define R_XDR_DOUBLE_SIZE 8
720720
#define R_XDR_INTEGER_SIZE 4
721721

722-
void R_XDREncodeDouble(double d, void *buf);
723-
double R_XDRDecodeDouble(void *buf);
724-
void R_XDREncodeInteger(int i, void *buf);
725-
int R_XDRDecodeInteger(void *buf);
722+
//void R_XDREncodeDouble(double d, void *buf);
723+
//double R_XDRDecodeDouble(void *buf);
724+
//void R_XDREncodeInteger(int i, void *buf);
725+
//int R_XDRDecodeInteger(void *buf);
726726

727727
typedef void *R_pstream_data_t;
728728

@@ -810,18 +810,18 @@ SEXP R_do_slot(SEXP obj, SEXP name);
810810
SEXP R_do_slot_assign(SEXP obj, SEXP name, SEXP value);
811811
int R_has_slot(SEXP obj, SEXP name);
812812
/* S3-S4 class (inheritance), attrib.c */
813-
SEXP R_S4_extends(SEXP klass, SEXP useTable);
813+
//SEXP R_S4_extends(SEXP klass, SEXP useTable);
814814

815815
/* class definition, new objects (objects.c) */
816816
SEXP R_do_MAKE_CLASS(const char *what);
817817
SEXP R_getClassDef (const char *what);
818-
SEXP R_getClassDef_R(SEXP what);
819-
Rboolean R_has_methods_attached(void);
820-
Rboolean R_isVirtualClass(SEXP class_def, SEXP env);
821-
Rboolean R_extends (SEXP class1, SEXP class2, SEXP env);
818+
//SEXP R_getClassDef_R(SEXP what);
819+
//Rboolean R_has_methods_attached(void);
820+
//Rboolean R_isVirtualClass(SEXP class_def, SEXP env);
821+
//Rboolean R_extends (SEXP class1, SEXP class2, SEXP env);
822822
SEXP R_do_new_object(SEXP class_def);
823823
/* supporting a C-level version of is(., .) : */
824-
int R_check_class_and_super(SEXP x, const char **valid, SEXP rho);
824+
//int R_check_class_and_super(SEXP x, const char **valid, SEXP rho);
825825
int R_check_class_etc (SEXP x, const char **valid);
826826

827827
/* preserve objects across GCs */
@@ -867,7 +867,7 @@ int R_system(const char *);
867867
#define IDENT_EXTPTR_AS_REF 64
868868
Rboolean R_compute_identical(SEXP, SEXP, int); // identical.c
869869

870-
SEXP R_body_no_src(SEXP x); // body(x) without "srcref" etc, ../main/utils.c
870+
//SEXP R_body_no_src(SEXP x); // body(x) without "srcref" etc, ../main/utils.c
871871

872872
/* C version of R's indx <- order(..., na.last, decreasing) :
873873
e.g. arglist = Rf_lang2(x,y) or Rf_lang3(x,y,z)
@@ -1083,7 +1083,7 @@ void R_orderVector1(int *indx, int n, SEXP x, Rboolean nalast, Rboolean de
10831083
other header file, with or without the Rf_ prefix.
10841084
*/
10851085
SEXP Rf_allocVector(SEXPTYPE, R_xlen_t);
1086-
Rboolean Rf_conformable(SEXP, SEXP);
1086+
//Rboolean Rf_conformable(SEXP, SEXP);
10871087
SEXP Rf_elt(SEXP, int);
10881088
Rboolean Rf_inherits(SEXP, const char *);
10891089
Rboolean Rf_isArray(SEXP);
@@ -1101,7 +1101,7 @@ Rboolean Rf_isNumeric(SEXP);
11011101
Rboolean Rf_isPairList(SEXP);
11021102
Rboolean Rf_isPrimitive(SEXP);
11031103
Rboolean Rf_isTs(SEXP);
1104-
Rboolean Rf_isUserBinop(SEXP);
1104+
//Rboolean Rf_isUserBinop(SEXP);
11051105
Rboolean Rf_isValidString(SEXP);
11061106
Rboolean Rf_isValidStringF(SEXP);
11071107
Rboolean Rf_isVector(SEXP);
@@ -1127,7 +1127,7 @@ SEXP Rf_listAppend(SEXP, SEXP);
11271127
SEXP Rf_mkNamed(SEXPTYPE, const char **);
11281128
SEXP Rf_mkString(const char *);
11291129
int Rf_nlevels(SEXP);
1130-
int Rf_stringPositionTr(SEXP, const char *);
1130+
//int Rf_stringPositionTr(SEXP, const char *);
11311131
SEXP Rf_ScalarComplex(Rcomplex);
11321132
SEXP Rf_ScalarInteger(int);
11331133
SEXP Rf_ScalarLogical(int);

0 commit comments

Comments
 (0)