Move R_ext/Callbacks.h to src/include. Factor out R_ObjectTable type

declarations into a new header R_ext/ObjectTable.h. To ease the transition
add back a R_ext/Callbacks.h thata just included  R_ext/ObjectTable.h.


git-svn-id: https://svn.r-project.org/R/trunk@89101 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: luke

doc/NEWS.Rd

@@ -255,7 +255,12 @@
 
       \item The non-API header files \file{R_ext/Callbacks.h} and
       \file{R_ext/PrtUtil.h} are no longer copied to the installed
-      includes directory.
+      includes directory. The \code{R_ObjectTable} type definitions
+      formally in \file{R_ext/Callbacks.h} are now available in the new
+      header file \file{R_ext/ObjectTable.h}.  This new header file
+      should be used in packages instead of \file{R_ext/Callbacks.h}. To
+      ease the transition a stub file \file{R_ext/Callbacks.h} has been
+      added that just includes \file{R_ext/ObjectTable.h}.	
     }
   }
 

src/include/R_ext/Callbacks.h src/include/Callbacks.hsrc/include/R_ext/Callbacks.h renamed to src/include/Callbacks.h

@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2001-2020 The R Core Team.
+ *  Copyright (C) 2001-2025 The R Core Team.
  *
  *  This header file is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -68,50 +68,6 @@ Rboolean Rf_removeTaskCallbackByName(const char *name);
 SEXP R_removeTaskCallback(SEXP which);
 R_ToplevelCallbackEl* Rf_addTaskCallback(R_ToplevelCallback cb, void *data, void (*finalizer)(void *), const char *name, int *pos);
 
-
-
-/*
-  The following definitions are for callbacks to R functions and
-  methods related to user-level tables.  This was implemented in a
-  separate package formerly available from Omegahat and these
-  declarations allow the package to interface to the internal R code.
-  
-  See https://developer.r-project.org/RObjectTables.pdf.
-*/
-
-typedef struct  _R_ObjectTable R_ObjectTable;
-
-/* Do we actually need the exists() since it is never called but R
-   uses get to see if the symbol is bound to anything? */
-typedef Rboolean (*Rdb_exists)(const char * const name, Rboolean *canCache, R_ObjectTable *);
-typedef SEXP     (*Rdb_get)(const char * const name, Rboolean *canCache, R_ObjectTable *);
-typedef int      (*Rdb_remove)(const char * const name, R_ObjectTable *);
-typedef SEXP     (*Rdb_assign)(const char * const name, SEXP value, R_ObjectTable *);
-typedef SEXP     (*Rdb_objects)(R_ObjectTable *);
-typedef Rboolean (*Rdb_canCache)(const char * const name, R_ObjectTable *);
-
-typedef void     (*Rdb_onDetach)(R_ObjectTable *);
-typedef void     (*Rdb_onAttach)(R_ObjectTable *);
-
-struct  _R_ObjectTable{
-  int       type;
-  char    **cachedNames;
-  Rboolean  active;
-
-  Rdb_exists   exists;
-  Rdb_get      get;
-  Rdb_remove   remove;
-  Rdb_assign   assign;
-  Rdb_objects  objects;
-  Rdb_canCache canCache;
-
-  Rdb_onDetach onDetach;
-  Rdb_onAttach onAttach;
-  
-  void     *privateData;
-};
-
-
 #ifdef __cplusplus
 }
 #endif

src/include/Makefile.win

@@ -23,7 +23,7 @@ R_EXT_HEADERS = \
   Lapack.h Linpack.h MathThreads.h Memory.h \
   Parse.h Print.h RS.h Rallocators.h Random.h \
   Rdynload.h Riconv.h RStartup.h Utils.h libextern.h \
-  stats_package.h stats_stubs.h Visibility.h
+  stats_package.h stats_stubs.h Visibility.h ObjectTable.h
 
 all: fixh config.h trioremap.h
 	@echo 'installing C headers'

src/include/R_ext/Makefile.in

@@ -22,7 +22,7 @@ R_EXT_HEADERS = \
   Lapack.h Linpack.h MathThreads.h Memory.h QuartzDevice.h \
   Parse.h Print.h RS.h Rallocators.h Random.h \
   Rdynload.h Riconv.h RStartup.h Utils.h eventloop.h libextern.h \
-  stats_package.h stats_stubs.h Visibility.h
+  stats_package.h stats_stubs.h Visibility.h ObjectTable.h
 
 DISTFILES = Makefile.in $(R_EXT_HEADERS)
 TIMESTAMPS = $(R_EXT_HEADERS:.h=.ts)

src/main/envir.c

@@ -94,7 +94,7 @@
 #define R_USE_SIGNALS 1
 #include <Defn.h>
 #include <Internal.h>
-#include <R_ext/Callbacks.h>
+#include <R_ext/ObjectTable.h>
 
 #define FAST_BASE_CACHE_LOOKUP  /* Define to enable fast lookups of symbols */
 				/*    in global cache from base environment */

src/main/main.c

@@ -1622,7 +1622,7 @@ attribute_hidden SEXP do_quit(SEXP call, SEXP op, SEXP args, SEXP rho)
 }
 
 
-#include <R_ext/Callbacks.h>
+#include <Callbacks.h>
 
 static R_ToplevelCallbackEl *Rf_ToplevelTaskHandlers = NULL;
 

src/main/registration.c

@@ -55,7 +55,7 @@
     a C++ compiler because the linkage changes as the declarations
     are (currently) within extern "C" blocks.
 */
-#include <R_ext/Callbacks.h>
+#include <Callbacks.h>
 #include <Rdynpriv.h>
 
 #include "basedecl.h"