attrinute before value

ripley · ripley · commit 557d58d22e9b · 2025-03-08T12:14:21.000Z
git-svn-id: https://svn.r-project.org/R/trunk@87903 00db46b3-68df-0310-9c12-caf00c1e9a41
diff --git a/src/include/R_ext/stats_package.h b/src/include/R_ext/stats_package.h
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2007--2024  The R Core Team.
+ *  Copyright (C) 2007--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
@@ -49,20 +49,20 @@ enum IVPos {AI = 90, AM = 94, ALGSAV = 50, COVMAT = 25,
 	    STATPR = 22, TOOBIG = 1, VNEED = 3, VSAVE = 59,
 	    X0PRT = 23};
 
-void attribute_hidden
+attribute_hidden void
 S_Rf_divset(int alg, int iv[], int liv, int lv, double v[]);
 
-void attribute_hidden
+attribute_hidden
 S_nlsb_iterate(double b[], double d[], double dr[], int iv[],
 	       int liv, int lv, int n, int nd, int p,
 	       double r[], double rd[], double v[], double x[]);
 
-void attribute_hidden
+attribute_hidden void
 S_nlminb_iterate(double b[], double d[], double fx, double g[],
 		 double h[], int iv[], int liv, int lv, int n,
 		 double v[], double x[]);
 
-void attribute_hidden
+attribute_hidden void
 S_rcont2(int nrow, int ncol, const int nrowt[], const int ncolt[],
          int ntotal, const double fact[],
 	 int jwork[], int matrix[]);
diff --git a/src/include/R_ext/stats_stubs.h b/src/include/R_ext/stats_stubs.h
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2007--2024  The R Core Team.
+ *  Copyright (C) 2007--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
@@ -34,7 +34,7 @@
 # define attribute_hidden
 #endif
 
-void attribute_hidden
+attribute_hidden void
 S_Rf_divset(int alg, int iv[], int liv, int lv, double v[])
 {
     static void(*fun)(int,int[],int,int,double[]) = NULL;
@@ -44,7 +44,7 @@ S_Rf_divset(int alg, int iv[], int liv, int lv, double v[])
     fun(alg, iv, liv, lv, v);
 }
 
-void attribute_hidden
+attribute_hidden void
 S_nlminb_iterate(double b[], double d[], double fx, double g[], double h[],
 		 int iv[], int liv, int lv, int n, double v[], double x[])
 {
@@ -57,7 +57,7 @@ S_nlminb_iterate(double b[], double d[], double fx, double g[], double h[],
     fun(b, d, fx, g, h, iv, liv, lv, n, v, x);
 }
 
-void attribute_hidden
+attribute_hidden void
 S_nlsb_iterate(double b[], double d[], double dr[], int iv[], int liv,
 	       int lv, int n, int nd, int p, double r[], double rd[],
 	       double v[], double x[])
@@ -73,7 +73,7 @@ S_nlsb_iterate(double b[], double d[], double dr[], int iv[], int liv,
     fun(b, d, dr, iv, liv, lv, n, nd, p, r, rd, v, x);
 }
 
-void attribute_hidden
+attribute_hidden void
 S_rcont2(int nrow, int ncol, const int nrowt[], const int ncolt[],
          int ntotal, const double fact[],
 	 int jwork[], int matrix[])
diff --git a/src/main/envir.c b/src/main/envir.c
@@ -4554,7 +4554,7 @@ attribute_hidden SEXP do_topenv(SEXP call, SEXP op, SEXP args, SEXP rho) {
     return topenv(target, envir);
 }
 
-Rboolean attribute_hidden isUnmodifiedSpecSym(SEXP sym, SEXP env) {
+attribute_hidden Rboolean isUnmodifiedSpecSym(SEXP sym, SEXP env) {
     if (!IS_SPECIAL_SYMBOL(sym))
 	return FALSE;
     for(;env != R_EmptyEnv; env = ENCLOS(env))
diff --git a/src/main/platform.c b/src/main/platform.c
@@ -1733,7 +1733,7 @@ attribute_hidden SEXP do_Rhome(SEXP call, SEXP op, SEXP args, SEXP rho)
 }
 
 #ifdef Win32
-static bool /*attribute_hidden*/ R_WFileExists(const wchar_t *path)
+static /*attribute_hidden*/ bool R_WFileExists(const wchar_t *path)
 {
     struct _stati64 sb;
     return _wstati64(path, &sb) == 0;
diff --git a/src/modules/internet/libcurl.c b/src/modules/internet/libcurl.c
@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2015-2024 The R Core Team
+ *  Copyright (C) 2015-2025 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
@@ -95,7 +95,7 @@ R_curl_multi_wait(CURLM *multi_handle,
 }
 #endif
 
-SEXP attribute_hidden in_do_curlVersion(SEXP call, SEXP op, SEXP args, SEXP rho)
+attribute_hidden SEXP in_do_curlVersion(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
     checkArity(op, args);
     SEXP ans = PROTECT(allocVector(STRSXP, 1));
@@ -349,7 +349,7 @@ static void handle_cleanup(void *data)
 	curl_easy_cleanup(hnd);
 }
 
-SEXP attribute_hidden
+attribute_hidden SEXP
 in_do_curlGetHeaders(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
     checkArity(op, args);
@@ -847,7 +847,7 @@ static void download_close_finished(download_cleanup_info *c)
 
 /* download(url, destfile, quiet, mode, headers, cacheOK) */
 
-SEXP attribute_hidden
+attribute_hidden SEXP
 in_do_curlDownload(SEXP call, SEXP op, SEXP args, SEXP rho)
 {
     checkArity(op, args);
diff --git a/src/nmath/bd0.c b/src/nmath/bd0.c
@@ -45,7 +45,7 @@
  */
 #include "nmath.h"
 
-double attribute_hidden bd0(double x, double np)
+attribute_hidden double bd0(double x, double np)
 {
     if(!R_FINITE(x) || !R_FINITE(np) || np == 0.0) ML_WARN_return_NAN;
 
@@ -227,7 +227,7 @@ static const float bd0_scale[128 + 1][4] = {
  *
  * Deliver the result back in two parts, *yh and *yl.
  */
-void attribute_hidden ebd0(double x, double M, double *yh, double *yl)
+attribute_hidden void ebd0(double x, double M, double *yh, double *yl)
 {
 	const int Sb = 10;
 	const double S = 1u << Sb; // = 2^10 = 1024
diff --git a/src/nmath/chebyshev.c b/src/nmath/chebyshev.c
@@ -45,7 +45,7 @@
 /* NaNs propagated correctly */
 
 
-int attribute_hidden chebyshev_init(double *dos, int nos, double eta)
+attribute_hidden int chebyshev_init(double *dos, int nos, double eta)
 {
     int i, ii;
     double err;
@@ -66,7 +66,7 @@ int attribute_hidden chebyshev_init(double *dos, int nos, double eta)
 }
 
 
-double attribute_hidden chebyshev_eval(double x, const double *a, const int n)
+attribute_hidden double chebyshev_eval(double x, const double *a, const int n)
 {
     double b0, b1, b2, twox;
     int i;
diff --git a/src/nmath/choose.c b/src/nmath/choose.c
@@ -1,6 +1,6 @@
 /*
  *  Mathlib : A C Library of Special Functions
- *  Copyright (C) 2004-2024 The R Foundation
+ *  Copyright (C) 2004-2025 The R Foundation
  *  Copyright (C) 1998      Ross Ihaka
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -46,7 +46,7 @@
 void R_CheckStack(void);
 #endif
 
-double attribute_hidden lfastchoose(double n, double k)
+attribute_hidden double lfastchoose(double n, double k)
 {
     return -log(n + 1.) - lbeta(n - k + 1., k + 1.);
 }
diff --git a/src/nmath/gamma_cody.c b/src/nmath/gamma_cody.c
@@ -9,7 +9,7 @@
 
 #include "nmath.h"
 
-double attribute_hidden Rf_gamma_cody(double x)
+attribute_hidden double Rf_gamma_cody(double x)
 {
 /* ----------------------------------------------------------------------
 
diff --git a/src/nmath/gammalims.c b/src/nmath/gammalims.c
@@ -1,7 +1,7 @@
 /*
  *  Mathlib : A C Library of Special Functions
  *  Copyright (C) 1998 Ross Ihaka
- *  Copyright (C) 1999-2000  The R Core Team
+ *  Copyright (C) 1999-2025  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
@@ -36,7 +36,7 @@
 
 #include "nmath.h"
 
-void attribute_hidden gammalims(double *xmin, double *xmax)
+attribute_hidden void gammalims(double *xmin, double *xmax)
 {
 /* FIXME: Even better: If IEEE, #define these in nmath.h
 	  and don't call gammalims() at all
diff --git a/src/nmath/lgammacor.c b/src/nmath/lgammacor.c
@@ -44,7 +44,7 @@
 
 #include "nmath.h"
 
-double attribute_hidden lgammacor(double x)
+attribute_hidden double lgammacor(double x)
 {
     const static double algmcs[15] = {  // below, nalgm = 5 ==> only the first 5 are used!
 	+.1666389480451863247205729650822e+0,
diff --git a/src/nmath/mlutils.c b/src/nmath/mlutils.c
@@ -1,6 +1,6 @@
 /*
  *  Mathlib : A C Library of Special Functions
- *  Copyright (C) 1998-2024 The R Core Team
+ *  Copyright (C) 1998-2025 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
@@ -110,7 +110,7 @@ double R_PosInf = ML_POSINF, R_NegInf = ML_NEGINF;
 
 #include <stdio.h>
 #include <stdarg.h>
-void attribute_hidden REprintf(const char *format, ...)
+attribute_hidden void REprintf(const char *format, ...)
 {
     va_list(ap);
     va_start(ap, format);
diff --git a/src/nmath/nmath.h b/src/nmath/nmath.h
@@ -1,6 +1,6 @@
 /*
  *  Mathlib : A C Library of Special Functions
- *  Copyright (C) 1998-2024  The R Core Team
+ *  Copyright (C) 1998-2025  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
@@ -206,32 +206,32 @@ int R_finite(double);
 
 	/* Chebyshev Series */
 
-int	attribute_hidden chebyshev_init(double*, int, double);
-double	attribute_hidden chebyshev_eval(double, const double *, const int);
+attribute_hidden int chebyshev_init(double*, int, double);
+attribute_hidden double chebyshev_eval(double, const double *, const int);
 
 	/* Gamma and Related Functions */
 
-void	attribute_hidden gammalims(double*, double*);
-double	attribute_hidden lgammacor(double); /* log(gamma) correction */
-double  attribute_hidden stirlerr(double);  /* Stirling expansion "error" */
+attribute_hidden void gammalims(double*, double*);
+attribute_hidden double lgammacor(double); /* log(gamma) correction */
+attribute_hidden double stirlerr(double);  /* Stirling expansion "error" */
 
-double	attribute_hidden lfastchoose(double, double);
+attribute_hidden double lfastchoose(double, double);
 
-double  attribute_hidden bd0(double, double);
-void    attribute_hidden ebd0(double, double, double*, double*);
+attribute_hidden double bd0(double, double);
+attribute_hidden void ebd0(double, double, double*, double*);
 
-double  attribute_hidden pnchisq_raw(double, double, double, double, double,
+attribute_hidden double pnchisq_raw(double, double, double, double, double,
 				     int, Rboolean, Rboolean);
-double  attribute_hidden pgamma_raw(double, double, int, int);
-double	attribute_hidden pbeta_raw(double, double, double, int, int);
-double  attribute_hidden qchisq_appr(double, double, double, int, int, double tol);
-LDOUBLE attribute_hidden pnbeta_raw(double, double, double, double, double);
-double	attribute_hidden pnbeta2(double, double, double, double, double, int, int);
+attribute_hidden double pgamma_raw(double, double, int, int);
+attribute_hidden double pbeta_raw(double, double, double, int, int);
+attribute_hidden double qchisq_appr(double, double, double, int, int, double tol);
+attribute_hidden LDOUBLE pnbeta_raw(double, double, double, double, double);
+attribute_hidden double pnbeta2(double, double, double, double, double, int, int);
 
 int	Rf_i1mach(int);
 
 /* From toms708.c */
-void attribute_hidden bratio(double a, double b, double x, double y,
+attribute_hidden void bratio(double a, double b, double x, double y,
 	    		     double *w, double *w1, int *ierr, int log_p);
 
 
diff --git a/src/nmath/pnbeta.c b/src/nmath/pnbeta.c
@@ -19,7 +19,7 @@
 #include "nmath.h"
 #include "dpq.h"
 
-LDOUBLE attribute_hidden
+attribute_hidden LDOUBLE
 pnbeta_raw(double x, double o_x, double a, double b, double ncp)
 {
     /* o_x  == 1 - x  but maybe more accurate */
@@ -82,7 +82,7 @@ pnbeta_raw(double x, double o_x, double a, double b, double ncp)
     return ans;
 }
 
-double attribute_hidden
+attribute_hidden double
 pnbeta2(double x, double o_x, double a, double b, double ncp,
 	/* o_x  == 1 - x  but maybe more accurate */
 	int lower_tail, int log_p)
diff --git a/src/nmath/pnchisq.c b/src/nmath/pnchisq.c
@@ -88,7 +88,7 @@ double pnchisq(double x, double df, double ncp, int lower_tail, int log_p)
 }
 
 // Used in this file and in qnchisq.c
-double attribute_hidden
+attribute_hidden double
 pnchisq_raw(double x, double f, double theta /* = ncp */,
 	    double errmax, double reltol, int itrmax,
 	    Rboolean lower_tail, Rboolean log_p)
diff --git a/src/nmath/stirlerr.c b/src/nmath/stirlerr.c
@@ -4,7 +4,7 @@
  *    October 23, 2000.
  *
  *  Merge in to R:
- *	Copyright (C) 2000-2024, The R Core Team
+ *	Copyright (C) 2000-2025, 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
@@ -50,7 +50,7 @@
  *     stirlerr(n), stirlerr(x), stirlerr(n-x) from binom_raw(x, n, ..) for all possible 0 < x < n
  */
 
-double attribute_hidden stirlerr(double n)
+attribute_hidden double stirlerr(double n)
 {
 
 #define S0 0.083333333333333333333       /* 1/12 */
diff --git a/src/nmath/toms708.c b/src/nmath/toms708.c
@@ -84,7 +84,7 @@ static double gsumln(double, double);
  * add log_p  and work towards gaining precision in that case
  */
 
-void attribute_hidden
+attribute_hidden void
 bratio(double a, double b, double x, double y, double *w, double *w1,
        int *ierr, int log_p)
 {

Original file line number	Diff line number	Diff line change
`@@ -4554,7 +4554,7 @@ attribute_hidden SEXP do_topenv(SEXP call, SEXP op, SEXP args, SEXP rho) {`
`4554`	`4554`	`return topenv(target, envir);`
`4555`	`4555`	`}`
`4556`	`4556`
`4557`		`-Rboolean attribute_hidden isUnmodifiedSpecSym(SEXP sym, SEXP env) {`
	`4557`	`+attribute_hidden Rboolean isUnmodifiedSpecSym(SEXP sym, SEXP env) {`
`4558`	`4558`	`if (!IS_SPECIAL_SYMBOL(sym))`
`4559`	`4559`	`return FALSE;`
`4560`	`4560`	`for(;env != R_EmptyEnv; env = ENCLOS(env))`
Original file line number	Diff line number	Diff line change
`@@ -1733,7 +1733,7 @@ attribute_hidden SEXP do_Rhome(SEXP call, SEXP op, SEXP args, SEXP rho)`
`1733`	`1733`	`}`
`1734`	`1734`
`1735`	`1735`	`#ifdef Win32`
`1736`		`-static bool /attribute_hidden/ R_WFileExists(const wchar_t *path)`
	`1736`	`+static /attribute_hidden/ bool R_WFileExists(const wchar_t *path)`
`1737`	`1737`	`{`
`1738`	`1738`	`struct _stati64 sb;`
`1739`	`1739`	`return _wstati64(path, &sb) == 0;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/*`
`2`	`2`	`* R : A Computer Language for Statistical Data Analysis`
`3`		`- * Copyright (C) 2015-2024 The R Core Team`
	`3`	`+ * Copyright (C) 2015-2025 The R Core Team`
`4`	`4`	`*`
`5`	`5`	`* This program is free software; you can redistribute it and/or modify`
`6`	`6`	`* it under the terms of the GNU General Public License as published by`
`@@ -95,7 +95,7 @@ R_curl_multi_wait(CURLM *multi_handle,`
`95`	`95`	`}`
`96`	`96`	`#endif`
`97`	`97`
`98`		`-SEXP attribute_hidden in_do_curlVersion(SEXP call, SEXP op, SEXP args, SEXP rho)`
	`98`	`+attribute_hidden SEXP in_do_curlVersion(SEXP call, SEXP op, SEXP args, SEXP rho)`
`99`	`99`	`{`
`100`	`100`	`checkArity(op, args);`
`101`	`101`	`SEXP ans = PROTECT(allocVector(STRSXP, 1));`
`@@ -349,7 +349,7 @@ static void handle_cleanup(void *data)`
`349`	`349`	`curl_easy_cleanup(hnd);`
`350`	`350`	`}`
`351`	`351`
`352`		`-SEXP attribute_hidden`
	`352`	`+attribute_hidden SEXP`
`353`	`353`	`in_do_curlGetHeaders(SEXP call, SEXP op, SEXP args, SEXP rho)`
`354`	`354`	`{`
`355`	`355`	`checkArity(op, args);`
`@@ -847,7 +847,7 @@ static void download_close_finished(download_cleanup_info *c)`
`847`	`847`
`848`	`848`	`/* download(url, destfile, quiet, mode, headers, cacheOK) */`
`849`	`849`
`850`		`-SEXP attribute_hidden`
	`850`	`+attribute_hidden SEXP`
`851`	`851`	`in_do_curlDownload(SEXP call, SEXP op, SEXP args, SEXP rho)`
`852`	`852`	`{`
`853`	`853`	`checkArity(op, args);`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`	`*/`
`46`	`46`	`#include "nmath.h"`
`47`	`47`
`48`		`-double attribute_hidden bd0(double x, double np)`
	`48`	`+attribute_hidden double bd0(double x, double np)`
`49`	`49`	`{`
`50`	`50`	`if(!R_FINITE(x) \|\| !R_FINITE(np) \|\| np == 0.0) ML_WARN_return_NAN;`
`51`	`51`
`@@ -227,7 +227,7 @@ static const float bd0_scale[128 + 1][4] = {`
`227`	`227`	`*`
`228`	`228`	`* Deliver the result back in two parts, yh and yl.`
`229`	`229`	`*/`
`230`		`-void attribute_hidden ebd0(double x, double M, double yh, double yl)`
	`230`	`+attribute_hidden void ebd0(double x, double M, double yh, double yl)`
`231`	`231`	`{`
`232`	`232`	`const int Sb = 10;`
`233`	`233`	`const double S = 1u << Sb; // = 2^10 = 1024`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/*`
`2`	`2`	`* Mathlib : A C Library of Special Functions`
`3`		`- * Copyright (C) 2004-2024 The R Foundation`
	`3`	`+ * Copyright (C) 2004-2025 The R Foundation`
`4`	`4`	`* Copyright (C) 1998 Ross Ihaka`
`5`	`5`	`*`
`6`	`6`	`* This program is free software; you can redistribute it and/or modify`
`@@ -46,7 +46,7 @@`
`46`	`46`	`void R_CheckStack(void);`
`47`	`47`	`#endif`
`48`	`48`
`49`		`-double attribute_hidden lfastchoose(double n, double k)`
	`49`	`+attribute_hidden double lfastchoose(double n, double k)`
`50`	`50`	`{`
`51`	`51`	`return -log(n + 1.) - lbeta(n - k + 1., k + 1.);`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`#include "nmath.h"`
`11`	`11`
`12`		`-double attribute_hidden Rf_gamma_cody(double x)`
	`12`	`+attribute_hidden double Rf_gamma_cody(double x)`
`13`	`13`	`{`
`14`	`14`	`/* ----------------------------------------------------------------------`
`15`	`15`