darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2024-12-02 16:42:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

constant flag, -finitialized-nonconstants to turn initialized globals into mutable variables

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-11-25 19:35:00 +01:00
parent 6e400ca81f
commit 39f572fe99
4 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ast.c
View file

@ -331,6 +331,7 @@ ast_value* ast_value_new(lex_ctx ctx, const char *name, int t)
self->name = name ? util_strdup(name) : NULL; self->name = name ? util_strdup(name) : NULL;
self->expression.vtype = t; self->expression.vtype = t;
self->expression.next = NULL; self->expression.next = NULL;
self->constant = false;
self->hasvalue = false; self->hasvalue = false;
self->uses = 0; self->uses = 0;
memset(&self->constval, 0, sizeof(self->constval)); memset(&self->constval, 0, sizeof(self->constval));

1
ast.h
View file

@ -155,6 +155,7 @@ struct ast_value_s
ast_value *next; ast_value *next;
*/ */
bool constant;
bool hasvalue; bool hasvalue;
union { union {
double vfloat; double vfloat;

1
opts.def
View file

@ -36,6 +36,7 @@
GMQCC_DEFINE_FLAG(SHORT_LOGIC) GMQCC_DEFINE_FLAG(SHORT_LOGIC)
GMQCC_DEFINE_FLAG(PERL_LOGIC) GMQCC_DEFINE_FLAG(PERL_LOGIC)
GMQCC_DEFINE_FLAG(TRANSLATABLE_STRINGS) GMQCC_DEFINE_FLAG(TRANSLATABLE_STRINGS)
GMQCC_DEFINE_FLAG(INITIALIZED_NONCONSTANTS)
#endif #endif
/* warning flags */ /* warning flags */

12
parser.c
View file

@ -211,6 +211,7 @@ static ast_value* parser_const_float(parser_t *parser, double d)
return parser->imm_float[i]; return parser->imm_float[i];
} }
out = ast_value_new(parser_ctx(parser), "#IMMEDIATE", TYPE_FLOAT); out = ast_value_new(parser_ctx(parser), "#IMMEDIATE", TYPE_FLOAT);
out->constant = true;
out->hasvalue = true; out->hasvalue = true;
out->constval.vfloat = d; out->constval.vfloat = d;
vec_push(parser->imm_float, out); vec_push(parser->imm_float, out);
@ -256,6 +257,7 @@ static ast_value* parser_const_string(parser_t *parser, const char *str, bool do
out = ast_value_new(parser_ctx(parser), name, TYPE_STRING); out = ast_value_new(parser_ctx(parser), name, TYPE_STRING);
} else } else
out = ast_value_new(parser_ctx(parser), "#IMMEDIATE", TYPE_STRING); out = ast_value_new(parser_ctx(parser), "#IMMEDIATE", TYPE_STRING);
out->constant = true;
out->hasvalue = true; out->hasvalue = true;
out->constval.vstring = parser_strdup(str); out->constval.vstring = parser_strdup(str);
vec_push(parser->imm_string, out); vec_push(parser->imm_string, out);
@ -271,6 +273,7 @@ static ast_value* parser_const_vector(parser_t *parser, vector v)
return parser->imm_vector[i]; return parser->imm_vector[i];
} }
out = ast_value_new(parser_ctx(parser), "#IMMEDIATE", TYPE_VECTOR); out = ast_value_new(parser_ctx(parser), "#IMMEDIATE", TYPE_VECTOR);
out->constant = true;
out->hasvalue = true; out->hasvalue = true;
out->constval.vvec = v; out->constval.vvec = v;
vec_push(parser->imm_vector, out); vec_push(parser->imm_vector, out);
@ -517,7 +520,7 @@ static bool parser_sy_pop(parser_t *parser, shunt *sy)
(exprs[0]->expression.vtype != exprs[1]->expression.vtype || \ (exprs[0]->expression.vtype != exprs[1]->expression.vtype || \
exprs[0]->expression.vtype != T) exprs[0]->expression.vtype != T)
#define CanConstFold1(A) \ #define CanConstFold1(A) \
(ast_istype((A), ast_value) && ((ast_value*)(A))->hasvalue) (ast_istype((A), ast_value) && ((ast_value*)(A))->hasvalue && ((ast_value*)(A))->constant)
#define CanConstFold(A, B) \ #define CanConstFold(A, B) \
(CanConstFold1(A) && CanConstFold1(B)) (CanConstFold1(A) && CanConstFold1(B))
#define ConstV(i) (asvalue[(i)]->constval.vvec) #define ConstV(i) (asvalue[(i)]->constval.vvec)
@ -2085,7 +2088,7 @@ static bool parse_switch(parser_t *parser, ast_block *block, ast_expression **ou
if (!OPTS_FLAG(RELAXED_SWITCH)) { if (!OPTS_FLAG(RELAXED_SWITCH)) {
opval = (ast_value*)operand; opval = (ast_value*)operand;
if (!ast_istype(operand, ast_value) || !opval->hasvalue) { if (!ast_istype(operand, ast_value) || !opval->constant) {
parseerror(parser, "case on non-constant values need to be explicitly enabled via -frelaxed-switch"); parseerror(parser, "case on non-constant values need to be explicitly enabled via -frelaxed-switch");
ast_unref(operand); ast_unref(operand);
return false; return false;
@ -3470,6 +3473,9 @@ static bool parse_variable(parser_t *parser, ast_block *localblock, bool nofield
} }
} }
if (is_const)
var->constant = true;
/* Part 1: /* Part 1:
* check for validity: (end_sys_..., multiple-definitions, prototypes, ...) * check for validity: (end_sys_..., multiple-definitions, prototypes, ...)
* Also: if there was a prototype, `var` will be deleted and set to `proto` which * Also: if there was a prototype, `var` will be deleted and set to `proto` which
@ -3822,6 +3828,8 @@ skipvar:
parseerror(parser, "cannot initialize a global constant variable with a non-constant expression"); parseerror(parser, "cannot initialize a global constant variable with a non-constant expression");
else else
{ {
if (opts_standard != COMPILER_GMQCC && !OPTS_FLAG(INITIALIZED_NONCONSTANTS))
var->constant = true;
var->hasvalue = true; var->hasvalue = true;
if (cval->expression.vtype == TYPE_STRING) if (cval->expression.vtype == TYPE_STRING)
var->constval.vstring = parser_strdup(cval->constval.vstring); var->constval.vstring = parser_strdup(cval->constval.vstring);