Skip to content

P
Postgres FD Implementation
Commit c1898c3e authored by Andres Freund's avatar Andres Freund
Browse files
Options

Constify numeric.c. 

This allows the compiler/linker to move the static variables to a
read-only segment.  Not all the signature changes are necessary, but
it seems better to apply const in a consistent manner.

Reviewed-By: Tom Lane
Discussion: https://postgr.es/m/20170910232154.asgml44ji2b7lv3d@alap3.anarazel.de
parent b8060e41
Show whitespace changes
Inline Side-by-side
Showing with 111 additions and 101 deletions
src/backend/utils/adt/numeric.c
View file @ c1898c3e
...@@ -367,59 +367,59 @@ typedef struct NumericSumAccum ...@@ -367,59 +367,59 @@ typedef struct NumericSumAccum
* Some preinitialized constants * Some preinitialized constants
* ---------- * ----------
*/ */
static NumericDigit const_zero_data[1] = {0}; static const NumericDigit const_zero_data[1] = {0};
static NumericVar const_zero = static const NumericVar const_zero =
{0, 0, NUMERIC_POS, 0, NULL, const_zero_data}; {0, 0, NUMERIC_POS, 0, NULL, (NumericDigit *) const_zero_data};
static NumericDigit const_one_data[1] = {1}; static const NumericDigit const_one_data[1] = {1};
static NumericVar const_one = static const NumericVar const_one =
{1, 0, NUMERIC_POS, 0, NULL, const_one_data}; {1, 0, NUMERIC_POS, 0, NULL, (NumericDigit *) const_one_data};
static NumericDigit const_two_data[1] = {2}; static const NumericDigit const_two_data[1] = {2};
static NumericVar const_two = static const NumericVar const_two =
{1, 0, NUMERIC_POS, 0, NULL, const_two_data}; {1, 0, NUMERIC_POS, 0, NULL, (NumericDigit *) const_two_data};
#if DEC_DIGITS == 4 || DEC_DIGITS == 2 #if DEC_DIGITS == 4 || DEC_DIGITS == 2
static NumericDigit const_ten_data[1] = {10}; static const NumericDigit const_ten_data[1] = {10};
static NumericVar const_ten = static const NumericVar const_ten =
{1, 0, NUMERIC_POS, 0, NULL, const_ten_data}; {1, 0, NUMERIC_POS, 0, NULL, (NumericDigit *) const_ten_data};
#elif DEC_DIGITS == 1 #elif DEC_DIGITS == 1
static NumericDigit const_ten_data[1] = {1}; static const NumericDigit const_ten_data[1] = {1};
static NumericVar const_ten = static const NumericVar const_ten =
{1, 1, NUMERIC_POS, 0, NULL, const_ten_data}; {1, 1, NUMERIC_POS, 0, NULL, (NumericDigit *) const_ten_data};
#endif #endif
#if DEC_DIGITS == 4 #if DEC_DIGITS == 4
static NumericDigit const_zero_point_five_data[1] = {5000}; static const NumericDigit const_zero_point_five_data[1] = {5000};
#elif DEC_DIGITS == 2 #elif DEC_DIGITS == 2
static NumericDigit const_zero_point_five_data[1] = {50}; static const NumericDigit const_zero_point_five_data[1] = {50};
#elif DEC_DIGITS == 1 #elif DEC_DIGITS == 1
static NumericDigit const_zero_point_five_data[1] = {5}; static const NumericDigit const_zero_point_five_data[1] = {5};
#endif #endif
static NumericVar const_zero_point_five = static const NumericVar const_zero_point_five =
{1, -1, NUMERIC_POS, 1, NULL, const_zero_point_five_data}; {1, -1, NUMERIC_POS, 1, NULL, (NumericDigit *) const_zero_point_five_data};
#if DEC_DIGITS == 4 #if DEC_DIGITS == 4
static NumericDigit const_zero_point_nine_data[1] = {9000}; static const NumericDigit const_zero_point_nine_data[1] = {9000};
#elif DEC_DIGITS == 2 #elif DEC_DIGITS == 2
static NumericDigit const_zero_point_nine_data[1] = {90}; static const NumericDigit const_zero_point_nine_data[1] = {90};
#elif DEC_DIGITS == 1 #elif DEC_DIGITS == 1
static NumericDigit const_zero_point_nine_data[1] = {9}; static const NumericDigit const_zero_point_nine_data[1] = {9};
#endif #endif
static NumericVar const_zero_point_nine = static const NumericVar const_zero_point_nine =
{1, -1, NUMERIC_POS, 1, NULL, const_zero_point_nine_data}; {1, -1, NUMERIC_POS, 1, NULL, (NumericDigit *) const_zero_point_nine_data};
#if DEC_DIGITS == 4 #if DEC_DIGITS == 4
static NumericDigit const_one_point_one_data[2] = {1, 1000}; static const NumericDigit const_one_point_one_data[2] = {1, 1000};
#elif DEC_DIGITS == 2 #elif DEC_DIGITS == 2
static NumericDigit const_one_point_one_data[2] = {1, 10}; static const NumericDigit const_one_point_one_data[2] = {1, 10};
#elif DEC_DIGITS == 1 #elif DEC_DIGITS == 1
static NumericDigit const_one_point_one_data[2] = {1, 1}; static const NumericDigit const_one_point_one_data[2] = {1, 1};
#endif #endif
static NumericVar const_one_point_one = static const NumericVar const_one_point_one =
{2, 0, NUMERIC_POS, 1, NULL, const_one_point_one_data}; {2, 0, NUMERIC_POS, 1, NULL, (NumericDigit *) const_one_point_one_data};
static NumericVar const_nan = static const NumericVar const_nan =
{0, 0, NUMERIC_NAN, 0, NULL, NULL}; {0, 0, NUMERIC_NAN, 0, NULL, NULL};
#if DEC_DIGITS == 4 #if DEC_DIGITS == 4
...@@ -467,74 +467,84 @@ static const char *set_var_from_str(const char *str, const char *cp, ...@@ -467,74 +467,84 @@ static const char *set_var_from_str(const char *str, const char *cp,
NumericVar *dest); NumericVar *dest);
static void set_var_from_num(Numeric value, NumericVar *dest); static void set_var_from_num(Numeric value, NumericVar *dest);
static void init_var_from_num(Numeric num, NumericVar *dest); static void init_var_from_num(Numeric num, NumericVar *dest);
static void set_var_from_var(NumericVar *value, NumericVar *dest); static void set_var_from_var(const NumericVar *value, NumericVar *dest);
static char *get_str_from_var(NumericVar *var); static char *get_str_from_var(const NumericVar *var);
static char *get_str_from_var_sci(NumericVar *var, int rscale); static char *get_str_from_var_sci(const NumericVar *var, int rscale);
static Numeric make_result(NumericVar *var); static Numeric make_result(const NumericVar *var);
static void apply_typmod(NumericVar *var, int32 typmod); static void apply_typmod(NumericVar *var, int32 typmod);
static int32 numericvar_to_int32(NumericVar *var); static int32 numericvar_to_int32(const NumericVar *var);
static bool numericvar_to_int64(NumericVar *var, int64 *result); static bool numericvar_to_int64(const NumericVar *var, int64 *result);
static void int64_to_numericvar(int64 val, NumericVar *var); static void int64_to_numericvar(int64 val, NumericVar *var);
#ifdef HAVE_INT128 #ifdef HAVE_INT128
static bool numericvar_to_int128(NumericVar *var, int128 *result); static bool numericvar_to_int128(const NumericVar *var, int128 *result);
static void int128_to_numericvar(int128 val, NumericVar *var); static void int128_to_numericvar(int128 val, NumericVar *var);
#endif #endif
static double numeric_to_double_no_overflow(Numeric num); static double numeric_to_double_no_overflow(Numeric num);
static double numericvar_to_double_no_overflow(NumericVar *var); static double numericvar_to_double_no_overflow(const NumericVar *var);
static Datum numeric_abbrev_convert(Datum original_datum, SortSupport ssup); static Datum numeric_abbrev_convert(Datum original_datum, SortSupport ssup);
static bool numeric_abbrev_abort(int memtupcount, SortSupport ssup); static bool numeric_abbrev_abort(int memtupcount, SortSupport ssup);
static int numeric_fast_cmp(Datum x, Datum y, SortSupport ssup); static int numeric_fast_cmp(Datum x, Datum y, SortSupport ssup);
static int numeric_cmp_abbrev(Datum x, Datum y, SortSupport ssup); static int numeric_cmp_abbrev(Datum x, Datum y, SortSupport ssup);
static Datum numeric_abbrev_convert_var(NumericVar *var, NumericSortSupport *nss); static Datum numeric_abbrev_convert_var(const NumericVar *var,
NumericSortSupport *nss);
static int cmp_numerics(Numeric num1, Numeric num2); static int cmp_numerics(Numeric num1, Numeric num2);
static int cmp_var(NumericVar *var1, NumericVar *var2); static int cmp_var(const NumericVar *var1, const NumericVar *var2);
static int cmp_var_common(const NumericDigit *var1digits, int var1ndigits, static int cmp_var_common(const NumericDigit *var1digits, int var1ndigits,
int var1weight, int var1sign, int var1weight, int var1sign,
const NumericDigit *var2digits, int var2ndigits, const NumericDigit *var2digits, int var2ndigits,
int var2weight, int var2sign); int var2weight, int var2sign);
static void add_var(NumericVar *var1, NumericVar *var2, NumericVar *result); static void add_var(const NumericVar *var1, const NumericVar *var2,
static void sub_var(NumericVar *var1, NumericVar *var2, NumericVar *result); NumericVar *result);
static void mul_var(NumericVar *var1, NumericVar *var2, NumericVar *result, static void sub_var(const NumericVar *var1, const NumericVar *var2,
NumericVar *result);
static void mul_var(const NumericVar *var1, const NumericVar *var2,
NumericVar *result,
int rscale); int rscale);
static void div_var(NumericVar *var1, NumericVar *var2, NumericVar *result, static void div_var(const NumericVar *var1, const NumericVar *var2,
NumericVar *result,
int rscale, bool round); int rscale, bool round);
static void div_var_fast(NumericVar *var1, NumericVar *var2, NumericVar *result, static void div_var_fast(const NumericVar *var1, const NumericVar *var2,
int rscale, bool round); NumericVar *result, int rscale, bool round);
static int select_div_scale(NumericVar *var1, NumericVar *var2); static int select_div_scale(const NumericVar *var1, const NumericVar *var2);
static void mod_var(NumericVar *var1, NumericVar *var2, NumericVar *result); static void mod_var(const NumericVar *var1, const NumericVar *var2,
static void ceil_var(NumericVar *var, NumericVar *result); NumericVar *result);
static void floor_var(NumericVar *var, NumericVar *result); static void ceil_var(const NumericVar *var, NumericVar *result);
static void floor_var(const NumericVar *var, NumericVar *result);
static void sqrt_var(NumericVar *arg, NumericVar *result, int rscale);
static void exp_var(NumericVar *arg, NumericVar *result, int rscale); static void sqrt_var(const NumericVar *arg, NumericVar *result, int rscale);
static int estimate_ln_dweight(NumericVar *var); static void exp_var(const NumericVar *arg, NumericVar *result, int rscale);
static void ln_var(NumericVar *arg, NumericVar *result, int rscale); static int estimate_ln_dweight(const NumericVar *var);
static void log_var(NumericVar *base, NumericVar *num, NumericVar *result); static void ln_var(const NumericVar *arg, NumericVar *result, int rscale);
static void power_var(NumericVar *base, NumericVar *exp, NumericVar *result); static void log_var(const NumericVar *base, const NumericVar *num,
static void power_var_int(NumericVar *base, int exp, NumericVar *result, NumericVar *result);
static void power_var(const NumericVar *base, const NumericVar *exp,
NumericVar *result);
static void power_var_int(const NumericVar *base, int exp, NumericVar *result,
int rscale); int rscale);
static int cmp_abs(NumericVar *var1, NumericVar *var2); static int cmp_abs(const NumericVar *var1, const NumericVar *var2);
static int cmp_abs_common(const NumericDigit *var1digits, int var1ndigits, static int cmp_abs_common(const NumericDigit *var1digits, int var1ndigits,
int var1weight, int var1weight,
const NumericDigit *var2digits, int var2ndigits, const NumericDigit *var2digits, int var2ndigits,
int var2weight); int var2weight);
static void add_abs(NumericVar *var1, NumericVar *var2, NumericVar *result); static void add_abs(const NumericVar *var1, const NumericVar *var2,
static void sub_abs(NumericVar *var1, NumericVar *var2, NumericVar *result); NumericVar *result);
static void sub_abs(const NumericVar *var1, const NumericVar *var2,
NumericVar *result);
static void round_var(NumericVar *var, int rscale); static void round_var(NumericVar *var, int rscale);
static void trunc_var(NumericVar *var, int rscale); static void trunc_var(NumericVar *var, int rscale);
static void strip_var(NumericVar *var); static void strip_var(NumericVar *var);
static void compute_bucket(Numeric operand, Numeric bound1, Numeric bound2, static void compute_bucket(Numeric operand, Numeric bound1, Numeric bound2,
NumericVar *count_var, NumericVar *result_var); const NumericVar *count_var, NumericVar *result_var);
static void accum_sum_add(NumericSumAccum *accum, NumericVar *var1); static void accum_sum_add(NumericSumAccum *accum, const NumericVar *var1);
static void accum_sum_rescale(NumericSumAccum *accum, NumericVar *val); static void accum_sum_rescale(NumericSumAccum *accum, const NumericVar *val);
static void accum_sum_carry(NumericSumAccum *accum); static void accum_sum_carry(NumericSumAccum *accum);
static void accum_sum_reset(NumericSumAccum *accum); static void accum_sum_reset(NumericSumAccum *accum);
static void accum_sum_final(NumericSumAccum *accum, NumericVar *result); static void accum_sum_final(NumericSumAccum *accum, NumericVar *result);
...@@ -1551,7 +1561,7 @@ width_bucket_numeric(PG_FUNCTION_ARGS) ...@@ -1551,7 +1561,7 @@ width_bucket_numeric(PG_FUNCTION_ARGS)
*/ */
static void static void
compute_bucket(Numeric operand, Numeric bound1, Numeric bound2, compute_bucket(Numeric operand, Numeric bound1, Numeric bound2,
NumericVar *count_var, NumericVar *result_var) const NumericVar *count_var, NumericVar *result_var)
{ {
NumericVar bound1_var; NumericVar bound1_var;
NumericVar bound2_var; NumericVar bound2_var;
...@@ -1883,7 +1893,7 @@ numeric_cmp_abbrev(Datum x, Datum y, SortSupport ssup) ...@@ -1883,7 +1893,7 @@ numeric_cmp_abbrev(Datum x, Datum y, SortSupport ssup)
#if NUMERIC_ABBREV_BITS == 64 #if NUMERIC_ABBREV_BITS == 64
static Datum static Datum
numeric_abbrev_convert_var(NumericVar *var, NumericSortSupport *nss) numeric_abbrev_convert_var(const NumericVar *var, NumericSortSupport *nss)
{ {
int ndigits = var->ndigits; int ndigits = var->ndigits;
int weight = var->weight; int weight = var->weight;
...@@ -1938,7 +1948,7 @@ numeric_abbrev_convert_var(NumericVar *var, NumericSortSupport *nss) ...@@ -1938,7 +1948,7 @@ numeric_abbrev_convert_var(NumericVar *var, NumericSortSupport *nss)
#if NUMERIC_ABBREV_BITS == 32 #if NUMERIC_ABBREV_BITS == 32
static Datum static Datum
numeric_abbrev_convert_var(NumericVar *var, NumericSortSupport *nss) numeric_abbrev_convert_var(const NumericVar *var, NumericSortSupport *nss)
{ {
int ndigits = var->ndigits; int ndigits = var->ndigits;
int weight = var->weight; int weight = var->weight;
...@@ -3002,7 +3012,7 @@ numeric_int4(PG_FUNCTION_ARGS) ...@@ -3002,7 +3012,7 @@ numeric_int4(PG_FUNCTION_ARGS)
* ereport(). The input NumericVar is *not* free'd. * ereport(). The input NumericVar is *not* free'd.
*/ */
static int32 static int32
numericvar_to_int32(NumericVar *var) numericvar_to_int32(const NumericVar *var)
{ {
int32 result; int32 result;
int64 val; int64 val;
...@@ -4719,7 +4729,7 @@ numeric_stddev_internal(NumericAggState *state, ...@@ -4719,7 +4729,7 @@ numeric_stddev_internal(NumericAggState *state,
vsumX, vsumX,
vsumX2, vsumX2,
vNminus1; vNminus1;
NumericVar *comp; const NumericVar *comp;
int rscale; int rscale;
/* Deal with empty input and NaN-input cases */ /* Deal with empty input and NaN-input cases */
...@@ -5715,7 +5725,7 @@ init_var_from_num(Numeric num, NumericVar *dest) ...@@ -5715,7 +5725,7 @@ init_var_from_num(Numeric num, NumericVar *dest)
* Copy one variable into another * Copy one variable into another
*/ */
static void static void
set_var_from_var(NumericVar *value, NumericVar *dest) set_var_from_var(const NumericVar *value, NumericVar *dest)
{ {
NumericDigit *newbuf; NumericDigit *newbuf;
...@@ -5741,7 +5751,7 @@ set_var_from_var(NumericVar *value, NumericVar *dest) ...@@ -5741,7 +5751,7 @@ set_var_from_var(NumericVar *value, NumericVar *dest)
* Returns a palloc'd string. * Returns a palloc'd string.
*/ */
static char * static char *
get_str_from_var(NumericVar *var) get_str_from_var(const NumericVar *var)
{ {
int dscale; int dscale;
char *str; char *str;
...@@ -5894,7 +5904,7 @@ get_str_from_var(NumericVar *var) ...@@ -5894,7 +5904,7 @@ get_str_from_var(NumericVar *var)
* Returns a palloc'd string. * Returns a palloc'd string.
*/ */
static char * static char *
get_str_from_var_sci(NumericVar *var, int rscale) get_str_from_var_sci(const NumericVar *var, int rscale)
{ {
int32 exponent; int32 exponent;
NumericVar denominator; NumericVar denominator;
...@@ -5980,7 +5990,7 @@ get_str_from_var_sci(NumericVar *var, int rscale) ...@@ -5980,7 +5990,7 @@ get_str_from_var_sci(NumericVar *var, int rscale)
* a variable. * a variable.
*/ */
static Numeric static Numeric
make_result(NumericVar *var) make_result(const NumericVar *var)
{ {
Numeric result; Numeric result;
NumericDigit *digits = var->digits; NumericDigit *digits = var->digits;
...@@ -6143,7 +6153,7 @@ apply_typmod(NumericVar *var, int32 typmod) ...@@ -6143,7 +6153,7 @@ apply_typmod(NumericVar *var, int32 typmod)
* If overflow, return FALSE (no error is raised). Return TRUE if okay. * If overflow, return FALSE (no error is raised). Return TRUE if okay.
*/ */
static bool static bool
numericvar_to_int64(NumericVar *var, int64 *result) numericvar_to_int64(const NumericVar *var, int64 *result)
{ {
NumericDigit *digits; NumericDigit *digits;
int ndigits; int ndigits;
...@@ -6262,7 +6272,7 @@ int64_to_numericvar(int64 val, NumericVar *var) ...@@ -6262,7 +6272,7 @@ int64_to_numericvar(int64 val, NumericVar *var)
* If overflow, return FALSE (no error is raised). Return TRUE if okay. * If overflow, return FALSE (no error is raised). Return TRUE if okay.
*/ */
static bool static bool
numericvar_to_int128(NumericVar *var, int128 *result) numericvar_to_int128(const NumericVar *var, int128 *result)
{ {
NumericDigit *digits; NumericDigit *digits;
int ndigits; int ndigits;
...@@ -6406,7 +6416,7 @@ numeric_to_double_no_overflow(Numeric num) ...@@ -6406,7 +6416,7 @@ numeric_to_double_no_overflow(Numeric num)
/* As above, but work from a NumericVar */ /* As above, but work from a NumericVar */
static double static double
numericvar_to_double_no_overflow(NumericVar *var) numericvar_to_double_no_overflow(const NumericVar *var)
{ {
char *tmp; char *tmp;
double val; double val;
...@@ -6438,7 +6448,7 @@ numericvar_to_double_no_overflow(NumericVar *var) ...@@ -6438,7 +6448,7 @@ numericvar_to_double_no_overflow(NumericVar *var)
* truncated to no digits. * truncated to no digits.
*/ */
static int static int
cmp_var(NumericVar *var1, NumericVar *var2) cmp_var(const NumericVar *var1, const NumericVar *var2)
{ {
return cmp_var_common(var1->digits, var1->ndigits, return cmp_var_common(var1->digits, var1->ndigits,
var1->weight, var1->sign, var1->weight, var1->sign,
...@@ -6496,7 +6506,7 @@ cmp_var_common(const NumericDigit *var1digits, int var1ndigits, ...@@ -6496,7 +6506,7 @@ cmp_var_common(const NumericDigit *var1digits, int var1ndigits,
* result might point to one of the operands too without danger. * result might point to one of the operands too without danger.
*/ */
static void static void
add_var(NumericVar *var1, NumericVar *var2, NumericVar *result) add_var(const NumericVar *var1, const NumericVar *var2, NumericVar *result)
{ {
/* /*
* Decide on the signs of the two variables what to do * Decide on the signs of the two variables what to do
...@@ -6613,7 +6623,7 @@ add_var(NumericVar *var1, NumericVar *var2, NumericVar *result) ...@@ -6613,7 +6623,7 @@ add_var(NumericVar *var1, NumericVar *var2, NumericVar *result)
* result might point to one of the operands too without danger. * result might point to one of the operands too without danger.
*/ */
static void static void
sub_var(NumericVar *var1, NumericVar *var2, NumericVar *result) sub_var(const NumericVar *var1, const NumericVar *var2, NumericVar *result)
{ {
/* /*
* Decide on the signs of the two variables what to do * Decide on the signs of the two variables what to do
...@@ -6734,7 +6744,7 @@ sub_var(NumericVar *var1, NumericVar *var2, NumericVar *result) ...@@ -6734,7 +6744,7 @@ sub_var(NumericVar *var1, NumericVar *var2, NumericVar *result)
* in result. Result is rounded to no more than rscale fractional digits. * in result. Result is rounded to no more than rscale fractional digits.
*/ */
static void static void
mul_var(NumericVar *var1, NumericVar *var2, NumericVar *result, mul_var(const NumericVar *var1, const NumericVar *var2, NumericVar *result,
int rscale) int rscale)
{ {
int res_ndigits; int res_ndigits;
...@@ -6763,7 +6773,7 @@ mul_var(NumericVar *var1, NumericVar *var2, NumericVar *result, ...@@ -6763,7 +6773,7 @@ mul_var(NumericVar *var1, NumericVar *var2, NumericVar *result,
*/ */
if (var1->ndigits > var2->ndigits) if (var1->ndigits > var2->ndigits)
{ {
NumericVar *tmp = var1; const NumericVar *tmp = var1;
var1 = var2; var1 = var2;
var2 = tmp; var2 = tmp;
...@@ -6931,7 +6941,7 @@ mul_var(NumericVar *var1, NumericVar *var2, NumericVar *result, ...@@ -6931,7 +6941,7 @@ mul_var(NumericVar *var1, NumericVar *var2, NumericVar *result,
* is truncated (towards zero) at that digit. * is truncated (towards zero) at that digit.
*/ */
static void static void
div_var(NumericVar *var1, NumericVar *var2, NumericVar *result, div_var(const NumericVar *var1, const NumericVar *var2, NumericVar *result,
int rscale, bool round) int rscale, bool round)
{ {
int div_ndigits; int div_ndigits;
...@@ -7216,8 +7226,8 @@ div_var(NumericVar *var1, NumericVar *var2, NumericVar *result, ...@@ -7216,8 +7226,8 @@ div_var(NumericVar *var1, NumericVar *var2, NumericVar *result,
* the correct answer is 1. * the correct answer is 1.
*/ */
static void static void
div_var_fast(NumericVar *var1, NumericVar *var2, NumericVar *result, div_var_fast(const NumericVar *var1, const NumericVar *var2,
int rscale, bool round) NumericVar *result, int rscale, bool round)
{ {
int div_ndigits; int div_ndigits;
int res_sign; int res_sign;
...@@ -7511,7 +7521,7 @@ div_var_fast(NumericVar *var1, NumericVar *var2, NumericVar *result, ...@@ -7511,7 +7521,7 @@ div_var_fast(NumericVar *var1, NumericVar *var2, NumericVar *result,
* Returns the appropriate result scale for the division result. * Returns the appropriate result scale for the division result.
*/ */
static int static int
select_div_scale(NumericVar *var1, NumericVar *var2) select_div_scale(const NumericVar *var1, const NumericVar *var2)
{ {
int weight1, int weight1,
weight2, weight2,
...@@ -7580,7 +7590,7 @@ select_div_scale(NumericVar *var1, NumericVar *var2) ...@@ -7580,7 +7590,7 @@ select_div_scale(NumericVar *var1, NumericVar *var2)
* Calculate the modulo of two numerics at variable level * Calculate the modulo of two numerics at variable level
*/ */
static void static void
mod_var(NumericVar *var1, NumericVar *var2, NumericVar *result) mod_var(const NumericVar *var1, const NumericVar *var2, NumericVar *result)
{ {
NumericVar tmp; NumericVar tmp;
...@@ -7609,7 +7619,7 @@ mod_var(NumericVar *var1, NumericVar *var2, NumericVar *result) ...@@ -7609,7 +7619,7 @@ mod_var(NumericVar *var1, NumericVar *var2, NumericVar *result)
* on variable level * on variable level
*/ */
static void static void
ceil_var(NumericVar *var, NumericVar *result) ceil_var(const NumericVar *var, NumericVar *result)
{ {
NumericVar tmp; NumericVar tmp;
...@@ -7633,7 +7643,7 @@ ceil_var(NumericVar *var, NumericVar *result) ...@@ -7633,7 +7643,7 @@ ceil_var(NumericVar *var, NumericVar *result)
* on variable level * on variable level
*/ */
static void static void
floor_var(NumericVar *var, NumericVar *result) floor_var(const NumericVar *var, NumericVar *result)
{ {
NumericVar tmp; NumericVar tmp;
...@@ -7656,7 +7666,7 @@ floor_var(NumericVar *var, NumericVar *result) ...@@ -7656,7 +7666,7 @@ floor_var(NumericVar *var, NumericVar *result)
* Compute the square root of x using Newton's algorithm * Compute the square root of x using Newton's algorithm
*/ */
static void static void
sqrt_var(NumericVar *arg, NumericVar *result, int rscale) sqrt_var(const NumericVar *arg, NumericVar *result, int rscale)
{ {
NumericVar tmp_arg; NumericVar tmp_arg;
NumericVar tmp_val; NumericVar tmp_val;
...@@ -7729,7 +7739,7 @@ sqrt_var(NumericVar *arg, NumericVar *result, int rscale) ...@@ -7729,7 +7739,7 @@ sqrt_var(NumericVar *arg, NumericVar *result, int rscale)
* Raise e to the power of x, computed to rscale fractional digits * Raise e to the power of x, computed to rscale fractional digits
*/ */
static void static void
exp_var(NumericVar *arg, NumericVar *result, int rscale) exp_var(const NumericVar *arg, NumericVar *result, int rscale)
{ {
NumericVar x; NumericVar x;
NumericVar elem; NumericVar elem;
...@@ -7855,7 +7865,7 @@ exp_var(NumericVar *arg, NumericVar *result, int rscale) ...@@ -7855,7 +7865,7 @@ exp_var(NumericVar *arg, NumericVar *result, int rscale)
* determine the appropriate rscale when computing natural logarithms. * determine the appropriate rscale when computing natural logarithms.
*/ */
static int static int
estimate_ln_dweight(NumericVar *var) estimate_ln_dweight(const NumericVar *var)
{ {
int ln_dweight; int ln_dweight;
...@@ -7933,7 +7943,7 @@ estimate_ln_dweight(NumericVar *var) ...@@ -7933,7 +7943,7 @@ estimate_ln_dweight(NumericVar *var)
* Compute the natural log of x * Compute the natural log of x
*/ */
static void static void
ln_var(NumericVar *arg, NumericVar *result, int rscale) ln_var(const NumericVar *arg, NumericVar *result, int rscale)
{ {
NumericVar x; NumericVar x;
NumericVar xx; NumericVar xx;
...@@ -8040,7 +8050,7 @@ ln_var(NumericVar *arg, NumericVar *result, int rscale) ...@@ -8040,7 +8050,7 @@ ln_var(NumericVar *arg, NumericVar *result, int rscale)
* Note: this routine chooses dscale of the result. * Note: this routine chooses dscale of the result.
*/ */
static void static void
log_var(NumericVar *base, NumericVar *num, NumericVar *result) log_var(const NumericVar *base, const NumericVar *num, NumericVar *result)
{ {
NumericVar ln_base; NumericVar ln_base;
NumericVar ln_num; NumericVar ln_num;
...@@ -8100,7 +8110,7 @@ log_var(NumericVar *base, NumericVar *num, NumericVar *result) ...@@ -8100,7 +8110,7 @@ log_var(NumericVar *base, NumericVar *num, NumericVar *result)
* Note: this routine chooses dscale of the result. * Note: this routine chooses dscale of the result.
*/ */
static void static void
power_var(NumericVar *base, NumericVar *exp, NumericVar *result) power_var(const NumericVar *base, const NumericVar *exp, NumericVar *result)
{ {
NumericVar ln_base; NumericVar ln_base;
NumericVar ln_num; NumericVar ln_num;
...@@ -8215,7 +8225,7 @@ power_var(NumericVar *base, NumericVar *exp, NumericVar *result) ...@@ -8215,7 +8225,7 @@ power_var(NumericVar *base, NumericVar *exp, NumericVar *result)
* Raise base to the power of exp, where exp is an integer. * Raise base to the power of exp, where exp is an integer.
*/ */
static void static void
power_var_int(NumericVar *base, int exp, NumericVar *result, int rscale) power_var_int(const NumericVar *base, int exp, NumericVar *result, int rscale)
{ {
double f; double f;
int p; int p;
...@@ -8405,7 +8415,7 @@ power_var_int(NumericVar *base, int exp, NumericVar *result, int rscale) ...@@ -8405,7 +8415,7 @@ power_var_int(NumericVar *base, int exp, NumericVar *result, int rscale)
* ---------- * ----------
*/ */
static int static int
cmp_abs(NumericVar *var1, NumericVar *var2) cmp_abs(const NumericVar *var1, const NumericVar *var2)
{ {
return cmp_abs_common(var1->digits, var1->ndigits, var1->weight, return cmp_abs_common(var1->digits, var1->ndigits, var1->weight,
var2->digits, var2->ndigits, var2->weight); var2->digits, var2->ndigits, var2->weight);
...@@ -8483,7 +8493,7 @@ cmp_abs_common(const NumericDigit *var1digits, int var1ndigits, int var1weight, ...@@ -8483,7 +8493,7 @@ cmp_abs_common(const NumericDigit *var1digits, int var1ndigits, int var1weight,
* result might point to one of the operands without danger. * result might point to one of the operands without danger.
*/ */
static void static void
add_abs(NumericVar *var1, NumericVar *var2, NumericVar *result) add_abs(const NumericVar *var1, const NumericVar *var2, NumericVar *result)
{ {
NumericDigit *res_buf; NumericDigit *res_buf;
NumericDigit *res_digits; NumericDigit *res_digits;
...@@ -8568,7 +8578,7 @@ add_abs(NumericVar *var1, NumericVar *var2, NumericVar *result) ...@@ -8568,7 +8578,7 @@ add_abs(NumericVar *var1, NumericVar *var2, NumericVar *result)
* ABS(var1) MUST BE GREATER OR EQUAL ABS(var2) !!! * ABS(var1) MUST BE GREATER OR EQUAL ABS(var2) !!!
*/ */
static void static void
sub_abs(NumericVar *var1, NumericVar *var2, NumericVar *result) sub_abs(const NumericVar *var1, const NumericVar *var2, NumericVar *result)
{ {
NumericDigit *res_buf; NumericDigit *res_buf;
NumericDigit *res_digits; NumericDigit *res_digits;
...@@ -8875,7 +8885,7 @@ accum_sum_reset(NumericSumAccum *accum) ...@@ -8875,7 +8885,7 @@ accum_sum_reset(NumericSumAccum *accum)
* Accumulate a new value. * Accumulate a new value.
*/ */
static void static void
accum_sum_add(NumericSumAccum *accum, NumericVar *val) accum_sum_add(NumericSumAccum *accum, const NumericVar *val)
{ {
int32 *accum_digits; int32 *accum_digits;
int i, int i,
...@@ -8996,7 +9006,7 @@ accum_sum_carry(NumericSumAccum *accum) ...@@ -8996,7 +9006,7 @@ accum_sum_carry(NumericSumAccum *accum)
* accumulator, enlarge the buffers. * accumulator, enlarge the buffers.
*/ */
static void static void
accum_sum_rescale(NumericSumAccum *accum, NumericVar *val) accum_sum_rescale(NumericSumAccum *accum, const NumericVar *val)
{ {
int old_weight = accum->weight; int old_weight = accum->weight;
int old_ndigits = accum->ndigits; int old_ndigits = accum->ndigits;
......
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