lex_file *lex;
int tok;
- int fieldsize;
-
MEM_VECTOR_MAKE(varentry_t, globals);
MEM_VECTOR_MAKE(varentry_t, fields);
MEM_VECTOR_MAKE(ast_function*, functions);
size_t blocklocal;
size_t errors;
+
+ /* TYPE_FIELD -> parser_find_fields is used instead of find_var
+ * TODO: TYPE_VECTOR -> x, y and z are accepted in the gmqcc standard
+ * anything else: type error
+ */
+ qcint memberof;
} parser_t;
MEM_VEC_FUNCTIONS(parser_t, varentry_t, globals)
return e;
}
+#ifdef DEBUGSHUNT
+# define DEBUGSHUNTDO(x) x
+#else
+# define DEBUGSHUNTDO(x)
+#endif
+
static bool parser_sy_pop(parser_t *parser, shunt *sy)
{
const oper_info *op;
ast_expression *out = NULL;
ast_expression *exprs[3];
ast_block *blocks[3];
- size_t i;
+ size_t i, assignop;
if (!sy->ops_count) {
parseerror(parser, "internal error: missing operator");
op = &operators[sy->ops[sy->ops_count-1].etype - 1];
ctx = sy->ops[sy->ops_count-1].ctx;
+ DEBUGSHUNTDO(printf("apply %s\n", op->op));
+
if (sy->out_count < op->operands) {
parseerror(parser, "internal error: not enough operands: %i", sy->out_count);
return false;
parseerror(parser, "internal error: unhandled operand");
return false;
+ case opid1('.'):
+ if (exprs[0]->expression.vtype == TYPE_ENTITY) {
+ if (exprs[1]->expression.vtype != TYPE_FIELD) {
+ parseerror(parser, "type error: right hand of member-operand should be an entity-field");
+ return false;
+ }
+ out = (ast_expression*)ast_entfield_new(ctx, exprs[0], exprs[1]);
+ }
+ else if (exprs[0]->expression.vtype == TYPE_VECTOR) {
+ parseerror(parser, "internal error: vector access is not supposed to be handled at this point");
+ return false;
+ }
+ else {
+ parseerror(parser, "type error: member-of operator on something that is not an entity or vector");
+ return false;
+ }
+ break;
+
case opid1(','):
if (blocks[0]) {
if (!ast_block_exprs_add(blocks[0], exprs[1]))
case opid1('='):
- out = (ast_expression*)ast_store_new(ctx,
- type_store_instr[exprs[0]->expression.vtype],
- exprs[0], exprs[1]);
+ if (ast_istype(exprs[0], ast_entfield))
+ assignop = type_storep_instr[exprs[0]->expression.vtype];
+ else
+ assignop = type_store_instr[exprs[0]->expression.vtype];
+ out = (ast_expression*)ast_store_new(ctx, assignop, exprs[0], exprs[1]);
break;
}
return false;
}
+ DEBUGSHUNTDO(printf("applied %s\n", op->op));
sy->out[sy->out_count++] = syexp(ctx, out);
return true;
}
ast_expression *expr = NULL;
shunt sy;
bool wantop = false;
+ bool gotmemberof = false;
/* count the parens because an if starts with one, so the
* end of a condition is an unmatched closing paren
while (true)
{
+ if (gotmemberof)
+ gotmemberof = false;
+ else
+ parser->memberof = 0;
if (!wantop)
{
bool nextwant = true;
if (parser->tok == TOKEN_IDENT)
{
/* variable */
- ast_expression *var = parser_find_var(parser, parser_tokval(parser));
+ ast_expression *var;
+ if (opts_standard == COMPILER_GMQCC)
+ {
+ if (parser->memberof == TYPE_ENTITY)
+ var = parser_find_field(parser, parser_tokval(parser));
+ else if (parser->memberof == TYPE_VECTOR)
+ {
+ parseerror(parser, "TODO: implement effective vector member access");
+ goto onerr;
+ }
+ else if (parser->memberof) {
+ parseerror(parser, "namespace for member not found");
+ goto onerr;
+ }
+ else
+ var = parser_find_var(parser, parser_tokval(parser));
+ } else {
+ var = parser_find_var(parser, parser_tokval(parser));
+ if (!var)
+ var = parser_find_field(parser, parser_tokval(parser));
+ }
if (!var) {
parseerror(parser, "unexpected ident: %s", parser_tokval(parser));
goto onerr;
parseerror(parser, "out of memory");
goto onerr;
}
+ DEBUGSHUNTDO(printf("push %s\n", parser_tokval(parser)));
}
else if (parser->tok == TOKEN_FLOATCONST) {
ast_value *val = parser_const_float(parser, (parser_token(parser)->constval.f));
parseerror(parser, "out of memory");
goto onerr;
}
+ DEBUGSHUNTDO(printf("push %g\n", parser_token(parser)->constval.f));
}
else if (parser->tok == TOKEN_INTCONST) {
ast_value *val = parser_const_float(parser, (double)(parser_token(parser)->constval.i));
parseerror(parser, "out of memory");
goto onerr;
}
+ DEBUGSHUNTDO(printf("push %i\n", parser_token(parser)->constval.i));
}
else if (parser->tok == TOKEN_STRINGCONST) {
ast_value *val = parser_const_string(parser, parser_tokval(parser));
parseerror(parser, "out of memory");
goto onerr;
}
+ DEBUGSHUNTDO(printf("push string\n"));
}
else if (parser->tok == TOKEN_VECTORCONST) {
ast_value *val = parser_const_vector(parser, parser_token(parser)->constval.v);
parseerror(parser, "out of memory");
goto onerr;
}
+ DEBUGSHUNTDO(printf("push '%g %g %g'\n",
+ parser_token(parser)->constval.v.x,
+ parser_token(parser)->constval.v.y,
+ parser_token(parser)->constval.v.z));
}
else if (parser->tok == '(') {
++parens;
parseerror(parser, "out of memory");
goto onerr;
}
+ DEBUGSHUNTDO(printf("push (\n"));
}
else if (parser->tok == ')') {
+ DEBUGSHUNTDO(printf("call )\n"));
--parens;
if (parens < 0)
break;
parser->lex->flags.noops = !wantop;
} else {
if (parser->tok == '(') {
+ DEBUGSHUNTDO(printf("push (\n"));
++parens;
/* we expected an operator, this is the function-call operator */
if (!shunt_ops_add(&sy, syparen(parser_ctx(parser), 'f', sy.out_count-1))) {
}
}
else if (parser->tok == ')') {
+ DEBUGSHUNTDO(printf("calc )\n"));
--parens;
if (parens < 0)
break;
}
/* found an operator */
op = &operators[o];
+ if (op->id == opid1('.')) {
+ /* for gmqcc standard: open up the namespace of the previous type */
+ ast_expression *prevex = sy.out[sy.out_count-1].out;
+ if (!prevex) {
+ parseerror(parser, "unexpected member operator");
+ goto onerr;
+ }
+ if (prevex->expression.vtype == TYPE_ENTITY)
+ parser->memberof = TYPE_ENTITY;
+ else if (prevex->expression.vtype == TYPE_VECTOR)
+ parser->memberof = TYPE_VECTOR;
+ else {
+ parseerror(parser, "type error: type has no members");
+ goto onerr;
+ }
+ gotmemberof = true;
+ }
if (sy.ops_count && !sy.ops[sy.ops_count-1].paren)
olast = &operators[sy.ops[sy.ops_count-1].etype-1];
goto onerr;
if (sy.ops_count && !sy.ops[sy.ops_count-1].paren)
olast = &operators[sy.ops[sy.ops_count-1].etype-1];
+ else
+ olast = NULL;
}
+ DEBUGSHUNTDO(printf("push operator %s\n", op->op));
if (!shunt_ops_add(&sy, syop(parser_ctx(parser), op)))
goto onerr;
}
expr = sy.out[0].out;
MEM_VECTOR_CLEAR(&sy, out);
MEM_VECTOR_CLEAR(&sy, ops);
+ DEBUGSHUNTDO(printf("shut done\n"));
return expr;
onerr:
}
cleanup:
- parser->blocklocal = oldblocklocal;
- /* unroll the local vector */
while (parser->locals_count > parser->blocklocal)
parser_pop_local(parser);
+ parser->blocklocal = oldblocklocal;
+ /* unroll the local vector */
return block;
}
projects / xonotic / gmqcc.git / blobdiff