darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2024-11-30 15:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

operator handling for ternary

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-11-21 20:41:26 +01:00
parent 11f1af78d5
commit 55c2148016
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
parser.c
View file

@ -460,6 +460,8 @@ static bool parser_sy_pop(parser_t *parser, shunt *sy)
(ast_istype((A), ast_value) && ((ast_value*)(A))->isconst) (ast_istype((A), ast_value) && ((ast_value*)(A))->isconst)
#define CanConstFold(A, B) \ #define CanConstFold(A, B) \
(CanConstFold1(A) && CanConstFold1(B)) (CanConstFold1(A) && CanConstFold1(B))
#define CanConstFold3(A, B, C) \
(CanConstFold1(A) && CanConstFold1(B) && CanConstFold1(C))
#define ConstV(i) (asvalue[(i)]->constval.vvec) #define ConstV(i) (asvalue[(i)]->constval.vvec)
#define ConstF(i) (asvalue[(i)]->constval.vfloat) #define ConstF(i) (asvalue[(i)]->constval.vfloat)
#define ConstS(i) (asvalue[(i)]->constval.vstring) #define ConstS(i) (asvalue[(i)]->constval.vstring)
@ -753,8 +755,11 @@ static bool parser_sy_pop(parser_t *parser, shunt *sy)
type_name[exprs[0]->expression.vtype], type_name[exprs[0]->expression.vtype],
type_name[exprs[1]->expression.vtype]); type_name[exprs[1]->expression.vtype]);
parseerror(parser, "TODO: logical ops for arbitrary types using INSTR_NOT"); parseerror(parser, "TODO: logical ops for arbitrary types using INSTR_NOT");
parseerror(parser, "TODO: optional early out");
return false; return false;
} }
if (opts_standard == COMPILER_GMQCC)
con_out("TODO: early out logic\n");
if (CanConstFold(exprs[0], exprs[1])) if (CanConstFold(exprs[0], exprs[1]))
out = (ast_expression*)parser_const_float(parser, out = (ast_expression*)parser_const_float(parser,
(generated_op == INSTR_OR ? (ConstF(0) || ConstF(1)) : (ConstF(0) && ConstF(1)))); (generated_op == INSTR_OR ? (ConstF(0) || ConstF(1)) : (ConstF(0) && ConstF(1))));
@ -762,6 +767,13 @@ static bool parser_sy_pop(parser_t *parser, shunt *sy)
out = (ast_expression*)ast_binary_new(ctx, generated_op, exprs[0], exprs[1]); out = (ast_expression*)ast_binary_new(ctx, generated_op, exprs[0], exprs[1]);
break; break;
case opid2('?',':'):
if (CanConstFold1(exprs[0]))
out = (ConstF(0) ? exprs[1] : exprs[2]);
else
out = (ast_expression*)ast_ternary_new(ctx, exprs[0], exprs[1], exprs[2]);
break;
case opid1('>'): case opid1('>'):
generated_op += 1; /* INSTR_GT */ generated_op += 1; /* INSTR_GT */
case opid1('<'): case opid1('<'):