# 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;
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));
+ DEBUGSHUNTDO(con_out("apply %s\n", op->op));
if (sy->out_count < op->operands) {
parseerror(parser, "internal error: not enough operands: %i (operator %s (%i))", sy->out_count,
break;
case opid1('['):
- if (exprs[0]->expression.vtype != TYPE_ARRAY) {
+ 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;
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\n"
+ " -> this is an extension from -std=gmqcc");
+ }
+ }
break;
case opid1(','):
return false;
}
if (opts_standard == COMPILER_GMQCC)
- printf("TODO: early out logic\n");
+ con_out("TODO: early out logic\n");
if (CanConstFold(exprs[0], exprs[1]))
out = (ast_expression*)parser_const_float(parser,
(generated_op == INSTR_OR ? (ConstF(0) || ConstF(1)) : (ConstF(0) && ConstF(1))));
return false;
}
- DEBUGSHUNTDO(printf("applied %s\n", op->op));
+ DEBUGSHUNTDO(con_out("applied %s\n", op->op));
sy->out[sy->out_count++] = syexp(ctx, out);
return true;
}
parseerror(parser, "out of memory");
goto onerr;
}
- DEBUGSHUNTDO(printf("push %s\n", parser_tokval(parser)));
+ DEBUGSHUNTDO(con_out("push %s\n", parser_tokval(parser)));
}
else if (parser->tok == TOKEN_FLOATCONST) {
ast_value *val;
parseerror(parser, "out of memory");
goto onerr;
}
- DEBUGSHUNTDO(printf("push %g\n", parser_token(parser)->constval.f));
+ DEBUGSHUNTDO(con_out("push %g\n", parser_token(parser)->constval.f));
}
else if (parser->tok == TOKEN_INTCONST) {
ast_value *val;
parseerror(parser, "out of memory");
goto onerr;
}
- DEBUGSHUNTDO(printf("push %i\n", parser_token(parser)->constval.i));
+ DEBUGSHUNTDO(con_out("push %i\n", parser_token(parser)->constval.i));
}
else if (parser->tok == TOKEN_STRINGCONST) {
ast_value *val;
parseerror(parser, "out of memory");
goto onerr;
}
- DEBUGSHUNTDO(printf("push string\n"));
+ DEBUGSHUNTDO(con_out("push string\n"));
}
else if (parser->tok == TOKEN_VECTORCONST) {
ast_value *val;
parseerror(parser, "out of memory");
goto onerr;
}
- DEBUGSHUNTDO(printf("push '%g %g %g'\n",
+ DEBUGSHUNTDO(con_out("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 == ')') {
if (wantop) {
- DEBUGSHUNTDO(printf("do[op] )\n"));
+ DEBUGSHUNTDO(con_out("do[op] )\n"));
--parens;
if (parens < 0)
break;
if (!parser_close_paren(parser, &sy, false))
goto onerr;
} else {
- DEBUGSHUNTDO(printf("do[nop] )\n"));
+ DEBUGSHUNTDO(con_out("do[nop] )\n"));
--parens;
if (parens < 0)
break;
if (op->id == opid1('(')) {
if (wantop) {
- DEBUGSHUNTDO(printf("push [op] (\n"));
+ DEBUGSHUNTDO(con_out("push [op] (\n"));
++parens;
/* we expected an operator, this is the function-call operator */
if (!shunt_ops_add(&sy, syparen(parser_ctx(parser), SY_PAREN_FUNC, sy.out_count-1))) {
parseerror(parser, "out of memory");
goto onerr;
}
- DEBUGSHUNTDO(printf("push [nop] (\n"));
+ DEBUGSHUNTDO(con_out("push [nop] (\n"));
}
wantop = false;
} else if (op->id == opid1('[')) {
goto onerr;
wantop = false;
} else {
- DEBUGSHUNTDO(printf("push operator %s\n", op->op));
+ DEBUGSHUNTDO(con_out("push operator %s\n", op->op));
if (!shunt_ops_add(&sy, syop(parser_ctx(parser), op)))
goto onerr;
wantop = false;
expr = sy.out[0].out;
MEM_VECTOR_CLEAR(&sy, out);
MEM_VECTOR_CLEAR(&sy, ops);
- DEBUGSHUNTDO(printf("shunt done\n"));
+ DEBUGSHUNTDO(con_out("shunt done\n"));
return expr;
onerr:
{
ast_ifthen *ifthen;
ast_expression *cond, *ontrue, *onfalse = NULL;
+ bool ifnot = false;
lex_ctx ctx = parser_ctx(parser);
- /* skip the 'if' and check for opening paren */
- if (!parser_next(parser) || parser->tok != '(') {
+ /* skip the 'if', parse an optional 'not' and check for an opening paren */
+ if (!parser_next(parser)) {
+ parseerror(parser, "expected condition or 'not'");
+ return false;
+ }
+ if (parser->tok == TOKEN_KEYWORD && !strcmp(parser_tokval(parser), "not")) {
+ ifnot = true;
+ if (!parser_next(parser)) {
+ parseerror(parser, "expected condition in parenthesis");
+ return false;
+ }
+ }
+ if (parser->tok != '(') {
parseerror(parser, "expected 'if' condition in parenthesis");
return false;
}
}
}
- ifthen = ast_ifthen_new(ctx, cond, ontrue, onfalse);
+ if (ifnot)
+ ifthen = ast_ifthen_new(ctx, cond, onfalse, ontrue);
+ else
+ ifthen = ast_ifthen_new(ctx, cond, ontrue, onfalse);
*out = (ast_expression*)ifthen;
return true;
}
ast_return *ret;
ast_entfield *entfield;
ast_array_index *subscript;
- int assignop = type_store_instr[value->expression.vtype];
+ int assignop = type_storep_instr[value->expression.vtype];
if (value->expression.vtype == TYPE_FIELD && value->expression.next->expression.vtype == TYPE_VECTOR)
- assignop = INSTR_STORE_V;
+ 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(ctx, (ast_expression*)entity, (ast_expression*)subscript);
+ entfield = ast_entfield_new_force(ctx,
+ (ast_expression*)entity,
+ (ast_expression*)subscript,
+ (ast_expression*)subscript);
if (!entfield) {
ast_delete(subscript);
return NULL;
return true;
}
-bool parser_compile(const char *filename)
+bool parser_compile()
{
- parser->lex = lex_open(filename);
- if (!parser->lex) {
- printf("failed to open file \"%s\"\n", filename);
- return false;
- }
-
/* initial lexer/parser state */
parser->lex->flags.noops = true;
return !parser->errors;
}
+bool parser_compile_file(const char *filename)
+{
+ parser->lex = lex_open(filename);
+ if (!parser->lex) {
+ con_out("failed to open file \"%s\"\n", filename);
+ return false;
+ }
+ return parser_compile();
+}
+
+bool parser_compile_string(const char *name, const char *str)
+{
+ parser->lex = lex_open_string(str, strlen(str), name);
+ if (!parser->lex) {
+ con_out("failed to create lexer for string \"%s\"\n", name);
+ return false;
+ }
+ return parser_compile();
+}
+
void parser_cleanup()
{
size_t i;
{
ir = ir_builder_new("gmqcc_out");
if (!ir) {
- printf("failed to allocate builder\n");
+ con_out("failed to allocate builder\n");
return false;
}
isconst = field->isconst;
field->isconst = false;
if (!ast_global_codegen((ast_value*)field, ir, true)) {
- printf("failed to generate field %s\n", field->name);
+ con_out("failed to generate field %s\n", field->name);
ir_builder_delete(ir);
return false;
}
}
}
if (!ast_global_codegen(asvalue, ir, false)) {
- printf("failed to generate global %s\n", parser->globals[i].name);
+ con_out("failed to generate global %s\n", parser->globals[i].name);
ir_builder_delete(ir);
return false;
}
}
for (i = 0; i < parser->imm_float_count; ++i) {
if (!ast_global_codegen(parser->imm_float[i], ir, false)) {
- printf("failed to generate global %s\n", parser->imm_float[i]->name);
+ con_out("failed to generate global %s\n", parser->imm_float[i]->name);
ir_builder_delete(ir);
return false;
}
}
for (i = 0; i < parser->imm_string_count; ++i) {
if (!ast_global_codegen(parser->imm_string[i], ir, false)) {
- printf("failed to generate global %s\n", parser->imm_string[i]->name);
+ con_out("failed to generate global %s\n", parser->imm_string[i]->name);
ir_builder_delete(ir);
return false;
}
}
for (i = 0; i < parser->imm_vector_count; ++i) {
if (!ast_global_codegen(parser->imm_vector[i], ir, false)) {
- printf("failed to generate global %s\n", parser->imm_vector[i]->name);
+ con_out("failed to generate global %s\n", parser->imm_vector[i]->name);
ir_builder_delete(ir);
return 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->globals[i].name);
+ printf("failed to generate setter for %s\n", parser->fields[i].name);
ir_builder_delete(ir);
return 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->globals[i].name);
+ 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);
+ con_out("failed to generate function %s\n", parser->functions[i]->name);
ir_builder_delete(ir);
return false;
}
if (!ir_function_finalize(parser->functions[i]->ir_func)) {
- printf("failed to finalize function %s\n", parser->functions[i]->name);
+ con_out("failed to finalize function %s\n", parser->functions[i]->name);
ir_builder_delete(ir);
return false;
}
if (retval) {
if (opts_dump)
- ir_builder_dump(ir, printf);
+ ir_builder_dump(ir, con_out);
generate_checksum(parser);
if (!ir_builder_generate(ir, output)) {
- printf("*** failed to generate output file\n");
+ con_out("*** failed to generate output file\n");
ir_builder_delete(ir);
return false;
}
return retval;
}
- printf("*** there were compile errors\n");
+ con_out("*** there were compile errors\n");
return false;
}