modularize to new "statsErr.h"

git-svn-id: https://svn.r-project.org/R/trunk@87237 00db46b3-68df-0310-9c12-caf00c1e9a41
r-devel · Oct 15, 2024 · 0d0a181 · 0d0a181
1 parent 4a56c4d
commit 0d0a181
Show file tree

Hide file tree

Showing 23 changed files with 32 additions and 150 deletions.
diff --git a/src/library/stats/src/approx.c b/src/library/stats/src/approx.c
@@ -23,20 +23,13 @@
 #endif
 
 #include <R_ext/Arith.h>
-#include <R_ext/Error.h>
 #include <R_ext/Applic.h>
 #include <Rinternals.h> // for R_xlen_t
+#include "statsErr.h"
 #ifdef DEBUG_approx
 # include <R_ext/Print.h>
 #endif
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext ("stats", String)
-#else
-#define _(String) (String)
-#endif
-
 /* Linear and Step Function Interpolation */
 
 /* Assumes that ordinates are in ascending order

diff --git a/src/library/stats/src/bandwidths.c b/src/library/stats/src/bandwidths.c
@@ -23,13 +23,7 @@
 #include <Rmath.h> // M_* constants
 #include <Rinternals.h>
 
-// or include "stats.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext ("stats", String)
-#else
-#define _(String) (String)
-#endif
+#include "statsErr.h"
 
 #define DELMAX 1000
 /* Avoid slow and possibly error-producing underflows by cutting off at

diff --git a/src/library/stats/src/complete_cases.c b/src/library/stats/src/complete_cases.c
@@ -23,15 +23,10 @@
 #endif
 
 #include <Defn.h>
+#include "statsErr.h"
+
 #define R_MSG_type	_("invalid 'type' (%s) of argument")
 
-#undef _
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext ("stats", String)
-#else
-#define _(String) (String)
-#endif
 
 /* Formerly in src/main/summary.c */
 

diff --git a/src/library/stats/src/cov.c b/src/library/stats/src/cov.c
@@ -32,13 +32,7 @@
 #include <Rmath.h>
 
 #include "statsR.h"
-#undef _
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext ("stats", String)
-#else
-#define _(String) (String)
-#endif
+#include "statsErr.h"
 
 static SEXP corcov(SEXP x, SEXP y, SEXP na_method, SEXP kendall, Rboolean cor);
 

diff --git a/src/library/stats/src/deriv.c b/src/library/stats/src/deriv.c
@@ -27,13 +27,7 @@
 #endif
 
 #include "Defn.h"
-#undef _
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext ("stats", String)
-#else
-#define _(String) (String)
-#endif
+#include "statsErr.h"
 
 static SEXP ParenSymbol;
 static SEXP PlusSymbol;

diff --git a/src/library/stats/src/distn.c b/src/library/stats/src/distn.c
@@ -32,14 +32,8 @@
 #include <Defn.h>
 #include <Rmath.h>
 #include "statsR.h"
+#include "statsErr.h"
 
-#undef _
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext ("stats", String)
-#else
-#define _(String) (String)
-#endif
 /* interval at which to check interrupts */
 //#define NINTERRUPT 1000000
 

diff --git a/src/library/stats/src/fourier.c b/src/library/stats/src/fourier.c
@@ -29,15 +29,7 @@
 #endif
 
 #include <Defn.h>
-
-#undef _
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext ("stats", String)
-#else
-#define _(String) (String)
-#endif
-
+#include "statsErr.h"
 
 // workhorse routines from fft.c
 void fft_factor(int n, int *pmaxf, int *pmaxp);

diff --git a/src/library/stats/src/integrate.c b/src/library/stats/src/integrate.c
@@ -24,13 +24,8 @@
 #include <math.h> // for isfinite
 #include <Rinternals.h>
 #include <R_ext/Applic.h>
+#include "statsErr.h"
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext ("stats", String)
-#else
-#define _(String) (String)
-#endif
 
 /* called via .External(.) :*/
 SEXP call_dqags(SEXP args);

diff --git a/src/library/stats/src/ksmooth.c b/src/library/stats/src/ksmooth.c
@@ -20,13 +20,7 @@
 #include <math.h>
 #include <R.h>			/* for NA_REAL, includes math.h */
 #include <Rinternals.h>
-
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext ("stats", String)
-#else
-#define _(String) (String)
-#endif
+#include "statsErr.h"
 
 static double dokern(double x, int kern)
 {

diff --git a/src/library/stats/src/lm.c b/src/library/stats/src/lm.c
@@ -22,13 +22,7 @@
 #include <R_ext/Applic.h>
 
 #include "statsR.h"
-
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext ("stats", String)
-#else
-#define _(String) (String)
-#endif
+#include "statsErr.h"
 
 /* A wrapper to replace
 

diff --git a/src/library/stats/src/loglin.c b/src/library/stats/src/loglin.c
@@ -337,12 +337,7 @@ void adjust(int nvar, double *x, double *y, double *z, int *locz,
 #include <R.h>
 #include <Rinternals.h>
 #include "statsR.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext ("stats", String)
-#else
-#define _(String) (String)
-#endif
+#include "statsErr.h"
 
 SEXP LogLin(SEXP dtab, SEXP conf, SEXP table, SEXP start, 
 	    SEXP snmar, SEXP eps, SEXP iter) 

diff --git a/src/library/stats/src/lowess.c b/src/library/stats/src/lowess.c
@@ -22,18 +22,13 @@
 # include <config.h>
 #endif
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext ("stats", String)
-#else
-#define _(String) (String)
-#endif
-
 #include <math.h>
 #include <Rmath.h>		/* fmax2, imin2, imax2 */
 #include <R_ext/Applic.h>	/* prototypes for lowess and clowess */
 #include <R_ext/Boolean.h>
 #include <R_ext/Utils.h>	/* rPsort() */
+#include "statsErr.h"
+
 #ifdef DEBUG_lowess
 # include <R_ext/Print.h>
 #endif

diff --git a/src/library/stats/src/model.c b/src/library/stats/src/model.c
@@ -25,13 +25,7 @@
 #include <Defn.h>
 
 #include "statsR.h"
-#undef _
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext ("stats", String)
-#else
-#define _(String) (String)
-#endif
+#include "statsErr.h"
 
 /* inline-able versions, used just once! */
 static R_INLINE Rboolean isUnordered_int(SEXP s)

diff --git a/src/library/stats/src/modreg.h b/src/library/stats/src/modreg.h
@@ -23,12 +23,7 @@
 
 #include <R.h>
 #include <Rinternals.h>
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext ("stats", String)
-#else
-#define _(String) (String)
-#endif
+#include "statsErr.h"
 
 SEXP isoreg(SEXP y);
 

diff --git a/src/library/stats/src/nls.c b/src/library/stats/src/nls.c
@@ -30,6 +30,7 @@
 #include <float.h>
 #include <R.h>
 #include <Rinternals.h>
+#include "statsErr.h"
 #include "nls.h"
 
 #ifndef MIN

diff --git a/src/library/stats/src/nls.h b/src/library/stats/src/nls.h
@@ -17,13 +17,6 @@
  *  https://www.R-project.org/Licenses/
  */
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext ("stats", String)
-#else
-#define _(String) (String)
-#endif
-
 SEXP nls_iter(SEXP m, SEXP control, SEXP doTraceArg);
 SEXP numeric_deriv(SEXP expr, SEXP theta, SEXP rho, SEXP dir, SEXP eps_, SEXP centr);
 

diff --git a/src/library/stats/src/optim.c b/src/library/stats/src/optim.c
@@ -25,13 +25,7 @@
 #include <R_ext/Applic.h>
 
 #include "statsR.h"
-#undef _
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext ("stats", String)
-#else
-#define _(String) (String)
-#endif
+#include "statsErr.h"
 
 SEXP getListElement(SEXP list, char *str)
 {

diff --git a/src/library/stats/src/optimize.c b/src/library/stats/src/optimize.c
@@ -31,14 +31,7 @@
 
 #include "statsR.h"
 #include "stats.h" // R_zeroin2
-
-#undef _
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext ("stats", String)
-#else
-#define _(String) (String)
-#endif
+#include "statsErr.h"
 
 
 /* Formerly in src/appl/fmim.c */

diff --git a/src/library/stats/src/port.h b/src/library/stats/src/port.h
@@ -31,13 +31,7 @@
 #include <string.h> // for memmove, memcpy, strcmp
 #include <Rinternals.h>
 #include <R_ext/RS.h>
-
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext ("stats", String)
-#else
-#define _(String) (String)
-#endif
+#include "statsErr.h"
 
 /* PORT interface functions - reverse communication */
 

diff --git a/src/library/stats/src/rcont.c b/src/library/stats/src/rcont.c
@@ -11,13 +11,6 @@
 #include <config.h>
 #endif
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext ("stats", String)
-#else
-#define _(String) (String)
-#endif
-
 #include <math.h>
 
 #include <R_ext/Random.h>
@@ -26,6 +19,7 @@
 #include <R_ext/Error.h>
 #include <R_ext/Print.h>
 #include <R_ext/Utils.h>
+#include "statsErr.h"
 #ifdef DEBUG_rcont2
 # include <limits.h>
 #endif

diff --git a/src/library/stats/src/smooth.c b/src/library/stats/src/smooth.c
@@ -27,18 +27,12 @@
 #include <math.h>
 
 #include <Rinternals.h> /* Arith.h, Boolean.h, Error.h, Memory.h .. */
+#include "statsErr.h"
 
 typedef enum {
     sm_NO_ENDRULE, sm_COPY_ENDRULE, sm_TUKEY_ENDRULE
 } R_SM_ENDRULE;
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext ("stats", String)
-#else
-#define _(String) (String)
-#endif
-
 static double med3(double u, double v, double w)
 {
     /* Median(u,v,w): */

diff --git a/src/library/stats/src/stats.h b/src/library/stats/src/stats.h
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2005-2020  The R Core Team
+ *  Copyright (C) 2005-2024  The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,15 +21,8 @@
 #define R_STATS_H
 
 /* definitions not involving SEXPs, including those for .Fortran. */
-
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext ("stats", String)
-#else
-#define _(String) (String)
-#endif
-
 #include <R_ext/RS.h>
+#include "statsErr.h"
 
 /* A starting point to extract such prototypes for .Fortran calls is
 

diff --git a/src/library/stats/src/statsErr.h b/src/library/stats/src/statsErr.h
@@ -0,0 +1,8 @@
+#include <R_ext/Error.h>
+#undef _
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#define _(String) dgettext ("stats", String)
+#else
+#define _(String) (String)
+#endif