int tok;
MEM_VECTOR_MAKE(varentry_t, globals);
+ MEM_VECTOR_MAKE(varentry_t, fields);
MEM_VECTOR_MAKE(ast_function*, functions);
MEM_VECTOR_MAKE(ast_value*, imm_float);
MEM_VECTOR_MAKE(ast_value*, imm_string);
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)
+MEM_VEC_FUNCTIONS(parser_t, varentry_t, fields)
MEM_VEC_FUNCTIONS(parser_t, ast_value*, imm_float)
MEM_VEC_FUNCTIONS(parser_t, ast_value*, imm_string)
MEM_VEC_FUNCTIONS(parser_t, ast_value*, imm_vector)
return out;
}
+ast_expression* parser_find_field(parser_t *parser, const char *name)
+{
+ size_t i;
+ for (i = 0; i < parser->fields_count; ++i) {
+ if (!strcmp(parser->fields[i].name, name))
+ return parser->fields[i].var;
+ }
+ return NULL;
+}
+
ast_expression* parser_find_global(parser_t *parser, const char *name)
{
size_t i;
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
+ */
+ int parens = 0;
MEM_VECTOR_INIT(&sy, out);
MEM_VECTOR_INIT(&sy, ops);
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;
nextwant = false; /* not expecting an operator next */
if (!shunt_ops_add(&sy, syparen(parser_ctx(parser), 1, 0))) {
parseerror(parser, "out of memory");
goto onerr;
}
+ DEBUGSHUNTDO(printf("push (\n"));
}
else if (parser->tok == ')') {
+ DEBUGSHUNTDO(printf("call )\n"));
+ --parens;
+ if (parens < 0)
+ break;
/* allowed for function calls */
if (!parser_close_paren(parser, &sy, true))
goto onerr;
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))) {
parseerror(parser, "out of memory");
}
}
else if (parser->tok == ')') {
+ DEBUGSHUNTDO(printf("calc )\n"));
+ --parens;
+ if (parens < 0)
+ break;
/* we do expect an operator next */
/* closing an opening paren */
if (!parser_close_paren(parser, &sy, false))
}
/* 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;
}
break;
}
}
- if (!parser_next(parser)) {
+ if (parens >= 0 && !parser_next(parser)) {
parseerror(parser, "Unexpected end of file");
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:
}
static bool parser_variable(parser_t *parser, ast_block *localblock);
-static bool parser_body_do(parser_t *parser, ast_block *block)
+static ast_block* parser_parse_block(parser_t *parser);
+static ast_expression* parser_parse_statement_or_block(parser_t *parser);
+static bool parser_parse_statement(parser_t *parser, ast_block *block, ast_expression **out)
{
if (parser->tok == TOKEN_TYPENAME)
{
/* local variable */
+ if (!block) {
+ parseerror(parser, "cannot declare a variable from here");
+ return false;
+ }
if (!parser_variable(parser, block))
return false;
+ *out = NULL;
return true;
}
else if (parser->tok == TOKEN_KEYWORD)
return false;
}
- if (!ast_block_exprs_add(block, (ast_expression*)ret)) {
- ast_delete(ret);
- return false;
- }
+ *out = (ast_expression*)ret;
} else if (!parser_next(parser)) {
parseerror(parser, "expected semicolon");
if (expected->expression.next->expression.vtype != TYPE_VOID) {
}
return true;
}
+ else if (!strcmp(parser_tokval(parser), "if"))
+ {
+ ast_ifthen *ifthen;
+ ast_expression *cond, *ontrue, *onfalse = NULL;
+
+ lex_ctx ctx = parser_ctx(parser);
+
+ /* skip the 'if' and check for opening paren */
+ if (!parser_next(parser) || parser->tok != '(') {
+ parseerror(parser, "expected 'if' condition in parenthesis");
+ return false;
+ }
+ /* parse into the expression */
+ if (!parser_next(parser)) {
+ parseerror(parser, "expected 'if' condition after opening paren");
+ return false;
+ }
+ /* parse the condition */
+ cond = parser_expression(parser);
+ if (!cond)
+ return false;
+ /* closing paren */
+ if (parser->tok != ')') {
+ parseerror(parser, "expected closing paren after 'if' condition");
+ ast_delete(cond);
+ return false;
+ }
+ /* parse into the 'then' branch */
+ if (!parser_next(parser)) {
+ parseerror(parser, "expected statement for on-true branch of 'if'");
+ ast_delete(cond);
+ return false;
+ }
+ ontrue = parser_parse_statement_or_block(parser);
+ if (!ontrue) {
+ ast_delete(cond);
+ return false;
+ }
+ /* check for an else */
+ if (!strcmp(parser_tokval(parser), "else")) {
+ /* parse into the 'else' branch */
+ if (!parser_next(parser)) {
+ parseerror(parser, "expected on-false branch after 'else'");
+ ast_delete(ontrue);
+ ast_delete(cond);
+ return false;
+ }
+ onfalse = parser_parse_statement_or_block(parser);
+ if (!onfalse) {
+ ast_delete(ontrue);
+ ast_delete(cond);
+ return false;
+ }
+ }
+
+ ifthen = ast_ifthen_new(ctx, cond, ontrue, onfalse);
+ *out = (ast_expression*)ifthen;
+ return true;
+ }
parseerror(parser, "Unexpected keyword");
return false;
}
else if (parser->tok == '{')
{
- /* a block */
- parseerror(parser, "TODO: inner blocks: %s", parser_tokval(parser));
- return false;
+ ast_block *inner;
+ inner = parser_parse_block(parser);
+ if (!inner)
+ return false;
+ *out = (ast_expression*)inner;
+ return true;
}
else
{
ast_expression *exp = parser_expression(parser);
if (!exp)
return false;
- if (!ast_block_exprs_add(block, exp)) {
- ast_delete(exp);
- return false;
- }
+ *out = exp;
return true;
}
}
+static void parser_pop_local(parser_t *parser)
+{
+ parser->locals_count--;
+ mem_d(parser->locals[parser->locals_count].name);
+}
+
static ast_block* parser_parse_block(parser_t *parser)
{
size_t oldblocklocal;
while (parser->tok != TOKEN_EOF && parser->tok < TOKEN_ERROR)
{
+ ast_expression *expr;
if (parser->tok == '}')
break;
- if (!parser_body_do(parser, block)) {
+ if (!parser_parse_statement(parser, block, &expr)) {
+ ast_block_delete(block);
+ block = NULL;
+ goto cleanup;
+ }
+ if (!expr)
+ continue;
+ if (!ast_block_exprs_add(block, expr)) {
+ ast_delete(expr);
ast_block_delete(block);
block = NULL;
goto cleanup;
}
cleanup:
+ while (parser->locals_count > parser->blocklocal)
+ parser_pop_local(parser);
parser->blocklocal = oldblocklocal;
+ /* unroll the local vector */
return block;
}
-static void parser_pop_local(parser_t *parser)
+static ast_expression* parser_parse_statement_or_block(parser_t *parser)
{
- parser->locals_count--;
- mem_d(parser->locals[parser->locals_count].name);
+ ast_expression *expr;
+ if (parser->tok == '{')
+ return (ast_expression*)parser_parse_block(parser);
+ if (!parser_parse_statement(parser, NULL, &expr))
+ return NULL;
+ return expr;
}
static bool parser_variable(parser_t *parser, ast_block *localblock)
}
else if (parser->tok == '.')
{
+ ast_value *var;
+ ast_value *fld;
+ bool isfunc = false;
+ int basetype;
+ lex_ctx ctx = parser_ctx(parser);
+ varentry_t varent;
+
/* entity-member declaration */
- return false;
+ if (!parser_next(parser) || parser->tok != TOKEN_TYPENAME) {
+ parseerror(parser, "expected member variable definition");
+ return false;
+ }
+
+ /* remember the base/return type */
+ basetype = parser_token(parser)->constval.t;
+
+ /* parse into the declaration */
+ if (!parser_next(parser)) {
+ parseerror(parser, "expected field def");
+ return false;
+ }
+
+ /* parse the field type fully */
+ var = parser_parse_type(parser, basetype, &isfunc);
+ if (!var)
+ return false;
+
+ /* now the field name */
+ if (parser->tok != TOKEN_IDENT) {
+ parseerror(parser, "expected field name");
+ ast_delete(var);
+ return false;
+ }
+
+ /* check for an existing field
+ * in original qc we also have to check for an existing
+ * global named like the field
+ */
+ if (opts_standard == COMPILER_QCC) {
+ if (parser_find_global(parser, parser_tokval(parser))) {
+ parseerror(parser, "cannot declare a field and a global of the same name with -std=qcc");
+ ast_delete(var);
+ return false;
+ }
+ }
+ if (parser_find_field(parser, parser_tokval(parser))) {
+ parseerror(parser, "field %s already exists", parser_tokval(parser));
+ ast_delete(var);
+ return false;
+ }
+
+ /* if it was a function, turn it into a function */
+ if (isfunc) {
+ ast_value *fval;
+ /* turn var into a value of TYPE_FUNCTION, with the old var
+ * as return type
+ */
+ fval = ast_value_new(ctx, var->name, TYPE_FUNCTION);
+ if (!fval) {
+ ast_value_delete(var);
+ ast_value_delete(fval);
+ return false;
+ }
+
+ fval->expression.next = (ast_expression*)var;
+ MEM_VECTOR_MOVE(&var->expression, params, &fval->expression, params);
+
+ var = fval;
+ }
+
+ /* turn it into a field */
+ fld = ast_value_new(ctx, parser_tokval(parser), TYPE_FIELD);
+ fld->expression.next = (ast_expression*)var;
+
+ varent.var = (ast_expression*)fld;
+ if (var->expression.vtype == TYPE_VECTOR)
+ {
+ /* create _x, _y and _z fields as well */
+ parseerror(parser, "TODO: vector field members (_x,_y,_z)");
+ ast_delete(fld);
+ return false;
+ }
+
+ varent.name = util_strdup(fld->name);
+ (void)!parser_t_fields_add(parser, varent);
+
+ /* end with a semicolon */
+ if (!parser_next(parser) || parser->tok != ';') {
+ parseerror(parser, "semicolon expected");
+ return false;
+ }
+
+ /* skip the semicolon */
+ if (!parser_next(parser))
+ return parser->tok == TOKEN_EOF;
+
+ return true;
}
else
{
return false;
}
}
+ for (i = 0; i < parser->fields_count; ++i) {
+ ast_value *field;
+ bool isconst;
+ if (!ast_istype(parser->fields[i].var, ast_value))
+ continue;
+ field = (ast_value*)parser->fields[i].var;
+ isconst = field->isconst;
+ field->isconst = false;
+ if (!ast_global_codegen((ast_value*)field, ir)) {
+ printf("failed to generate field %s\n", field->name);
+ ir_builder_delete(ir);
+ return false;
+ }
+ if (isconst) {
+ ir_value *ifld;
+ ast_expression *subtype;
+ field->isconst = true;
+ subtype = field->expression.next;
+ ifld = ir_builder_create_field(ir, field->name, subtype->expression.vtype);
+ if (subtype->expression.vtype == TYPE_FIELD)
+ ifld->fieldtype = subtype->expression.next->expression.vtype;
+ else if (subtype->expression.vtype == TYPE_FUNCTION)
+ ifld->outtype = subtype->expression.next->expression.vtype;
+ (void)!ir_value_set_field(field->ir_v, ifld);
+ }
+ }
for (i = 0; i < parser->globals_count; ++i) {
if (!ast_istype(parser->globals[i].var, ast_value))
continue;
projects / xonotic / gmqcc.git / blobdiff