drygdryg/calc
1
0
Fork 0
mirror of https://github.com/lcn2/calc.git synced 2025-08-16 01:03:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Reduce global status constants

Browse Source 
The constants:

	9, 9/10, 10/9, 24, 360, 400

are used by func.c only, so there were moved
from {q,z}math.{c,h} to func.c.

The constants:

	3, 4

are used by zrandom.c only, so there were moved
from {q,z}math.{c,h} to zrandom.c.
This commit is contained in:
Landon Curt Noll
2021-12-01 22:50:52 -08:00
parent bd990cef1f
commit f794b8d859
6 changed files with 27 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
func.c
View File

@@ -154,6 +154,20 @@ STATIC int env_pool_max = 0; /* number of env_pool elements allocated */
STATIC struct env_pool *e_pool = NULL; /* env_pool elements */
/*
* constants used for hours or degrees conversion functions
*/
STATIC HALF _nineval_[] = { 9 };
STATIC HALF _twentyfourval_[] = { 24 };
STATIC HALF _threesixtyval_[] = { 360 };
STATIC HALF _fourhundredval_[] = { 400 };
STATIC NUMBER _qtendivnine_ = { { _tenval_, 1, 0 }, { _nineval_, 1, 0 }, 1, NULL };
STATIC NUMBER _qninedivten_ = { { _nineval_, 1, 0 }, { _tenval_, 1, 0 }, 1, NULL };
STATIC NUMBER _qtwentyfour = { { _twentyfourval_, 1, 0 }, { _oneval_, 1, 0 }, 1, NULL };
STATIC NUMBER _qthreesixty = { { _threesixtyval_, 1, 0 }, { _oneval_, 1, 0 }, 1, NULL };
STATIC NUMBER _qfourhundred = { { _fourhundredval_, 1, 0 }, { _oneval_, 1, 0 }, 1, NULL };
/*
* user-defined error strings
*/

17
qmath.c
View File

@@ -37,26 +37,15 @@
NUMBER _qzero_ = { { _zeroval_, 1, 0 }, { _oneval_, 1, 0 }, 1, NULL };
NUMBER _qone_ = { { _oneval_, 1, 0 }, { _oneval_, 1, 0 }, 1, NULL };
NUMBER _qtwo_ = { { _twoval_, 1, 0 }, { _oneval_, 1, 0 }, 1, NULL };
NUMBER _qthree_ = { { _threeval_, 1, 0 }, { _oneval_, 1, 0 }, 1, NULL };
NUMBER _qfour_ = { { _fourval_, 1, 0 }, { _oneval_, 1, 0 }, 1, NULL };
NUMBER _qten_ = { { _tenval_, 1, 0 }, { _oneval_, 1, 0 }, 1, NULL };
NUMBER _qnegone_ = { { _oneval_, 1, 1 }, { _oneval_, 1, 0 }, 1, NULL };
NUMBER _qonehalf_ = { { _oneval_, 1, 0 }, { _twoval_, 1, 0 }, 1, NULL };
NUMBER _qneghalf_ = { { _oneval_, 1, 1 }, { _twoval_, 1, 0 }, 1, NULL };
NUMBER _qonesqbase_ = { { _oneval_, 1, 0 }, { _sqbaseval_, 2, 0 }, 1, NULL };
NUMBER _qtendivnine_ = { { _tenval_, 1, 0 }, { _nineval_, 1, 0 }, 1, NULL };
NUMBER _qninedivten_ = { { _nineval_, 1, 0 }, { _tenval_, 1, 0 }, 1, NULL };
NUMBER _qthreesixty = { { _threesixtyval_, 1, 0 },
{ _oneval_, 1, 0 }, 1, NULL };
NUMBER _qfourhundred = { { _fourhundredval_, 1, 0 },
{ _oneval_, 1, 0 }, 1, NULL };
NUMBER _qtwentyfour = { { _twentyfourval_, 1, 0 },
{ _oneval_, 1, 0 }, 1, NULL };
NUMBER * initnumbs[] = {&_qzero_, &_qone_, &_qtwo_, &_qthree_,
&_qfour_, &_qten_, &_qnegone_, &_qonehalf_, &_qneghalf_,
&_qonesqbase_, &_qtendivnine_, &_qninedivten_,
&_qthreesixty, &_qfourhundred, &_qtwentyfour,
NUMBER * initnumbs[] = {&_qzero_, &_qone_, &_qtwo_,
&_qten_, &_qnegone_, &_qonehalf_, &_qneghalf_,
&_qonesqbase_,
NULL /* must be last */
};

4
qmath.h
View File

@@ -272,9 +272,7 @@ static inline NUMBER* qlink(NUMBER* q) { if(q) { (q)->links++; } return q; }
* constants used often by the arithmetic routines
*/
EXTERN NUMBER _qzero_, _qone_, _qnegone_, _qonehalf_, _qneghalf_, _qonesqbase_;
EXTERN NUMBER _qtwo_, _qthree_, _qfour_, _qten_;
EXTERN NUMBER _qtendivnine_, _qninedivten_;
EXTERN NUMBER _qthreesixty, _qfourhundred, _qtwentyfour;
EXTERN NUMBER _qtwo_, _qten_;
EXTERN NUMBER * initnumbs[];

24
zmath.c
View File

@@ -44,15 +44,6 @@ ZVALUE _neg_one_ = { _oneval_, 1, 1 };
HALF _twoval_[] = { 2 };
ZVALUE _two_ = { _twoval_, 1, 0 };
HALF _threeval_[] = { 3 };
ZVALUE _three_ = { _threeval_, 1, 0 };
HALF _fourval_[] = { 4 };
ZVALUE _four_ = { _fourval_, 1, 0 };
HALF _nineval_[] = { 9 };
ZVALUE _nine_ = { _nineval_, 1, 0 };
HALF _tenval_[] = { 10 };
ZVALUE _ten_ = { _tenval_, 1, 0 };
@@ -65,15 +56,6 @@ ZVALUE _pow4base_ = { _pow4baseval_, 4, 0 };
HALF _pow8baseval_[] = { 0, 0, 0, 0, 1 };
ZVALUE _pow8base_ = { _pow8baseval_, 4, 0 };
HALF _threesixtyval_[] = { 360 };
ZVALUE _threesixty_ = { _threesixtyval_, 4, 0 };
HALF _fourhundredval_[] = { 400 };
ZVALUE _fourhundred_ = { _fourhundredval_, 4, 0 };
HALF _twentyfourval_[] = { 24 };
ZVALUE _twentyfour_ = { _twentyfourval_, 4, 0 };
/*
* 2^64 as a ZVALUE
*/
@@ -94,16 +76,10 @@ HALF *half_tbl[] = {
_zeroval_,
_oneval_,
_twoval_,
_threeval_,
_fourval_,
_nineval_,
_tenval_,
_sqbaseval_,
_pow4baseval_,
_pow8baseval_,
_threesixtyval_,
_fourhundredval_,
_twentyfourval_,
NULL /* must be last */
};

18
zmath.h
View File

@@ -652,15 +652,6 @@ EXTERN ZVALUE _neg_one_;
EXTERN HALF _twoval_[];
EXTERN ZVALUE _two_;
EXTERN HALF _threeval_[];
EXTERN ZVALUE _three_;
EXTERN HALF _fourval_[];
EXTERN ZVALUE _four_;
EXTERN HALF _nineval_[];
EXTERN ZVALUE _nine_;
EXTERN HALF _tenval_[];
EXTERN ZVALUE _ten_;
@@ -673,15 +664,6 @@ EXTERN ZVALUE _pow4base_;
EXTERN HALF _pow8baseval_[];
EXTERN ZVALUE _pow8base_;
EXTERN HALF _threesixtyval_[];
EXTERN ZVALUE _threesixty_;
EXTERN HALF _fourhundredval_[];
EXTERN ZVALUE _fourhundred_;
EXTERN HALF _twentyfourval_[];
EXTERN ZVALUE _fourhundred_;
/* _b32_ is _sqbaseval_ or _pow4baseval_ depending on BASEB */
EXTERN ZVALUE _b32_;

9
zrandom.c
View File

@@ -1092,6 +1092,15 @@
STATIC RANDOM blum;
/*
* static constants 3 and 4 used by zsrandom4
*/
STATIC HALF _threeval_[] = { 3 };
STATIC ZVALUE _three_ = { _threeval_, 1, 0 };
STATIC HALF _fourval_[] = { 4 };
STATIC ZVALUE _four_ = { _fourval_, 1, 0 };
/*
* Default Blum generator
*