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 bool parser_parse_block_into(parser_t *parser, ast_block *block);
static ast_expression* parser_parse_statement_or_block(parser_t *parser);
static ast_expression* parser_expression_leave(parser_t *parser, bool stopatcomma);
static ast_expression* parser_expression(parser_t *parser, bool stopatcomma);
va_start(ap, fmt);
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 */
if (!OPTS_WARN(warntype))
return false;
- if (OPTS_WARN(WARN_ERROR)) {
+ if (opts_werror) {
parser->errors++;
lvl = LVL_ERROR;
}
vprintmsg(lvl, parser->lex->tok->ctx.file, parser->lex->tok->ctx.line, "warning", fmt, ap);
va_end(ap);
- return OPTS_WARN(WARN_ERROR);
+ return opts_werror;
}
/**********************************************************************
{
/* lex_do kills the previous token */
parser->tok = lex_do(parser->lex);
- if (parser->tok == TOKEN_EOF || parser->tok >= TOKEN_ERROR)
+ if (parser->tok == TOKEN_EOF)
+ return false;
+ if (parser->tok >= TOKEN_ERROR) {
+ parseerror(parser, "lex error");
return false;
+ }
return true;
}
return parser->imm_float_zero;
}
+char *parser_strdup(const char *str)
+{
+ if (str && !*str) {
+ /* actually dup empty strings */
+ char *out = mem_a(1);
+ *out = 0;
+ return out;
+ }
+ return util_strdup(str);
+}
+
ast_value* parser_const_string(parser_t *parser, const char *str)
{
size_t i;
}
out = ast_value_new(parser_ctx(parser), "#IMMEDIATE", TYPE_STRING);
out->isconst = true;
- out->constval.vstring = util_strdup(str);
+ out->constval.vstring = parser_strdup(str);
if (!parser_t_imm_string_add(parser, out)) {
ast_value_delete(out);
return NULL;
return NULL;
}
-ast_expression* parser_find_local(parser_t *parser, const char *name, size_t upto)
+ast_expression* parser_find_param(parser_t *parser, const char *name)
{
size_t i;
ast_value *fun;
- for (i = parser->locals_count; i > upto;) {
- --i;
- if (!strcmp(parser->locals[i].name, name))
- return parser->locals[i].var;
- }
if (!parser->function)
return NULL;
fun = parser->function->vtype;
return NULL;
}
+ast_expression* parser_find_local(parser_t *parser, const char *name, size_t upto, bool *isparam)
+{
+ size_t i;
+ *isparam = false;
+ for (i = parser->locals_count; i > upto;) {
+ --i;
+ if (!strcmp(parser->locals[i].name, name))
+ return parser->locals[i].var;
+ }
+ *isparam = true;
+ return parser_find_param(parser, name);
+}
+
ast_expression* parser_find_var(parser_t *parser, const char *name)
{
+ bool dummy;
ast_expression *v;
- v = parser_find_local(parser, name, 0);
+ v = parser_find_local(parser, name, 0, &dummy);
if (!v) v = parser_find_global(parser, name);
return v;
}
(CanConstFold1(A) && CanConstFold1(B))
#define ConstV(i) (asvalue[(i)]->constval.vvec)
#define ConstF(i) (asvalue[(i)]->constval.vfloat)
+#define ConstS(i) (asvalue[(i)]->constval.vstring)
switch (op->id)
{
default:
- parseerror(parser, "internal error: unhandled operand");
+ parseerror(parser, "internal error: unhandled operator: %s (%i)", op->op, (int)op->id);
return false;
case opid1('.'):
}
break;
+ case opid2('!','P'):
+ switch (exprs[0]->expression.vtype) {
+ case TYPE_FLOAT:
+ if (CanConstFold1(exprs[0]))
+ out = (ast_expression*)parser_const_float(parser, !ConstF(0));
+ else
+ out = (ast_expression*)ast_unary_new(ctx, INSTR_NOT_F, exprs[0]);
+ break;
+ case TYPE_VECTOR:
+ if (CanConstFold1(exprs[0]))
+ out = (ast_expression*)parser_const_float(parser,
+ (!ConstV(0).x && !ConstV(0).y && !ConstV(0).z));
+ else
+ out = (ast_expression*)ast_unary_new(ctx, INSTR_NOT_V, exprs[0]);
+ break;
+ case TYPE_STRING:
+ if (CanConstFold1(exprs[0]))
+ out = (ast_expression*)parser_const_float(parser, !ConstS(0) || !*ConstS(0));
+ else
+ out = (ast_expression*)ast_unary_new(ctx, INSTR_NOT_S, exprs[0]);
+ break;
+ /* we don't constant-fold NOT for these types */
+ case TYPE_ENTITY:
+ out = (ast_expression*)ast_unary_new(ctx, INSTR_NOT_ENT, exprs[0]);
+ break;
+ case TYPE_FUNCTION:
+ out = (ast_expression*)ast_unary_new(ctx, INSTR_NOT_FNC, exprs[0]);
+ break;
+ default:
+ parseerror(parser, "invalid types used in expression: cannot logically negate type %s",
+ 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_VECTOR && exprs[0]->expression.vtype != TYPE_FLOAT) )
sy->out[fid] = syexp(call->expression.node.context, (ast_expression*)call);
if (fun->expression.vtype != TYPE_FUNCTION) {
- parseerror(parser, "not a function");
+ parseerror(parser, "not a function (%s)", type_name[fun->expression.vtype]);
return false;
}
return false;
} else {
if (fun->expression.params_count != paramcount) {
- parseerror(parser, "expected %i parameters, got %i", (int)fun->expression.params_count, paramcount);
- return false;
+ ast_value *fval;
+ fval = (ast_istype(fun, ast_value) ? ((ast_value*)fun) : NULL);
+ if (opts_standard == COMPILER_GMQCC)
+ {
+ if (fval)
+ parseerror(parser, "too few parameters for call to %s: expected %i, got %i",
+ fval->name, (int)fun->expression.params_count, paramcount);
+ else
+ parseerror(parser, "too few parameters for function call: expected %i, got %i",
+ (int)fun->expression.params_count, paramcount);
+ return false;
+ }
+ else
+ {
+ if (fval)
+ return !parsewarning(parser, WARN_TOO_FEW_PARAMETERS,
+ "too few parameters for call to %s: expected %i, got %i",
+ fval->name, (int)fun->expression.params_count, paramcount);
+ else
+ return !parsewarning(parser, WARN_TOO_FEW_PARAMETERS,
+ "too few parameters for function call: expected %i, got %i",
+ (int)fun->expression.params_count, paramcount);
+ }
}
}
/* variable */
if (opts_standard == COMPILER_GMQCC)
{
- if (parser->memberof == TYPE_ENTITY)
- var = parser_find_field(parser, parser_tokval(parser));
+ if (parser->memberof == TYPE_ENTITY) {
+ /* still get vars first since there could be a fieldpointer */
+ var = parser_find_var(parser, parser_tokval(parser));
+ if (!var)
+ var = parser_find_field(parser, parser_tokval(parser));
+ }
else if (parser->memberof == TYPE_VECTOR)
{
parseerror(parser, "TODO: implement effective vector member access");
parser_token(parser)->constval.v.z));
}
else if (parser->tok == '(') {
- if (wantop) {
- 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");
- goto onerr;
- }
- } else {
- ++parens;
- if (!shunt_ops_add(&sy, syparen(parser_ctx(parser), 1, 0))) {
- parseerror(parser, "out of memory");
- goto onerr;
- }
- DEBUGSHUNTDO(printf("push (\n"));
- }
- wantop = false;
+ parseerror(parser, "internal error: '(' should be classified as operator");
+ goto onerr;
}
else if (parser->tok == ')') {
if (wantop) {
break;
}
}
- wantop = false;
if (o == operator_count) {
/* no operator found... must be the end of the statement */
break;
op = &operators[o];
/* when declaring variables, a comma starts a new variable */
- if (op->id == opid1(',') && !parens && stopatcomma)
+ if (op->id == opid1(',') && !parens && stopatcomma) {
+ /* fixup the token */
+ parser->tok = ',';
break;
+ }
+
+ if (sy.ops_count && !sy.ops[sy.ops_count-1].paren)
+ olast = &operators[sy.ops[sy.ops_count-1].etype-1];
+
+ while (olast && (
+ (op->prec < olast->prec) ||
+ (op->assoc == ASSOC_LEFT && op->prec <= olast->prec) ) )
+ {
+ if (!parser_sy_pop(parser, &sy))
+ 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;
+ }
- if (op->id == opid1('.')) {
+ if (op->id == opid1('.') && opts_standard == COMPILER_GMQCC) {
/* for gmqcc standard: open up the namespace of the previous type */
ast_expression *prevex = sy.out[sy.out_count-1].out;
if (!prevex) {
gotmemberof = true;
}
- if (sy.ops_count && !sy.ops[sy.ops_count-1].paren)
- olast = &operators[sy.ops[sy.ops_count-1].etype-1];
-
- while (olast && (
- (op->prec < olast->prec) ||
- (op->assoc == ASSOC_LEFT && op->prec <= olast->prec) ) )
- {
- if (!parser_sy_pop(parser, &sy))
+ if (op->id == opid1('(')) {
+ if (wantop) {
+ 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");
+ goto onerr;
+ }
+ } else {
+ ++parens;
+ if (!shunt_ops_add(&sy, syparen(parser_ctx(parser), 1, 0))) {
+ parseerror(parser, "out of memory");
+ goto onerr;
+ }
+ DEBUGSHUNTDO(printf("push (\n"));
+ }
+ wantop = false;
+ } else {
+ DEBUGSHUNTDO(printf("push operator %s\n", op->op));
+ if (!shunt_ops_add(&sy, syop(parser_ctx(parser), op)))
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;
+ wantop = false;
}
-
- DEBUGSHUNTDO(printf("push operator %s\n", op->op));
- if (!shunt_ops_add(&sy, syop(parser_ctx(parser), op)))
- goto onerr;
}
if (!parser_next(parser)) {
goto onerr;
}
- if (parser->tok == ';') {
+ if (parser->tok == ';' || parser->tok == ']') {
break;
}
}
ast_delete(exp);
return false;
}
-
- *out = (ast_expression*)ret;
- } else if (!parser_next(parser)) {
- parseerror(parser, "expected semicolon");
+ } else {
+ if (!parser_next(parser))
+ parseerror(parser, "parse error");
if (expected->expression.next->expression.vtype != TYPE_VOID) {
- parseerror(parser, "return without value");
+ if (opts_standard != COMPILER_GMQCC)
+ (void)!parsewarning(parser, WARN_MISSING_RETURN_VALUES, "return without value");
+ else
+ parseerror(parser, "return without value");
}
+ ret = ast_return_new(parser_ctx(parser), NULL);
}
+ *out = (ast_expression*)ret;
return true;
}
else if (!strcmp(parser_tokval(parser), "if"))
mem_d(parser->locals[parser->locals_count].name);
}
-static ast_block* parser_parse_block(parser_t *parser)
+static bool parser_parse_block_into(parser_t *parser, ast_block *block)
{
size_t oldblocklocal;
- ast_block *block = NULL;
oldblocklocal = parser->blocklocal;
parser->blocklocal = parser->locals_count;
goto cleanup;
}
- block = ast_block_new(parser_ctx(parser));
-
while (parser->tok != TOKEN_EOF && parser->tok < TOKEN_ERROR)
{
ast_expression *expr;
break;
if (!parser_parse_statement(parser, block, &expr)) {
- ast_block_delete(block);
+ parseerror(parser, "parse error");
block = NULL;
goto cleanup;
}
continue;
if (!ast_block_exprs_add(block, expr)) {
ast_delete(expr);
- ast_block_delete(block);
block = NULL;
goto cleanup;
}
}
if (parser->tok != '}') {
- ast_block_delete(block);
block = NULL;
} else {
(void)parser_next(parser);
while (parser->locals_count > parser->blocklocal)
parser_pop_local(parser);
parser->blocklocal = oldblocklocal;
- /* unroll the local vector */
+ return !!block;
+}
+
+static ast_block* parser_parse_block(parser_t *parser)
+{
+ ast_block *block;
+ block = ast_block_new(parser_ctx(parser));
+ if (!block)
+ return NULL;
+ if (!parser_parse_block_into(parser, block)) {
+ ast_block_delete(block);
+ return NULL;
+ }
return block;
}
static ast_expression* parser_parse_statement_or_block(parser_t *parser)
{
- ast_expression *expr;
+ ast_expression *expr = NULL;
if (parser->tok == '{')
return (ast_expression*)parser_parse_block(parser);
if (!parser_parse_statement(parser, NULL, &expr))
return expr;
}
+static bool create_vector_members(parser_t *parser, ast_value *var,
+ varentry_t *vx, varentry_t *vy, varentry_t *vz)
+{
+ size_t len = strlen(var->name);
+ vx->var = (ast_expression*)ast_member_new(ast_ctx(var), (ast_expression*)var, 0);
+ if (!vx->var) {
+ parseerror(parser, "failed to create vector members (out of memory)");
+ return false;
+ }
+
+ vy->var = (ast_expression*)ast_member_new(ast_ctx(var), (ast_expression*)var, 1);
+ if (!vy->var) {
+ ast_delete(vx->var);
+ parseerror(parser, "failed to create vector members (out of memory)");
+ return false;
+ }
+
+ vz->var = (ast_expression*)ast_member_new(ast_ctx(var), (ast_expression*)var, 2);
+ if (!vz->var) {
+ ast_delete(vy->var);
+ ast_delete(vx->var);
+ parseerror(parser, "failed to create vector members (out of memory)");
+ return false;
+ }
+
+ if ( !(vx->name = (char*)mem_a(len+3)) ) {
+ ast_delete(vz->var);
+ ast_delete(vy->var);
+ ast_delete(vx->var);
+ parseerror(parser, "failed to create vector members (out of memory)");
+ return false;
+ }
+ if ( !(vy->name = (char*)mem_a(len+3)) ) {
+ mem_d(vx->name);
+ ast_delete(vz->var);
+ ast_delete(vy->var);
+ ast_delete(vx->var);
+ parseerror(parser, "failed to create vector members (out of memory)");
+ return false;
+ }
+ if ( !(vz->name = (char*)mem_a(len+3)) ) {
+ mem_d(vy->name);
+ mem_d(vx->name);
+ ast_delete(vz->var);
+ ast_delete(vy->var);
+ ast_delete(vx->var);
+ parseerror(parser, "failed to create vector members (out of memory)");
+ return false;
+ }
+
+ memcpy(vx->name, var->name, len);
+ memcpy(vy->name, var->name, len);
+ memcpy(vz->name, var->name, len);
+ vx->name[len] = vy->name[len] = vz->name[len] = '_';
+ vx->name[len+1] = 'x';
+ vy->name[len+1] = 'y';
+ vz->name[len+1] = 'z';
+ vx->name[len+2] = vy->name[len+2] = vz->name[len+2] = 0;
+ return true;
+}
+
static bool parser_variable(parser_t *parser, ast_block *localblock)
{
bool isfunc = false;
varentry_t varent;
ast_expression *olddecl;
+ bool hadproto;
+ bool isparam;
+
int basetype = parser_token(parser)->constval.t;
while (true)
{
+ hadproto = false;
+
if (!parser_next(parser)) { /* skip basetype or comma */
parseerror(parser, "expected variable declaration");
return false;
olddecl = NULL;
isfunc = false;
func = NULL;
+ isparam = false;
ctx = parser_ctx(parser);
var = parser_parse_type(parser, basetype, &isfunc);
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",
+ parseerror(parser, "global `%s` already declared here: %s:%i",
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 %s already declared here: %s:%i\n",
- parser_tokval(parser), ast_ctx(olddecl).file, (int)ast_ctx(olddecl).line);
- return false;
+ if (localblock) {
+ olddecl = parser_find_local(parser, parser_tokval(parser), parser->blocklocal, &isparam);
+ if (opts_standard == COMPILER_GMQCC)
+ {
+ if (olddecl)
+ {
+ if (!isparam) {
+ ast_value_delete(var);
+ parseerror(parser, "local `%s` already declared here: %s:%i",
+ parser_tokval(parser), ast_ctx(olddecl).file, (int)ast_ctx(olddecl).line);
+ return false;
+ }
+ }
+
+ if( (!isparam && olddecl) || (olddecl = parser_find_local(parser, parser_tokval(parser), 0, &isparam)) )
+ {
+ if (parsewarning(parser, WARN_LOCAL_SHADOWS,
+ "local `%s` is shadowing a parameter", parser_tokval(parser)))
+ {
+ ast_value_delete(var);
+ parseerror(parser, "local `%s` already declared here: %s:%i",
+ parser_tokval(parser), ast_ctx(olddecl).file, (int)ast_ctx(olddecl).line);
+ return false;
+ }
+ }
+ }
+ else
+ {
+ if (olddecl)
+ {
+ ast_value_delete(var);
+ if (isparam &&
+ parsewarning(parser, WARN_LOCAL_SHADOWS,
+ "a parameter is shadowing local `%s`", parser_tokval(parser)))
+ {
+ return false;
+ }
+ else if (!isparam)
+ {
+ parseerror(parser, "local `%s` already declared here: %s:%i",
+ parser_tokval(parser), ast_ctx(olddecl).file, (int)ast_ctx(olddecl).line);
+ return false;
+ }
+ goto nextvar;
+ }
+ }
}
}
/* a function was defined */
ast_value *fval;
ast_value *proto = NULL;
+ bool dummy;
if (!localblock)
olddecl = parser_find_global(parser, parser_tokval(parser));
else
- olddecl = parser_find_local(parser, parser_tokval(parser), parser->blocklocal);
+ olddecl = parser_find_local(parser, parser_tokval(parser), parser->blocklocal, &dummy);
if (olddecl) {
/* we had a prototype */
* messing with the parameter-vector etc. earlier
*/
if (proto) {
+ size_t param;
if (!ast_compare_type((ast_expression*)proto, (ast_expression*)fval)) {
parseerror(parser, "conflicting types for `%s`, previous declaration was here: %s:%i",
proto->name,
ast_value_delete(fval);
return false;
}
+ /* copy over the parameter names */
+ for (param = 0; param < fval->expression.params_count; ++param)
+ ast_value_set_name(proto->expression.params[param], fval->expression.params[param]->name);
+
+ /* now ditch the rest of the new data */
ast_function_delete(func);
ast_value_delete(fval);
- var = proto;
- func = var->constval.vfunc;
+ fval = proto;
+ func = proto->constval.vfunc;
+ hadproto = true;
}
else
{
var = fval;
}
- varent.name = util_strdup(var->name);
- varent.var = (ast_expression*)var;
- if (var->expression.vtype == TYPE_VECTOR)
- {
- size_t len = strlen(varent.name);
- varentry_t vx, vy, vz;
- vx.var = (ast_expression*)ast_member_new(var->expression.node.context, (ast_expression*)var, 0);
- vy.var = (ast_expression*)ast_member_new(var->expression.node.context, (ast_expression*)var, 1);
- vz.var = (ast_expression*)ast_member_new(var->expression.node.context, (ast_expression*)var, 2);
- vx.name = (char*)mem_a(len+3);
- vy.name = (char*)mem_a(len+3);
- vz.name = (char*)mem_a(len+3);
- memcpy(vx.name, varent.name, len);
- memcpy(vy.name, varent.name, len);
- memcpy(vz.name, varent.name, len);
- vx.name[len] = vy.name[len] = vz.name[len] = '_';
- vx.name[len+1] = 'x';
- vy.name[len+1] = 'y';
- vz.name[len+1] = 'z';
- vx.name[len+2] = vy.name[len+2] = vz.name[len+2] = 0;
-
- if (!localblock) {
- (void)!parser_t_globals_add(parser, varent);
- (void)!parser_t_globals_add(parser, vx);
- (void)!parser_t_globals_add(parser, vy);
- (void)!parser_t_globals_add(parser, vz);
- } else {
- (void)!parser_t_locals_add(parser, varent);
- (void)!parser_t_locals_add(parser, vx);
- (void)!parser_t_locals_add(parser, vy);
- (void)!parser_t_locals_add(parser, vz);
+ if (!hadproto) {
+ varent.name = util_strdup(var->name);
+ varent.var = (ast_expression*)var;
+ if (var->expression.vtype == TYPE_VECTOR)
+ {
+ varentry_t vx, vy, vz;
+ if (!create_vector_members(parser, var, &vx, &vy, &vz)) {
+ ast_delete(var);
+ return false;
+ }
+
+ if (!localblock) {
+ (void)!parser_t_globals_add(parser, varent);
+ (void)!parser_t_globals_add(parser, vx);
+ (void)!parser_t_globals_add(parser, vy);
+ (void)!parser_t_globals_add(parser, vz);
+ } else {
+ (void)!parser_t_locals_add(parser, varent);
+ (void)!parser_t_locals_add(parser, vx);
+ (void)!parser_t_locals_add(parser, vy);
+ (void)!parser_t_locals_add(parser, vz);
+ if (!ast_block_locals_add(localblock, var) ||
+ !ast_block_collect(localblock, vx.var) ||
+ !ast_block_collect(localblock, vy.var) ||
+ !ast_block_collect(localblock, vz.var))
+ {
+ parser_pop_local(parser);
+ parser_pop_local(parser);
+ parser_pop_local(parser);
+ parser_pop_local(parser);
+ ast_value_delete(var);
+ return false;
+ }
+ }
}
- }
- else
- {
- if ( (!localblock && !parser_t_globals_add(parser, varent)) ||
- ( localblock && !parser_t_locals_add(parser, varent)) )
+ else
{
- ast_value_delete(var);
- return false;
+ if ( (!localblock && !parser_t_globals_add(parser, varent)) ||
+ ( localblock && !parser_t_locals_add(parser, varent)) )
+ {
+ ast_value_delete(var);
+ return false;
+ }
+ if (localblock && !ast_block_locals_add(localblock, var))
+ {
+ parser_pop_local(parser);
+ ast_value_delete(var);
+ return false;
+ }
}
}
- if (localblock && !ast_block_locals_add(localblock, var))
- {
- parser_pop_local(parser);
- ast_value_delete(var);
- return false;
- }
+nextvar:
if (!parser_next(parser)) {
ast_value_delete(var);
return false;
if (!parser_next(parser))
return false;
- } else if (parser->tok == '{') {
+ } else if (parser->tok == '{' || parser->tok == '[') {
/* function body */
+ ast_function *old;
ast_block *block;
- ast_function *old = parser->function;
+ size_t parami;
+
+ ast_expression *fld_think, *fld_nextthink, *fld_frame;
+ ast_expression *gbl_time, *gbl_self;
+ ast_expression *framenum, *nextthink;
+ bool has_frame_think;
+
+ has_frame_think = false;
+ old = parser->function;
if (localblock) {
parseerror(parser, "cannot declare functions within functions");
return false;
}
+ if (parser->tok == '[') {
+ /* got a frame definition: [ framenum, nextthink ]
+ * this translates to:
+ * self.frame = framenum;
+ * self.nextthink = time + 0.1;
+ * self.think = nextthink;
+ */
+ fld_think = parser_find_field(parser, "think");
+ fld_nextthink = parser_find_field(parser, "nextthink");
+ fld_frame = parser_find_field(parser, "frame");
+ if (!fld_think || !fld_nextthink || !fld_frame) {
+ parseerror(parser, "cannot use [frame,think] notation without the required fields");
+ parseerror(parser, "please declare the following entityfields: `frame`, `think`, `nextthink`");
+ return false;
+ }
+ gbl_time = parser_find_global(parser, "time");
+ gbl_self = parser_find_global(parser, "self");
+ if (!gbl_time || !gbl_self) {
+ parseerror(parser, "cannot use [frame,think] notation without the required globals");
+ parseerror(parser, "please declare the following globals: `time`, `self`");
+ return false;
+ }
+
+ if (!parser_next(parser)) {
+ return false;
+ }
+
+ framenum = parser_expression_leave(parser, true);
+ if (!framenum) {
+ parseerror(parser, "expected a framenumber constant in[frame,think] notation");
+ return false;
+ }
+ if (!ast_istype(framenum, ast_value) || !( (ast_value*)framenum )->isconst) {
+ ast_unref(framenum);
+ parseerror(parser, "framenumber in [frame,think] notation must be a constant");
+ }
+
+ if (parser->tok != ',') {
+ ast_unref(framenum);
+ parseerror(parser, "expected comma after frame number in [frame,think] notation");
+ parseerror(parser, "Got a %i\n", parser->tok);
+ return false;
+ }
+
+ if (!parser_next(parser)) {
+ ast_unref(framenum);
+ return false;
+ }
+
+ nextthink = parser_expression_leave(parser, true);
+ if (!nextthink) {
+ ast_unref(framenum);
+ parseerror(parser, "expected a think-function in [frame,think] notation");
+ return false;
+ }
+
+ if (!ast_istype(nextthink, ast_value) || !( (ast_value*)nextthink )->isconst) {
+ ast_unref(nextthink);
+ ast_unref(framenum);
+ parseerror(parser, "think-function in [frame,think] notation must be a constant");
+ }
+
+ if (parser->tok != ']') {
+ parseerror(parser, "expected closing `]` for [frame,think] notation");
+ ast_unref(nextthink);
+ ast_unref(framenum);
+ return false;
+ }
+
+ if (!parser_next(parser)) {
+ ast_unref(nextthink);
+ ast_unref(framenum);
+ return false;
+ }
+
+ if (parser->tok != '{') {
+ parseerror(parser, "a function body has to be declared after a [frame,think] declaration");
+ ast_unref(nextthink);
+ ast_unref(framenum);
+ return false;
+ }
+
+ has_frame_think = true;
+ }
+
+ block = ast_block_new(parser_ctx(parser));
+ if (!block) {
+ parseerror(parser, "failed to allocate block");
+ return false;
+ }
+
+ if (has_frame_think) {
+ lex_ctx ctx;
+ ast_expression *self_frame;
+ ast_expression *self_nextthink;
+ ast_expression *self_think;
+ ast_expression *time_plus_1;
+ ast_store *store_frame;
+ ast_store *store_nextthink;
+ ast_store *store_think;
+
+ ctx = parser_ctx(parser);
+ self_frame = (ast_expression*)ast_entfield_new(ctx, gbl_self, fld_frame);
+ self_nextthink = (ast_expression*)ast_entfield_new(ctx, gbl_self, fld_nextthink);
+ self_think = (ast_expression*)ast_entfield_new(ctx, gbl_self, fld_think);
+
+ time_plus_1 = (ast_expression*)ast_binary_new(ctx, INSTR_ADD_F,
+ gbl_time, (ast_expression*)parser_const_float(parser, 0.1));
+
+ store_frame = ast_store_new(ctx, INSTR_STOREP_F, self_frame, framenum);
+ store_nextthink = ast_store_new(ctx, INSTR_STOREP_F, self_nextthink, time_plus_1);
+ store_think = ast_store_new(ctx, INSTR_STOREP_FNC, self_think, nextthink);
+
+ if (!ast_block_exprs_add(block, (ast_expression*)store_frame) ||
+ !ast_block_exprs_add(block, (ast_expression*)store_nextthink) ||
+ !ast_block_exprs_add(block, (ast_expression*)store_think) )
+ {
+ parseerror(parser, "failed to generate code for [frame,think]");
+ ast_block_delete(block);
+ return false;
+ }
+ }
+
+ for (parami = 0; parami < var->expression.params_count; ++parami) {
+ ast_value *param = var->expression.params[parami];
+ varentry_t vx, vy, vz;
+
+ if (param->expression.vtype != TYPE_VECTOR &&
+ (param->expression.vtype != TYPE_FIELD ||
+ param->expression.next->expression.vtype != TYPE_VECTOR))
+ {
+ continue;
+ }
+
+ if (!create_vector_members(parser, param, &vx, &vy, &vz)) {
+ ast_block_delete(block);
+ return false;
+ }
+
+ (void)!parser_t_locals_add(parser, vx);
+ (void)!parser_t_locals_add(parser, vy);
+ (void)!parser_t_locals_add(parser, vz);
+ if (!ast_block_collect(block, vx.var) ||
+ !ast_block_collect(block, vy.var) ||
+ !ast_block_collect(block, vz.var) )
+ {
+ parser_pop_local(parser);
+ parser_pop_local(parser);
+ parser_pop_local(parser);
+ ast_block_delete(block);
+ return false;
+ }
+ }
+
parser->function = func;
- block = parser_parse_block(parser);
+ if (!parser_parse_block_into(parser, block)) {
+ ast_block_delete(block);
+ parser->function = old;
+ return false;
+ }
parser->function = old;
if (!block)
else if (parser->tok == '.')
{
ast_value *var;
+ ast_value *typevar;
ast_value *fld;
ast_expression *oldex;
bool isfunc = false;
}
/* parse the field type fully */
- var = parser_parse_type(parser, basetype, &isfunc);
+ typevar = var = parser_parse_type(parser, basetype, &isfunc);
if (!var)
return false;
while (true) {
+ var = ast_value_copy(typevar);
/* now the field name */
if (parser->tok != TOKEN_IDENT) {
parseerror(parser, "expected field name");
if (var->expression.vtype == TYPE_VECTOR)
{
/* create _x, _y and _z fields as well */
- size_t len;
varentry_t vx, vy, vz;
-
- len = strlen(varent.name);
- vx.var = (ast_expression*)ast_member_new(ast_ctx(fld), (ast_expression*)fld, 0);
- vy.var = (ast_expression*)ast_member_new(ast_ctx(fld), (ast_expression*)fld, 1);
- vz.var = (ast_expression*)ast_member_new(ast_ctx(fld), (ast_expression*)fld, 2);
- vx.name = (char*)mem_a(len+3);
- vy.name = (char*)mem_a(len+3);
- vz.name = (char*)mem_a(len+3);
- memcpy(vx.name, varent.name, len);
- memcpy(vy.name, varent.name, len);
- memcpy(vz.name, varent.name, len);
- vx.name[len] = vy.name[len] = vz.name[len] = '_';
- vx.name[len+1] = 'x';
- vy.name[len+1] = 'y';
- vz.name[len+1] = 'z';
- vx.name[len+2] = vy.name[len+2] = vz.name[len+2] = 0;
+ if (!create_vector_members(parser, fld, &vx, &vy, &vz)) {
+ ast_delete(fld);
+ return false;
+ }
(void)!parser_t_fields_add(parser, vx);
(void)!parser_t_fields_add(parser, vy);
(void)!parser_t_fields_add(parser, vz);
return false;
}
}
+ ast_delete(typevar);
/* skip the semicolon */
if (!parser_next(parser))
return true;
}
+ else if (parser->tok == '$')
+ {
+ if (!parser_next(parser)) {
+ parseerror(parser, "parse error");
+ return false;
+ }
+ }
else
{
parseerror(parser, "unexpected token: %s", parser->lex->tok->value);
else if (!parser->errors)
parseerror(parser, "parse error\n");
lex_close(parser->lex);
- mem_d(parser);
+ parser->lex = NULL;
return false;
}
}
}
lex_close(parser->lex);
+ parser->lex = NULL;
return !parser->errors;
}
for (i = 0; i < parser->imm_float_count; ++i) {
ast_delete(parser->imm_float[i]);
}
+ for (i = 0; i < parser->fields_count; ++i) {
+ ast_delete(parser->fields[i].var);
+ mem_d(parser->fields[i].name);
+ }
for (i = 0; i < parser->globals_count; ++i) {
ast_delete(parser->globals[i].var);
mem_d(parser->globals[i].name);
}
+ MEM_VECTOR_CLEAR(parser, functions);
+ MEM_VECTOR_CLEAR(parser, imm_vector);
+ MEM_VECTOR_CLEAR(parser, imm_string);
+ MEM_VECTOR_CLEAR(parser, imm_float);
MEM_VECTOR_CLEAR(parser, globals);
+ MEM_VECTOR_CLEAR(parser, fields);
+ MEM_VECTOR_CLEAR(parser, locals);
mem_d(parser);
}