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)
MEM_VEC_FUNCTIONS(parser_t, varentry_t, locals)
MEM_VEC_FUNCTIONS(parser_t, ast_function*, functions)
+static void parser_pop_local(parser_t *parser);
+static bool parser_variable(parser_t *parser, ast_block *localblock);
+static ast_block* parser_parse_block(parser_t *parser);
+static ast_expression* parser_parse_statement_or_block(parser_t *parser);
+static ast_expression* parser_expression_leave(parser_t *parser);
+static ast_expression* parser_expression(parser_t *parser);
+
void parseerror(parser_t *parser, const char *fmt, ...)
{
va_list ap;
parser->errors++;
- if (parser)
- printf("error %s:%lu: ", parser->lex->tok->ctx.file, (unsigned long)parser->lex->tok->ctx.line);
- else
- printf("error: ");
-
va_start(ap, fmt);
- vprintf(fmt, ap);
+ vprintmsg(LVL_ERROR, parser->lex->tok->ctx.file, parser->lex->tok->ctx.line, "parse error", fmt, ap);
va_end(ap);
printf("\n");
}
+/* returns true if it counts as an error */
+bool GMQCC_WARN parsewarning(parser_t *parser, int warntype, const char *fmt, ...)
+{
+ va_list ap;
+ int lvl = LVL_WARNING;
+
+ if (!OPTS_WARN(warntype))
+ return false;
+
+ if (OPTS_WARN(WARN_ERROR)) {
+ parser->errors++;
+ lvl = LVL_ERROR;
+ }
+
+ va_start(ap, fmt);
+ vprintmsg(lvl, parser->lex->tok->ctx.file, parser->lex->tok->ctx.line, "warning", fmt, ap);
+ va_end(ap);
+
+ return OPTS_WARN(WARN_ERROR);
+}
+
bool parser_next(parser_t *parser)
{
/* lex_do kills the previous token */
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;
+ qcint generated_op = 0;
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;
return false;
}
+#define NotSameType(T) \
+ (exprs[0]->expression.vtype != exprs[1]->expression.vtype || \
+ exprs[0]->expression.vtype != T)
switch (op->id)
{
default:
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]))
type_name[exprs[1]->expression.vtype]);
return false;
}
+ if (exprs[0]->expression.vtype != TYPE_VECTOR && exprs[0]->expression.vtype != TYPE_FLOAT) {
+ parseerror(parser, "type error: %s - %s not defined",
+ type_name[exprs[0]->expression.vtype],
+ type_name[exprs[1]->expression.vtype]);
+ return false;
+ }
switch (exprs[0]->expression.vtype) {
case TYPE_FLOAT:
out = (ast_expression*)ast_binary_new(ctx, INSTR_ADD_F, exprs[0], exprs[1]);
out = (ast_expression*)ast_binary_new(ctx, INSTR_ADD_V, exprs[0], exprs[1]);
break;
default:
- parseerror(parser, "Cannot add type %s and %s",
+ parseerror(parser, "type error: cannot add type %s to %s",
type_name[exprs[0]->expression.vtype],
type_name[exprs[1]->expression.vtype]);
return false;
break;
case opid1('-'):
if (exprs[0]->expression.vtype != exprs[1]->expression.vtype) {
- parseerror(parser, "Cannot subtract type %s from %s",
+ parseerror(parser, "type error: cannot subtract type %s from %s",
type_name[exprs[1]->expression.vtype],
type_name[exprs[0]->expression.vtype]);
return false;
}
+ if (exprs[0]->expression.vtype != TYPE_VECTOR && exprs[0]->expression.vtype != TYPE_FLOAT) {
+ parseerror(parser, "type error: %s - %s not defined",
+ type_name[exprs[0]->expression.vtype],
+ type_name[exprs[1]->expression.vtype]);
+ return false;
+ }
switch (exprs[0]->expression.vtype) {
case TYPE_FLOAT:
out = (ast_expression*)ast_binary_new(ctx, INSTR_SUB_F, exprs[0], exprs[1]);
out = (ast_expression*)ast_binary_new(ctx, INSTR_SUB_V, exprs[0], exprs[1]);
break;
default:
- parseerror(parser, "Cannot add type %s from %s",
+ parseerror(parser, "type error: cannot subtract type %s from %s",
type_name[exprs[1]->expression.vtype],
type_name[exprs[0]->expression.vtype]);
return false;
exprs[1]->expression.vtype != TYPE_VECTOR &&
exprs[1]->expression.vtype != TYPE_FLOAT)
{
- parseerror(parser, "Cannot multiply type %s from %s",
+ parseerror(parser, "type error: cannot multiply type %s by %s",
type_name[exprs[1]->expression.vtype],
type_name[exprs[0]->expression.vtype]);
return false;
out = (ast_expression*)ast_binary_new(ctx, INSTR_MUL_V, exprs[0], exprs[1]);
break;
default:
- parseerror(parser, "Cannot add type %s from %s",
+ parseerror(parser, "type error: cannot multiplye type %s by %s",
type_name[exprs[1]->expression.vtype],
type_name[exprs[0]->expression.vtype]);
return false;
};
break;
case opid1('/'):
- if (exprs[0]->expression.vtype != exprs[1]->expression.vtype ||
- exprs[0]->expression.vtype != TYPE_FLOAT)
- {
- parseerror(parser, "Cannot divide types %s and %s",
+ if (NotSameType(TYPE_FLOAT)) {
+ parseerror(parser, "type error: cannot divide types %s and %s",
type_name[exprs[0]->expression.vtype],
type_name[exprs[1]->expression.vtype]);
return false;
}
out = (ast_expression*)ast_binary_new(ctx, INSTR_DIV_F, exprs[0], exprs[1]);
break;
+ case opid1('%'):
+ case opid2('%','='):
+ parseerror(parser, "qc does not have a modulo operator");
+ return false;
+ case opid1('|'):
+ case opid1('&'):
+ if (NotSameType(TYPE_FLOAT)) {
+ parseerror(parser, "type error: cannot perform bit operations on types %s and %s",
+ type_name[exprs[0]->expression.vtype],
+ type_name[exprs[1]->expression.vtype]);
+ return false;
+ }
+ out = (ast_expression*)ast_binary_new(ctx,
+ (op->id == opid1('|') ? INSTR_BITOR : INSTR_BITAND),
+ exprs[0], exprs[1]);
+ break;
+ case opid1('^'):
+ parseerror(parser, "TODO: bitxor");
+ return false;
+ case opid2('<','<'):
+ case opid2('>','>'):
+ case opid3('<','<','='):
+ case opid3('>','>','='):
+ parseerror(parser, "TODO: shifts");
+ return false;
+
+ case opid2('|','|'):
+ generated_op += 1; /* INSTR_OR */
+ case opid2('&','&'):
+ generated_op += INSTR_AND;
+ if (NotSameType(TYPE_FLOAT)) {
+ parseerror(parser, "type error: cannot apply logical operation on types %s and %s",
+ type_name[exprs[0]->expression.vtype],
+ type_name[exprs[1]->expression.vtype]);
+ parseerror(parser, "TODO: logical ops for arbitrary types using INSTR_NOT");
+ parseerror(parser, "TODO: optional early out");
+ return false;
+ }
+ if (opts_standard == COMPILER_GMQCC)
+ printf("TODO: early out logic\n");
+ out = (ast_expression*)ast_binary_new(ctx, generated_op, exprs[0], exprs[1]);
+ break;
+
+ case opid1('>'):
+ generated_op += 1; /* INSTR_GT */
+ case opid1('<'):
+ generated_op += 1; /* INSTR_LT */
+ case opid2('>', '='):
+ generated_op += 1; /* INSTR_GE */
+ case opid2('<', '='):
+ generated_op += INSTR_LE;
+ if (NotSameType(TYPE_FLOAT)) {
+ parseerror(parser, "type error: cannot compare types %s and %s",
+ type_name[exprs[0]->expression.vtype],
+ type_name[exprs[1]->expression.vtype]);
+ return false;
+ }
+ out = (ast_expression*)ast_binary_new(ctx, generated_op, exprs[0], exprs[1]);
+ break;
+ case opid2('!', '='):
+ if (exprs[0]->expression.vtype != exprs[1]->expression.vtype) {
+ parseerror(parser, "type error: cannot compare types %s and %s",
+ type_name[exprs[0]->expression.vtype],
+ type_name[exprs[1]->expression.vtype]);
+ return false;
+ }
+ out = (ast_expression*)ast_binary_new(ctx, type_ne_instr[exprs[0]->expression.vtype], exprs[0], exprs[1]);
+ break;
+ case opid2('=', '='):
+ if (exprs[0]->expression.vtype != exprs[1]->expression.vtype) {
+ parseerror(parser, "type error: cannot compare types %s and %s",
+ type_name[exprs[0]->expression.vtype],
+ type_name[exprs[1]->expression.vtype]);
+ return false;
+ }
+ out = (ast_expression*)ast_binary_new(ctx, type_eq_instr[exprs[0]->expression.vtype], exprs[0], exprs[1]);
+ break;
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;
+ case opid2('+','='):
+ if (exprs[0]->expression.vtype != exprs[1]->expression.vtype) {
+ parseerror(parser, "Cannot add type %s and %s",
+ type_name[exprs[0]->expression.vtype],
+ type_name[exprs[1]->expression.vtype]);
+ return false;
+ }
+ if (exprs[0]->expression.vtype != TYPE_VECTOR && exprs[0]->expression.vtype != TYPE_FLOAT) {
+ parseerror(parser, "type error: %s - %s not defined",
+ type_name[exprs[0]->expression.vtype],
+ type_name[exprs[1]->expression.vtype]);
+ return false;
+ }
+ switch (exprs[0]->expression.vtype) {
+ case TYPE_FLOAT:
+ out = (ast_expression*)ast_binary_new(ctx, INSTR_ADD_F, exprs[0], exprs[1]);
+ break;
+ case TYPE_VECTOR:
+ out = (ast_expression*)ast_binary_new(ctx, INSTR_ADD_V, exprs[0], exprs[1]);
+ break;
+ default:
+ parseerror(parser, "type error: cannot add type %s to %s",
+ type_name[exprs[0]->expression.vtype],
+ type_name[exprs[1]->expression.vtype]);
+ return false;
+ };
break;
}
+#undef NotSameType
if (!out) {
parseerror(parser, "failed to apply operand %s", op->op);
return false;
}
+ DEBUGSHUNTDO(printf("applied %s\n", op->op));
sy->out[sy->out_count++] = syexp(ctx, out);
return true;
}
return true;
}
-static ast_expression* parser_expression(parser_t *parser)
+static ast_expression* parser_expression_leave(parser_t *parser)
{
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("do[nop] )\n"));
--parens;
if (parens < 0)
break;
wantop = nextwant;
parser->lex->flags.noops = !wantop;
} else {
+ bool nextwant = false;
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("do[op] )\n"));
--parens;
if (parens < 0)
break;
/* closing an opening paren */
if (!parser_close_paren(parser, &sy, false))
goto onerr;
+ nextwant = true;
}
else if (parser->tok != TOKEN_OPERATOR) {
parseerror(parser, "expected operator or end of statement");
}
/* 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;
}
- wantop = false;
- parser->lex->flags.noops = true;
+ wantop = nextwant;
+ parser->lex->flags.noops = !wantop;
}
if (!parser_next(parser)) {
goto onerr;
break;
}
}
- if (parens >= 0 && !parser_next(parser)) {
- parseerror(parser, "Unexpected end of file");
- goto onerr;
- }
while (sy.ops_count) {
if (!parser_sy_pop(parser, &sy))
expr = sy.out[0].out;
MEM_VECTOR_CLEAR(&sy, out);
MEM_VECTOR_CLEAR(&sy, ops);
+ DEBUGSHUNTDO(printf("shut done\n"));
return expr;
onerr:
return NULL;
}
-static bool parser_variable(parser_t *parser, ast_block *localblock);
-static ast_block* parser_parse_block(parser_t *parser);
-static ast_expression* parser_parse_statement_or_block(parser_t *parser);
+static ast_expression* parser_expression(parser_t *parser)
+{
+ ast_expression *e = parser_expression_leave(parser);
+ if (!e)
+ return NULL;
+ if (!parser_next(parser)) {
+ ast_delete(e);
+ return NULL;
+ }
+ return e;
+}
+
+static bool parser_parse_if(parser_t *parser, ast_block *block, ast_expression **out)
+{
+ 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_leave(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;
+}
+
+static bool parser_parse_while(parser_t *parser, ast_block *block, ast_expression **out)
+{
+ ast_loop *aloop;
+ ast_expression *cond, *ontrue;
+
+ lex_ctx ctx = parser_ctx(parser);
+
+ /* skip the 'while' and check for opening paren */
+ if (!parser_next(parser) || parser->tok != '(') {
+ parseerror(parser, "expected 'while' condition in parenthesis");
+ return false;
+ }
+ /* parse into the expression */
+ if (!parser_next(parser)) {
+ parseerror(parser, "expected 'while' condition after opening paren");
+ return false;
+ }
+ /* parse the condition */
+ cond = parser_expression_leave(parser);
+ if (!cond)
+ return false;
+ /* closing paren */
+ if (parser->tok != ')') {
+ parseerror(parser, "expected closing paren after 'while' condition");
+ ast_delete(cond);
+ return false;
+ }
+ /* parse into the 'then' branch */
+ if (!parser_next(parser)) {
+ parseerror(parser, "expected while-loop body");
+ ast_delete(cond);
+ return false;
+ }
+ ontrue = parser_parse_statement_or_block(parser);
+ if (!ontrue) {
+ ast_delete(cond);
+ return false;
+ }
+
+ aloop = ast_loop_new(ctx, NULL, cond, NULL, NULL, ontrue);
+ *out = (ast_expression*)aloop;
+ return true;
+}
+
+static bool parser_parse_dowhile(parser_t *parser, ast_block *block, ast_expression **out)
+{
+ ast_loop *aloop;
+ ast_expression *cond, *ontrue;
+
+ lex_ctx ctx = parser_ctx(parser);
+
+ /* skip the 'do' and get the body */
+ if (!parser_next(parser)) {
+ parseerror(parser, "expected loop body");
+ return false;
+ }
+ ontrue = parser_parse_statement_or_block(parser);
+ if (!ontrue)
+ return false;
+
+ /* expect the "while" */
+ if (parser->tok != TOKEN_KEYWORD ||
+ strcmp(parser_tokval(parser), "while"))
+ {
+ parseerror(parser, "expected 'while' and condition");
+ ast_delete(ontrue);
+ return false;
+ }
+
+ /* skip the 'while' and check for opening paren */
+ if (!parser_next(parser) || parser->tok != '(') {
+ parseerror(parser, "expected 'while' condition in parenthesis");
+ ast_delete(ontrue);
+ return false;
+ }
+ /* parse into the expression */
+ if (!parser_next(parser)) {
+ parseerror(parser, "expected 'while' condition after opening paren");
+ ast_delete(ontrue);
+ return false;
+ }
+ /* parse the condition */
+ cond = parser_expression_leave(parser);
+ if (!cond)
+ return false;
+ /* closing paren */
+ if (parser->tok != ')') {
+ parseerror(parser, "expected closing paren after 'while' condition");
+ ast_delete(ontrue);
+ ast_delete(cond);
+ return false;
+ }
+ /* parse on */
+ if (!parser_next(parser) || parser->tok != ';') {
+ parseerror(parser, "expected semicolon after condition");
+ ast_delete(ontrue);
+ ast_delete(cond);
+ return false;
+ }
+
+ if (!parser_next(parser)) {
+ parseerror(parser, "parse error");
+ ast_delete(ontrue);
+ ast_delete(cond);
+ return false;
+ }
+
+ aloop = ast_loop_new(ctx, NULL, NULL, cond, NULL, ontrue);
+ *out = (ast_expression*)aloop;
+ return true;
+}
+
+static bool parser_parse_for(parser_t *parser, ast_block *block, ast_expression **out)
+{
+ ast_loop *aloop;
+ ast_expression *initexpr, *cond, *increment, *ontrue;
+ size_t oldblocklocal;
+
+ lex_ctx ctx = parser_ctx(parser);
+
+ oldblocklocal = parser->blocklocal;
+ parser->blocklocal = parser->locals_count;
+
+ initexpr = NULL;
+ cond = NULL;
+ increment = NULL;
+ ontrue = NULL;
+
+ /* skip the 'while' and check for opening paren */
+ if (!parser_next(parser) || parser->tok != '(') {
+ parseerror(parser, "expected 'for' expressions in parenthesis");
+ goto onerr;
+ }
+ /* parse into the expression */
+ if (!parser_next(parser)) {
+ parseerror(parser, "expected 'for' initializer after opening paren");
+ goto onerr;
+ }
+
+ if (parser->tok == TOKEN_TYPENAME) {
+ if (opts_standard != COMPILER_GMQCC) {
+ if (parsewarning(parser, WARN_EXTENSIONS,
+ "current standard does not allow variable declarations in for-loop initializers"))
+ goto onerr;
+ }
+
+ parseerror(parser, "TODO: assignment of new variables to be non-const");
+ goto onerr;
+ if (!parser_variable(parser, block))
+ goto onerr;
+ }
+ else if (parser->tok != ';')
+ {
+ initexpr = parser_expression_leave(parser);
+ if (!initexpr)
+ goto onerr;
+ }
+
+ /* move on to condition */
+ if (parser->tok != ';') {
+ parseerror(parser, "expected semicolon after for-loop initializer");
+ goto onerr;
+ }
+ if (!parser_next(parser)) {
+ parseerror(parser, "expected for-loop condition");
+ goto onerr;
+ }
+
+ /* parse the condition */
+ if (parser->tok != ';') {
+ cond = parser_expression_leave(parser);
+ if (!cond)
+ goto onerr;
+ }
+
+ /* move on to incrementor */
+ if (parser->tok != ';') {
+ parseerror(parser, "expected semicolon after for-loop initializer");
+ goto onerr;
+ }
+ if (!parser_next(parser)) {
+ parseerror(parser, "expected for-loop condition");
+ goto onerr;
+ }
+
+ /* parse the incrementor */
+ if (parser->tok != ')') {
+ increment = parser_expression_leave(parser);
+ if (!increment)
+ goto onerr;
+ }
+
+ /* closing paren */
+ if (parser->tok != ')') {
+ parseerror(parser, "expected closing paren after 'for-loop' incrementor");
+ goto onerr;
+ }
+ /* parse into the 'then' branch */
+ if (!parser_next(parser)) {
+ parseerror(parser, "expected for-loop body");
+ goto onerr;
+ }
+ ontrue = parser_parse_statement_or_block(parser);
+ if (!ontrue) {
+ goto onerr;
+ }
+
+ aloop = ast_loop_new(ctx, initexpr, cond, NULL, increment, ontrue);
+ *out = (ast_expression*)aloop;
+
+ while (parser->locals_count > parser->blocklocal)
+ parser_pop_local(parser);
+ parser->blocklocal = oldblocklocal;
+ return true;
+onerr:
+ if (initexpr) ast_delete(initexpr);
+ if (cond) ast_delete(cond);
+ if (increment) ast_delete(increment);
+ while (parser->locals_count > parser->blocklocal)
+ parser_pop_local(parser);
+ parser->blocklocal = oldblocklocal;
+ return false;
+}
+
static bool parser_parse_statement(parser_t *parser, ast_block *block, ast_expression **out)
{
if (parser->tok == TOKEN_TYPENAME)
parseerror(parser, "cannot declare a variable from here");
return false;
}
+ if (opts_standard == COMPILER_QCC) {
+ if (parsewarning(parser, WARN_EXTENSIONS, "missing 'local' keyword when declaring a local variable"))
+ return false;
+ }
if (!parser_variable(parser, block))
return false;
*out = NULL;
}
else if (parser->tok == TOKEN_KEYWORD)
{
- if (!strcmp(parser_tokval(parser), "return"))
+ if (!strcmp(parser_tokval(parser), "local"))
+ {
+ if (!block) {
+ parseerror(parser, "cannot declare a local variable here");
+ return false;
+ }
+ if (!parser_next(parser)) {
+ parseerror(parser, "expected variable declaration");
+ return false;
+ }
+ if (!parser_variable(parser, block))
+ return false;
+ *out = NULL;
+ return true;
+ }
+ else if (!strcmp(parser_tokval(parser), "return"))
{
ast_expression *exp = NULL;
ast_return *ret = NULL;
}
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;
+ return parser_parse_if(parser, block, out);
+ }
+ else if (!strcmp(parser_tokval(parser), "while"))
+ {
+ return parser_parse_while(parser, block, out);
+ }
+ else if (!strcmp(parser_tokval(parser), "do"))
+ {
+ return parser_parse_dowhile(parser, block, out);
+ }
+ else if (!strcmp(parser_tokval(parser), "for"))
+ {
+ return parser_parse_for(parser, block, out);
}
parseerror(parser, "Unexpected keyword");
return false;
}
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;
}
lex_ctx ctx;
ast_value *var;
varentry_t varent;
+ ast_expression *olddecl;
int basetype = parser_token(parser)->constval.t;
return false;
}
- isfunc = false;
- func = NULL;
+ olddecl = NULL;
+ isfunc = false;
+ func = NULL;
ctx = parser_ctx(parser);
var = parser_parse_type(parser, basetype, &isfunc);
return false;
}
- if (!localblock && parser_find_global(parser, parser_tokval(parser))) {
- ast_value_delete(var);
- parseerror(parser, "global already exists: %s\n", parser_tokval(parser));
- return false;
- }
+ if (!isfunc) {
+ if (!localblock && (olddecl = parser_find_global(parser, parser_tokval(parser)))) {
+ ast_value_delete(var);
+ parseerror(parser, "global %s already declared here: %s:%i\n",
+ parser_tokval(parser), ast_ctx(olddecl).file, (int)ast_ctx(olddecl).line);
+ return false;
+ }
- if (localblock && parser_find_local(parser, parser_tokval(parser), parser->blocklocal)) {
- ast_value_delete(var);
- parseerror(parser, "local variable already exists: %s\n", parser_tokval(parser));
- return false;
+ if (localblock && parser_find_local(parser, parser_tokval(parser), parser->blocklocal)) {
+ ast_value_delete(var);
+ parseerror(parser, "local %s already declared here: %s:%i\n",
+ parser_tokval(parser), ast_ctx(olddecl).file, (int)ast_ctx(olddecl).line);
+ return false;
+ }
}
if (!ast_value_set_name(var, parser_tokval(parser))) {
if (isfunc) {
/* a function was defined */
ast_value *fval;
+ ast_value *proto = NULL;
+
+ if (!localblock)
+ olddecl = parser_find_global(parser, parser_tokval(parser));
+ else
+ olddecl = parser_find_local(parser, parser_tokval(parser), parser->blocklocal);
+
+ if (olddecl) {
+ /* we had a prototype */
+ if (!ast_istype(olddecl, ast_value)) {
+ /* theoretically not possible you think?
+ * well:
+ * vector v;
+ * void() v_x = {}
+ * got it?
+ */
+ parseerror(parser, "cannot declare a function with the same name as a vector's member: %s",
+ parser_tokval(parser));
+ ast_value_delete(var);
+ return false;
+ }
+
+ proto = (ast_value*)olddecl;
+ }
/* turn var into a value of TYPE_FUNCTION, with the old var
* as return type
fval->expression.next = (ast_expression*)var;
MEM_VECTOR_MOVE(&var->expression, params, &fval->expression, params);
- if (!parser_t_functions_add(parser, func)) {
- ast_value_delete(var);
- if (fval) ast_value_delete(fval);
- if (func) ast_function_delete(func);
- return false;
+ /* we compare the type late here, but it's easier than
+ * messing with the parameter-vector etc. earlier
+ */
+ if (proto) {
+ if (!ast_compare_type((ast_expression*)proto, (ast_expression*)fval)) {
+ parseerror(parser, "prototype declared at %s:%i had a different type",
+ ast_ctx(proto).file, ast_ctx(proto).line);
+ ast_function_delete(func);
+ ast_value_delete(fval);
+ return false;
+ }
+ ast_function_delete(func);
+ ast_value_delete(fval);
+ var = proto;
+ func = var->constval.vfunc;
+ }
+ else
+ {
+ if (!parser_t_functions_add(parser, func)) {
+ ast_function_delete(func);
+ ast_value_delete(fval);
+ return false;
+ }
}
var = fval;
ast_block_delete(block);
return false;
}
+
+ if (parser->tok == ';')
+ return parser_next(parser) || parser->tok == TOKEN_EOF;
+ else if (opts_standard == COMPILER_QCC)
+ parseerror(parser, "missing semicolon after function body (mandatory with -std=qcc)");
return true;
} else {
parseerror(parser, "TODO, const assignment");
if (!parser_do(parser)) {
if (parser->tok == TOKEN_EOF)
parseerror(parser, "unexpected eof");
- else
+ else if (!parser->errors)
parseerror(parser, "parse error\n");
lex_close(parser->lex);
mem_d(parser);
}
}
- ir_builder_dump(ir, printf);
+ if (opts_dump)
+ ir_builder_dump(ir, printf);
if (!ir_builder_generate(ir, output)) {
printf("*** failed to generate output file\n");