# define DEBUGSHUNTDO(x)
#endif
+/* With regular precedence rules, ent.foo[n] is the same as (ent.foo)[n],
+ * so we need to rotate it to become ent.(foo[n]).
+ */
+static bool rotate_entfield_array_index_nodes(ast_expression **out)
+{
+ ast_array_index *index;
+ ast_entfield *entfield;
+
+ ast_value *field;
+ ast_expression *sub;
+ ast_expression *entity;
+
+ lex_ctx ctx = ast_ctx(*out);
+
+ if (!ast_istype(*out, ast_array_index))
+ return false;
+ index = (ast_array_index*)*out;
+
+ if (!ast_istype(index->array, ast_entfield))
+ return false;
+ entfield = (ast_entfield*)index->array;
+
+ if (!ast_istype(entfield->field, ast_value))
+ return false;
+ field = (ast_value*)entfield->field;
+
+ sub = index->index;
+ entity = entfield->entity;
+
+ ast_delete(index);
+
+ index = ast_array_index_new(ctx, (ast_expression*)field, sub);
+ entfield = ast_entfield_new(ctx, entity, (ast_expression*)index);
+ *out = (ast_expression*)entfield;
+
+ return true;
+}
+
static bool parser_sy_pop(parser_t *parser, shunt *sy)
{
const oper_info *op;
}
break;
+ case opid1('['):
+ if (exprs[0]->expression.vtype != TYPE_ARRAY &&
+ !(exprs[0]->expression.vtype == TYPE_FIELD &&
+ exprs[0]->expression.next->expression.vtype == TYPE_ARRAY))
+ {
+ ast_type_to_string(exprs[0], ty1, sizeof(ty1));
+ parseerror(parser, "cannot index value of type %s", ty1);
+ return false;
+ }
+ if (exprs[1]->expression.vtype != TYPE_FLOAT) {
+ ast_type_to_string(exprs[0], ty1, sizeof(ty1));
+ parseerror(parser, "index must be of type float, not %s", ty1);
+ return false;
+ }
+ out = (ast_expression*)ast_array_index_new(ctx, exprs[0], exprs[1]);
+ if (rotate_entfield_array_index_nodes(&out))
+ {
+ if (opts_standard != COMPILER_GMQCC) {
+ /* this error doesn't need to make us bail out */
+ (void)!parsewarning(parser, WARN_EXTENSIONS,
+ "accessing array-field members of an entity without parenthesis");
+ }
+ }
+ break;
+
case opid1(','):
if (blocks[0]) {
if (!ast_block_exprs_add(blocks[0], exprs[1]))
return !functions_only;
}
if (sy->ops[sy->ops_count-1].paren == SY_PAREN_INDEX) {
+ if (functions_only)
+ return false;
+ /* pop off the parenthesis */
sy->ops_count--;
+ /* then apply the index operator */
+ if (!parser_sy_pop(parser, sy))
+ return false;
return true;
}
if (!parser_sy_pop(parser, sy))
goto onerr;
}
++parens;
- if (!shunt_ops_add(&sy, syparen(parser_ctx(parser), SY_PAREN_INDEX, 0))) {
- parseerror(parser, "out of memory");
+ /* push both the operator and the paren, this makes life easier */
+ if (!shunt_ops_add(&sy, syop(parser_ctx(parser), op)))
goto onerr;
- }
+ if (!shunt_ops_add(&sy, syparen(parser_ctx(parser), SY_PAREN_INDEX, 0)))
+ goto onerr;
+ wantop = false;
} else {
DEBUGSHUNTDO(printf("push operator %s\n", op->op));
if (!shunt_ops_add(&sy, syop(parser_ctx(parser), op)))
if (!parser_next(parser)) {
goto onerr;
}
- if (parser->tok == ';' || parser->tok == ']') {
+ if (parser->tok == ';' || (!parens && parser->tok == ']')) {
break;
}
}
return false;
}
+static ast_expression *array_accessor_split(
+ parser_t *parser,
+ ast_value *array,
+ ast_value *index,
+ size_t middle,
+ ast_expression *left,
+ ast_expression *right
+ )
+{
+ ast_ifthen *ifthen;
+ ast_binary *cmp;
+
+ lex_ctx ctx = ast_ctx(array);
+
+ if (!left || !right) {
+ if (left) ast_delete(left);
+ if (right) ast_delete(right);
+ return NULL;
+ }
+
+ cmp = ast_binary_new(ctx, INSTR_LT,
+ (ast_expression*)index,
+ (ast_expression*)parser_const_float(parser, middle));
+ if (!cmp) {
+ ast_delete(left);
+ ast_delete(right);
+ parseerror(parser, "internal error: failed to create comparison for array setter");
+ return NULL;
+ }
+
+ ifthen = ast_ifthen_new(ctx, (ast_expression*)cmp, left, right);
+ if (!ifthen) {
+ ast_delete(cmp); /* will delete left and right */
+ parseerror(parser, "internal error: failed to create conditional jump for array setter");
+ return NULL;
+ }
+
+ return (ast_expression*)ifthen;
+}
+
static ast_expression *array_setter_node(parser_t *parser, ast_value *array, ast_value *index, ast_value *value, size_t from, size_t afterend)
{
lex_ctx ctx = ast_ctx(array);
return (ast_expression*)block;
} else {
- ast_ifthen *ifthen;
ast_expression *left, *right;
- ast_binary *cmp;
-
size_t diff = afterend - from;
size_t middle = from + diff/2;
-
left = array_setter_node(parser, array, index, value, from, middle);
right = array_setter_node(parser, array, index, value, middle, afterend);
- if (!left || !right) {
- if (left) ast_delete(left);
- if (right) ast_delete(right);
+ return array_accessor_split(parser, array, index, middle, left, right);
+ }
+}
+
+static ast_expression *array_field_setter_node(
+ parser_t *parser,
+ ast_value *array,
+ ast_value *entity,
+ ast_value *index,
+ ast_value *value,
+ size_t from,
+ size_t afterend)
+{
+ lex_ctx ctx = ast_ctx(array);
+
+ if (from+1 == afterend) {
+ // set this value
+ ast_block *block;
+ ast_return *ret;
+ ast_entfield *entfield;
+ ast_array_index *subscript;
+ int assignop = type_storep_instr[value->expression.vtype];
+
+ if (value->expression.vtype == TYPE_FIELD && value->expression.next->expression.vtype == TYPE_VECTOR)
+ assignop = INSTR_STOREP_V;
+
+ subscript = ast_array_index_new(ctx, (ast_expression*)array, (ast_expression*)parser_const_float(parser, from));
+ if (!subscript)
+ return NULL;
+
+ entfield = ast_entfield_new_force(ctx,
+ (ast_expression*)entity,
+ (ast_expression*)subscript,
+ (ast_expression*)subscript);
+ if (!entfield) {
+ ast_delete(subscript);
return NULL;
}
- cmp = ast_binary_new(ctx, INSTR_LT,
- (ast_expression*)index,
- (ast_expression*)parser_const_float(parser, from + diff/2));
- if (!cmp) {
- ast_delete(left);
- ast_delete(right);
- parseerror(parser, "internal error: failed to create comparison for array setter");
+ ast_store *st = ast_store_new(ctx, assignop, (ast_expression*)entfield, (ast_expression*)value);
+ if (!st) {
+ ast_delete(entfield);
return NULL;
}
- ifthen = ast_ifthen_new(ctx, (ast_expression*)cmp, left, right);
- if (!ifthen) {
- ast_delete(cmp); /* will delete left and right */
- parseerror(parser, "internal error: failed to create conditional jump for array setter");
+ block = ast_block_new(ctx);
+ if (!block) {
+ ast_delete(st);
+ return NULL;
+ }
+
+ if (!ast_block_exprs_add(block, (ast_expression*)st)) {
+ ast_delete(block);
+ return NULL;
+ }
+
+ ret = ast_return_new(ctx, NULL);
+ if (!ret) {
+ ast_delete(block);
return NULL;
}
- return (ast_expression*)ifthen;
+ if (!ast_block_exprs_add(block, (ast_expression*)ret)) {
+ ast_delete(block);
+ return NULL;
+ }
+
+ return (ast_expression*)block;
+ } else {
+ ast_expression *left, *right;
+ size_t diff = afterend - from;
+ size_t middle = from + diff/2;
+ left = array_field_setter_node(parser, array, entity, index, value, from, middle);
+ right = array_field_setter_node(parser, array, entity, index, value, middle, afterend);
+ return array_accessor_split(parser, array, index, middle, left, right);
}
}
return (ast_expression*)ret;
} else {
- ast_ifthen *ifthen;
ast_expression *left, *right;
- ast_binary *cmp;
-
size_t diff = afterend - from;
size_t middle = from + diff/2;
-
left = array_getter_node(parser, array, index, from, middle);
right = array_getter_node(parser, array, index, middle, afterend);
- if (!left || !right) {
- if (left) ast_delete(left);
- if (right) ast_delete(right);
- return NULL;
- }
+ return array_accessor_split(parser, array, index, middle, left, right);
+ }
+}
- cmp = ast_binary_new(ctx, INSTR_LT,
- (ast_expression*)index,
- (ast_expression*)parser_const_float(parser, from + diff/2));
- if (!cmp) {
- ast_delete(left);
- ast_delete(right);
- parseerror(parser, "internal error: failed to create comparison for array setter");
- return NULL;
- }
+static bool parser_create_array_accessor(parser_t *parser, ast_value *array, const char *funcname, ast_value **out)
+{
+ ast_function *func = NULL;
+ ast_value *fval = NULL;
- ifthen = ast_ifthen_new(ctx, (ast_expression*)cmp, left, right);
- if (!ifthen) {
- ast_delete(cmp); /* will delete left and right */
- parseerror(parser, "internal error: failed to create conditional jump for array setter");
- return NULL;
- }
+ fval = ast_value_new(ast_ctx(array), funcname, TYPE_FUNCTION);
+ if (!fval) {
+ parseerror(parser, "failed to create accessor function value");
+ return false;
+ }
- return (ast_expression*)ifthen;
+ func = ast_function_new(ast_ctx(array), funcname, fval);
+ if (!func) {
+ ast_delete(fval);
+ parseerror(parser, "failed to create accessor function node");
+ return false;
}
+
+ *out = fval;
+
+ return true;
}
static bool parser_create_array_setter(parser_t *parser, ast_value *array, const char *funcname)
{
ast_expression *root = NULL;
- ast_function *func = NULL;
- ast_value *fval = NULL;
- ast_block *body;
- ast_value *index, *value;
+ ast_block *body = NULL;
+ ast_value *index = NULL;
+ ast_value *value = NULL;
+ ast_function *func;
+ ast_value *fval;
if (!ast_istype(array->expression.next, ast_value)) {
parseerror(parser, "internal error: array accessor needs to build an ast_value with a copy of the element type");
return false;
}
+ if (!parser_create_array_accessor(parser, array, funcname, &fval))
+ return false;
+ func = fval->constval.vfunc;
+ fval->expression.next = (ast_expression*)ast_value_new(ast_ctx(array), "<void>", TYPE_VOID);
+
body = ast_block_new(ast_ctx(array));
if (!body) {
parseerror(parser, "failed to create block for array accessor");
- return false;
+ goto cleanup;
}
index = ast_value_new(ast_ctx(array), "index", TYPE_FLOAT);
value = ast_value_copy((ast_value*)array->expression.next);
if (!index || !value) {
- ast_delete(body);
- if (index) ast_delete(index);
- if (value) ast_delete(value);
parseerror(parser, "failed to create locals for array accessor");
- return false;
+ goto cleanup;
}
+ (void)!ast_value_set_name(value, "value"); /* not important */
+ (void)!ast_expression_common_params_add(&fval->expression, index);
+ (void)!ast_expression_common_params_add(&fval->expression, value);
root = array_setter_node(parser, array, index, value, 0, array->expression.count);
if (!root) {
goto cleanup;
}
- if (!ast_block_exprs_add(body, root)) {
- parseerror(parser, "failed to build accessor search block");
- goto cleanup;
- }
+ (void)!ast_block_exprs_add(body, root);
+ (void)!ast_function_blocks_add(func, body);
+ array->setter = fval;
+ return true;
+cleanup:
+ if (body) ast_delete(body);
+ if (index) ast_delete(index);
+ if (value) ast_delete(value);
+ if (root) ast_delete(root);
+ ast_delete(func);
+ ast_delete(fval);
+ return false;
+}
- fval = ast_value_new(ast_ctx(array), funcname, TYPE_FUNCTION);
- if (!fval) {
- parseerror(parser, "failed to create accessor function value");
- goto cleanup;
+static bool parser_create_array_field_setter(parser_t *parser, ast_value *array, const char *funcname)
+{
+ ast_expression *root = NULL;
+ ast_block *body = NULL;
+ ast_value *entity = NULL;
+ ast_value *index = NULL;
+ ast_value *value = NULL;
+ ast_function *func;
+ ast_value *fval;
+
+ if (!ast_istype(array->expression.next, ast_value)) {
+ parseerror(parser, "internal error: array accessor needs to build an ast_value with a copy of the element type");
+ return false;
}
+
+ if (!parser_create_array_accessor(parser, array, funcname, &fval))
+ return false;
+ func = fval->constval.vfunc;
fval->expression.next = (ast_expression*)ast_value_new(ast_ctx(array), "<void>", TYPE_VOID);
- (void)!ast_value_set_name(value, "value"); /* not important */
- if (!ast_expression_common_params_add(&fval->expression, index)) {
- parseerror(parser, "failed to build array setter");
+ body = ast_block_new(ast_ctx(array));
+ if (!body) {
+ parseerror(parser, "failed to create block for array accessor");
goto cleanup;
}
- if (!ast_expression_common_params_add(&fval->expression, value)) {
- ast_delete(index);
- parseerror(parser, "failed to build array setter");
- goto cleanup2;
- }
- func = ast_function_new(ast_ctx(array), funcname, fval);
- if (!func) {
- parseerror(parser, "failed to create accessor function node");
- goto cleanup2;
+ entity = ast_value_new(ast_ctx(array), "entity", TYPE_ENTITY);
+ index = ast_value_new(ast_ctx(array), "index", TYPE_FLOAT);
+ value = ast_value_copy((ast_value*)array->expression.next);
+ if (!entity || !index || !value) {
+ parseerror(parser, "failed to create locals for array accessor");
+ goto cleanup;
}
+ (void)!ast_value_set_name(value, "value"); /* not important */
+ (void)!ast_expression_common_params_add(&fval->expression, entity);
+ (void)!ast_expression_common_params_add(&fval->expression, index);
+ (void)!ast_expression_common_params_add(&fval->expression, value);
- if (!ast_function_blocks_add(func, body))
- goto cleanup2;
+ root = array_field_setter_node(parser, array, entity, index, value, 0, array->expression.count);
+ if (!root) {
+ parseerror(parser, "failed to build accessor search tree");
+ goto cleanup;
+ }
+ (void)!ast_block_exprs_add(body, root);
+ (void)!ast_function_blocks_add(func, body);
array->setter = fval;
-
return true;
cleanup:
- ast_delete(index);
- ast_delete(value);
-cleanup2:
- ast_delete(body);
- if (root) ast_delete(root);
- if (func) ast_delete(func);
- if (fval) ast_delete(fval);
+ if (body) ast_delete(body);
+ if (entity) ast_delete(entity);
+ if (index) ast_delete(index);
+ if (value) ast_delete(value);
+ if (root) ast_delete(root);
+ ast_delete(func);
+ ast_delete(fval);
return false;
}
-static bool parser_create_array_getter(parser_t *parser, ast_value *array, const char *funcname)
+static bool parser_create_array_getter(parser_t *parser, ast_value *array, const ast_expression *elemtype, const char *funcname)
{
ast_expression *root = NULL;
- ast_function *func = NULL;
- ast_value *fval = NULL;
- ast_block *body;
- ast_value *index;
+ ast_block *body = NULL;
+ ast_value *index = NULL;
+ ast_value *fval;
+ ast_function *func;
+ /* NOTE: checking array->expression.next rather than elemtype since
+ * for fields elemtype is a temporary fieldtype.
+ */
if (!ast_istype(array->expression.next, ast_value)) {
parseerror(parser, "internal error: array accessor needs to build an ast_value with a copy of the element type");
return false;
}
+ if (!parser_create_array_accessor(parser, array, funcname, &fval))
+ return false;
+ func = fval->constval.vfunc;
+ fval->expression.next = ast_type_copy(ast_ctx(array), elemtype);
+
body = ast_block_new(ast_ctx(array));
if (!body) {
parseerror(parser, "failed to create block for array accessor");
- return false;
+ goto cleanup;
}
index = ast_value_new(ast_ctx(array), "index", TYPE_FLOAT);
if (!index) {
- ast_delete(body);
- if (index) ast_delete(index);
parseerror(parser, "failed to create locals for array accessor");
- return false;
+ goto cleanup;
}
+ (void)!ast_expression_common_params_add(&fval->expression, index);
root = array_getter_node(parser, array, index, 0, array->expression.count);
if (!root) {
goto cleanup;
}
- if (!ast_block_exprs_add(body, root)) {
- parseerror(parser, "failed to build accessor search block");
- goto cleanup;
- }
-
- fval = ast_value_new(ast_ctx(array), funcname, TYPE_FUNCTION);
- if (!fval) {
- parseerror(parser, "failed to create accessor function value");
- goto cleanup;
- }
- fval->expression.next = ast_type_copy(ast_ctx(array), array->expression.next);
-
- if (!ast_expression_common_params_add(&fval->expression, index)) {
- parseerror(parser, "failed to build array setter");
- goto cleanup;
- }
-
- func = ast_function_new(ast_ctx(array), funcname, fval);
- if (!func) {
- parseerror(parser, "failed to create accessor function node");
- goto cleanup2;
- }
-
- if (!ast_function_blocks_add(func, body))
- goto cleanup2;
-
+ (void)!ast_block_exprs_add(body, root);
+ (void)!ast_function_blocks_add(func, body);
array->getter = fval;
-
return true;
cleanup:
- ast_delete(index);
-cleanup2:
- ast_delete(body);
- if (root) ast_delete(root);
- if (func) ast_delete(func);
- if (fval) ast_delete(fval);
+ if (body) ast_delete(body);
+ if (index) ast_delete(index);
+ if (root) ast_delete(root);
+ ast_delete(func);
+ ast_delete(fval);
return false;
}
* deal with arrays
*/
if (var->expression.vtype == TYPE_ARRAY) {
- char name[1024];
- snprintf(name, sizeof(name), "%s::SET", var->name);
+ char name[1024];
+ snprintf(name, sizeof(name), "%s##SET", var->name);
if (!parser_create_array_setter(parser, var, name))
goto cleanup;
- snprintf(name, sizeof(name), "%s::GET", var->name);
- if (!parser_create_array_getter(parser, var, name))
+ snprintf(name, sizeof(name), "%s##GET", var->name);
+ if (!parser_create_array_getter(parser, var, var->expression.next, name))
goto cleanup;
}
+ else if (!localblock && !nofields &&
+ var->expression.vtype == TYPE_FIELD &&
+ var->expression.next->expression.vtype == TYPE_ARRAY)
+ {
+ char name[1024];
+ ast_expression *telem;
+ ast_value *tfield;
+ ast_value *array = (ast_value*)var->expression.next;
+
+ if (!ast_istype(var->expression.next, ast_value)) {
+ parseerror(parser, "internal error: field element type must be an ast_value");
+ goto cleanup;
+ }
+
+ snprintf(name, sizeof(name), "%s##SETF", var->name);
+ if (!parser_create_array_field_setter(parser, array, name))
+ goto cleanup;
+
+ telem = ast_type_copy(ast_ctx(var), array->expression.next);
+ tfield = ast_value_new(ast_ctx(var), "<.type>", TYPE_FIELD);
+ tfield->expression.next = telem;
+ snprintf(name, sizeof(name), "%s##GETFP", var->name);
+ if (!parser_create_array_getter(parser, array, (ast_expression*)tfield, name)) {
+ ast_delete(tfield);
+ goto cleanup;
+ }
+ ast_delete(tfield);
+ }
skipvar:
if (parser->tok == ';') {
asvalue = (ast_value*)(parser->globals[i].var);
if (asvalue->setter) {
if (!ast_global_codegen(asvalue->setter, ir, false) ||
- !ast_function_codegen(asvalue->setter->constval.vfunc, ir))
+ !ast_function_codegen(asvalue->setter->constval.vfunc, ir) ||
+ !ir_function_finalize(asvalue->setter->constval.vfunc->ir_func))
{
printf("failed to generate setter for %s\n", parser->globals[i].name);
ir_builder_delete(ir);
}
if (asvalue->getter) {
if (!ast_global_codegen(asvalue->getter, ir, false) ||
- !ast_function_codegen(asvalue->getter->constval.vfunc, ir))
+ !ast_function_codegen(asvalue->getter->constval.vfunc, ir) ||
+ !ir_function_finalize(asvalue->getter->constval.vfunc->ir_func))
{
printf("failed to generate getter for %s\n", parser->globals[i].name);
ir_builder_delete(ir);
}
}
}
+ for (i = 0; i < parser->fields_count; ++i) {
+ ast_value *asvalue;
+ asvalue = (ast_value*)(parser->fields[i].var->expression.next);
+
+ if (!ast_istype((ast_expression*)asvalue, ast_value))
+ continue;
+ if (asvalue->expression.vtype != TYPE_ARRAY)
+ continue;
+ if (asvalue->setter) {
+ if (!ast_global_codegen(asvalue->setter, ir, false) ||
+ !ast_function_codegen(asvalue->setter->constval.vfunc, ir) ||
+ !ir_function_finalize(asvalue->setter->constval.vfunc->ir_func))
+ {
+ printf("failed to generate setter for %s\n", parser->fields[i].name);
+ ir_builder_delete(ir);
+ return false;
+ }
+ }
+ if (asvalue->getter) {
+ if (!ast_global_codegen(asvalue->getter, ir, false) ||
+ !ast_function_codegen(asvalue->getter->constval.vfunc, ir) ||
+ !ir_function_finalize(asvalue->getter->constval.vfunc->ir_func))
+ {
+ printf("failed to generate getter for %s\n", parser->fields[i].name);
+ ir_builder_delete(ir);
+ return false;
+ }
+ }
+ }
for (i = 0; i < parser->functions_count; ++i) {
if (!ast_function_codegen(parser->functions[i], ir)) {
printf("failed to generate function %s\n", parser->functions[i]->name);