darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-02-25 20:51:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ignore emitting implicit math constants in the preprocessor if they exist.

Browse source
This commit is contained in:
Dale Weiler 2013-12-01 10:26:36 -05:00
parent 2024b3bd71
commit 11ecc6cb0b
1 changed files with 34 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
ftepp.c
View file

@ -498,10 +498,29 @@ static bool ftepp_define_body(ftepp_t *ftepp, ppmacro *macro)
return true; return true;
} }
static const char *ftepp_math_constants[][2] = {
{ "M_E", "2.7182818284590452354" }, /* e */
{ "M_LOG2E", "1.4426950408889634074" }, /* log_2 e */
{ "M_LOG10E", "0.43429448190325182765" }, /* log_10 e */
{ "M_LN2", "0.69314718055994530942" }, /* log_e 2 */
{ "M_LN10", "2.30258509299404568402" }, /* log_e 10 */
{ "M_PI", "3.14159265358979323846" }, /* pi */
{ "M_PI_2", "1.57079632679489661923" }, /* pi/2 */
{ "M_PI_4", "0.78539816339744830962" }, /* pi/4 */
{ "M_1_PI", "0.31830988618379067154" }, /* 1/pi */
{ "M_2_PI", "0.63661977236758134308" }, /* 2/pi */
{ "M_2_SQRTPI", "1.12837916709551257390" }, /* 2/sqrt(pi) */
{ "M_SQRT2", "1.41421356237309504880" }, /* sqrt(2) */
{ "M_SQRT1_2", "0.70710678118654752440" }, /* 1/sqrt(2) */
{ "M_TAU", "6.28318530717958647692" } /* pi*2 */
};
static bool ftepp_define(ftepp_t *ftepp) static bool ftepp_define(ftepp_t *ftepp)
{ {
ppmacro *macro = NULL; ppmacro *macro = NULL;
size_t l = ftepp_ctx(ftepp).line; size_t l = ftepp_ctx(ftepp).line;
size_t i;
bool mathconstant = false;
(void)ftepp_next(ftepp); (void)ftepp_next(ftepp);
if (!ftepp_skipspace(ftepp)) if (!ftepp_skipspace(ftepp))
@ -511,7 +530,19 @@ static bool ftepp_define(ftepp_t *ftepp)
case TOKEN_IDENT: case TOKEN_IDENT:
case TOKEN_TYPENAME: case TOKEN_TYPENAME:
case TOKEN_KEYWORD: case TOKEN_KEYWORD:
for (i = 0; i < GMQCC_ARRAY_COUNT(ftepp_math_constants); i++) {
if (!strcmp(ftepp_math_constants[i][0], ftepp_tokval(ftepp))) {
mathconstant = true;
break;
}
}
macro = ftepp_macro_find(ftepp, ftepp_tokval(ftepp)); macro = ftepp_macro_find(ftepp, ftepp_tokval(ftepp));
/* ignore creating a math macro if one is already present */
if (macro && mathconstant)
break;
if (macro && ftepp->output_on) { if (macro && ftepp->output_on) {
if (ftepp_warn(ftepp, WARN_CPP, "redefining `%s`", ftepp_tokval(ftepp))) if (ftepp_warn(ftepp, WARN_CPP, "redefining `%s`", ftepp_tokval(ftepp)))
return false; return false;
@ -1811,23 +1842,6 @@ void ftepp_add_macro(ftepp_t *ftepp, const char *name, const char *value) {
vec_free (create); vec_free (create);
} }
static const char *ftepp_math_constants[][2] = {
{ "M_E", "2.7182818284590452354" }, /* e */
{ "M_LOG2E", "1.4426950408889634074" }, /* log_2 e */
{ "M_LOG10E", "0.43429448190325182765" }, /* log_10 e */
{ "M_LN2", "0.69314718055994530942" }, /* log_e 2 */
{ "M_LN10", "2.30258509299404568402" }, /* log_e 10 */
{ "M_PI", "3.14159265358979323846" }, /* pi */
{ "M_PI_2", "1.57079632679489661923" }, /* pi/2 */
{ "M_PI_4", "0.78539816339744830962" }, /* pi/4 */
{ "M_1_PI", "0.31830988618379067154" }, /* 1/pi */
{ "M_2_PI", "0.63661977236758134308" }, /* 2/pi */
{ "M_2_SQRTPI", "1.12837916709551257390" }, /* 2/sqrt(pi) */
{ "M_SQRT2", "1.41421356237309504880" }, /* sqrt(2) */
{ "M_SQRT1_2", "0.70710678118654752440" }, /* 1/sqrt(2) */
{ "M_TAU", "6.28318530717958647692" } /* pi*2 */
};
ftepp_t *ftepp_create() ftepp_t *ftepp_create()
{ {
ftepp_t *ftepp; ftepp_t *ftepp;
@ -1883,9 +1897,10 @@ ftepp_t *ftepp_create()
*/ */
ftepp_add_macro(ftepp, "__NULL__", "nil"); ftepp_add_macro(ftepp, "__NULL__", "nil");
/* add all the math constants */ /* add all the math constants if they can be */
for (i = 0; i < GMQCC_ARRAY_COUNT(ftepp_math_constants); i++) for (i = 0; i < GMQCC_ARRAY_COUNT(ftepp_math_constants); i++)
ftepp_add_macro(ftepp, ftepp_math_constants[i][0], ftepp_math_constants[i][1]); if (!ftepp_macro_find(ftepp, ftepp_math_constants[i][0]))
ftepp_add_macro(ftepp, ftepp_math_constants[i][0], ftepp_math_constants[i][1]);
return ftepp; return ftepp;
} }