darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-04-05 01:11:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Parsing of suffix operators, NOTE: applied like prefix operators just to get it committed in a compilable state

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-11-23 11:57:08 +01:00
parent 38f5090778
commit 4079835c7e
2 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lexer.h
View file

@ -204,6 +204,9 @@ static const size_t c_operator_count = (sizeof(c_operators) / sizeof(c_operators
static const oper_info fte_operators[] = {
{ "(", 0, opid1('('), ASSOC_LEFT, 99, OP_PREFIX}, /* paren expression - non function call */
{ "++", 1, opid3('S','+','+'), ASSOC_LEFT, 16, OP_SUFFIX},
{ "--", 1, opid3('S','-','-'), ASSOC_LEFT, 16, OP_SUFFIX},
{ ".", 2, opid1('.'), ASSOC_LEFT, 15, 0 },
{ "(", 0, opid1('('), ASSOC_LEFT, 15, 0 }, /* function call */
{ "[", 2, opid1('['), ASSOC_LEFT, 15, 0 }, /* array subscript */

27
parser.c
View file

@ -900,6 +900,28 @@ static bool parser_sy_pop(parser_t *parser, shunt *sy)
(ast_expression*)parser_const_float(parser, 1));
}
break;
case opid3('S','+','+'):
case opid3('S','-','-'):
/* prefix ++ */
if (exprs[0]->expression.vtype != TYPE_FLOAT) {
ast_type_to_string(exprs[0], ty1, sizeof(ty1));
parseerror(parser, "invalid type for prefix increment: %s", ty1);
return false;
}
if (op->id == opid3('+','+','P'))
addop = INSTR_ADD_F;
else
addop = INSTR_SUB_F;
if (ast_istype(exprs[0], ast_entfield)) {
out = (ast_expression*)ast_binstore_new(ctx, INSTR_STOREP_F, addop,
exprs[0],
(ast_expression*)parser_const_float(parser, 1));
} else {
out = (ast_expression*)ast_binstore_new(ctx, INSTR_STORE_F, addop,
exprs[0],
(ast_expression*)parser_const_float(parser, 1));
}
break;
case opid2('+','='):
case opid2('-','='):
if (exprs[0]->expression.vtype != exprs[1]->expression.vtype ||
@ -1279,13 +1301,12 @@ static ast_expression* parse_expression_leave(parser_t *parser, bool stopatcomma
else
{
/* classify the operator */
/* TODO: suffix operators */
const oper_info *op;
const oper_info *olast = NULL;
size_t o;
for (o = 0; o < operator_count; ++o) {
if ((!(operators[o].flags & OP_PREFIX) == wantop) &&
!(operators[o].flags & OP_SUFFIX) && /* remove this */
/* !(operators[o].flags & OP_SUFFIX) && / * remove this */
!strcmp(parser_tokval(parser), operators[o].op))
{
break;
@ -1379,7 +1400,7 @@ static ast_expression* parse_expression_leave(parser_t *parser, bool stopatcomma
} else {
DEBUGSHUNTDO(con_out("push operator %s\n", op->op));
vec_push(sy.ops, syop(parser_ctx(parser), op));
wantop = false;
wantop = !!(op->flags & OP_SUFFIX);
}
}
if (!parser_next(parser)) {