MEM_VECTOR_MAKE(ast_value*, globals);
MEM_VECTOR_MAKE(ast_function*, functions);
MEM_VECTOR_MAKE(ast_value*, imm_float);
+ MEM_VECTOR_MAKE(ast_value*, imm_string);
+ MEM_VECTOR_MAKE(ast_value*, imm_vector);
ast_function *function;
MEM_VECTOR_MAKE(ast_value*, locals);
size_t blocklocal;
+
+ size_t errors;
} parser_t;
MEM_VEC_FUNCTIONS(parser_t, ast_value*, globals)
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)
MEM_VEC_FUNCTIONS(parser_t, ast_value*, locals)
MEM_VEC_FUNCTIONS(parser_t, ast_function*, functions)
{
va_list ap;
+ parser->errors++;
+
if (parser)
printf("error %s:%lu: ", parser->lex->tok->ctx.file, (unsigned long)parser->lex->tok->ctx.line);
else
return out;
}
+ast_value* parser_const_string(parser_t *parser, const char *str)
+{
+ size_t i;
+ ast_value *out;
+ for (i = 0; i < parser->imm_string_count; ++i) {
+ if (!strcmp(parser->imm_string[i]->constval.vstring, str))
+ return parser->imm_string[i];
+ }
+ out = ast_value_new(parser_ctx(parser), "#IMMEDIATE", TYPE_STRING);
+ out->isconst = true;
+ out->constval.vstring = util_strdup(str);
+ if (!parser_t_imm_string_add(parser, out)) {
+ ast_value_delete(out);
+ return NULL;
+ }
+ return out;
+}
+
+ast_value* parser_const_vector(parser_t *parser, vector v)
+{
+ size_t i;
+ ast_value *out;
+ for (i = 0; i < parser->imm_vector_count; ++i) {
+ if (!memcmp(&parser->imm_vector[i]->constval.vvec, &v, sizeof(v)))
+ return parser->imm_vector[i];
+ }
+ out = ast_value_new(parser_ctx(parser), "#IMMEDIATE", TYPE_VECTOR);
+ out->isconst = true;
+ out->constval.vvec = v;
+ if (!parser_t_imm_vector_add(parser, out)) {
+ ast_value_delete(out);
+ return NULL;
+ }
+ return out;
+}
+
ast_value* parser_find_global(parser_t *parser, const char *name)
{
size_t i;
return parser->locals[i];
}
fun = parser->function->vtype;
- for (i = 0; i < fun->params_count; ++i) {
- if (!strcmp(fun->params[i]->name, name))
- return fun->params[i];
+ for (i = 0; i < fun->expression.params_count; ++i) {
+ if (!strcmp(fun->expression.params[i]->name, name))
+ return fun->expression.params[i];
}
return NULL;
}
var = ast_value_new(ctx, "<unnamed>", vtype);
if (!var)
goto on_error;
- MEM_VECTOR_MOVE(¶ms, p, var, params);
+ MEM_VECTOR_MOVE(¶ms, p, &var->expression, params);
return var;
on_error:
for (i = 0; i < params.p_count; ++i)
{
size_t etype; /* 0 = expression, others are operators */
int paren;
+ size_t off;
ast_expression *out;
- ast_value *value; /* need to know if we can assign */
ast_block *block; /* for commas and function calls */
lex_ctx ctx;
} sy_elem;
sy_elem e;
e.etype = 0;
e.out = v;
- e.value = NULL;
- e.block = NULL;
- e.ctx = ctx;
- e.paren = 0;
- return e;
-}
-static sy_elem syval(lex_ctx ctx, ast_value *v) {
- sy_elem e;
- e.etype = 0;
- e.out = (ast_expression*)v;
- e.value = v;
e.block = NULL;
e.ctx = ctx;
e.paren = 0;
sy_elem e;
e.etype = 0;
e.out = (ast_expression*)v;
- e.value = NULL;
e.block = v;
e.ctx = ctx;
e.paren = 0;
sy_elem e;
e.etype = 1 + (op - operators);
e.out = NULL;
- e.value = NULL;
e.block = NULL;
e.ctx = ctx;
e.paren = 0;
return e;
}
-static sy_elem syparen(lex_ctx ctx, int p) {
+static sy_elem syparen(lex_ctx ctx, int p, size_t off) {
sy_elem e;
e.etype = 0;
+ e.off = off;
e.out = NULL;
- e.value = NULL;
e.block = NULL;
e.ctx = ctx;
e.paren = p;
lex_ctx ctx;
ast_expression *out = NULL;
ast_expression *exprs[3];
- ast_value *vars[3];
ast_block *blocks[3];
size_t i;
sy->out_count -= op->operands;
for (i = 0; i < op->operands; ++i) {
exprs[i] = sy->out[sy->out_count+i].out;
- vars[i] = sy->out[sy->out_count+i].value;
blocks[i] = sy->out[sy->out_count+i].block;
}
case opid1('='):
- if (!vars[0]) {
- parseerror(parser, "Cannot assign to non-variable");
- return false;
- }
out = (ast_expression*)ast_store_new(ctx,
- type_store_instr[vars[0]->expression.vtype],
- vars[0], exprs[1]);
+ type_store_instr[exprs[0]->expression.vtype],
+ exprs[0], exprs[1]);
break;
}
return true;
}
-static bool parser_close_paren(parser_t *parser, shunt *sy)
+static bool parser_close_call(parser_t *parser, shunt *sy)
+{
+ /* was a function call */
+ ast_expression *fun;
+ ast_call *call;
+
+ size_t fid;
+ size_t paramcount;
+
+ sy->ops_count--;
+ fid = sy->ops[sy->ops_count].off;
+
+ /* out[fid] is the function
+ * everything above is parameters...
+ * 0 params = nothing
+ * 1 params = ast_expression
+ * more = ast_block
+ */
+
+ if (sy->out_count < 1 || sy->out_count <= fid) {
+ parseerror(parser, "internal error: function call needs function and parameter list...");
+ return false;
+ }
+
+ fun = sy->out[fid].out;
+
+ call = ast_call_new(sy->ops[sy->ops_count].ctx, fun);
+ if (!call) {
+ parseerror(parser, "out of memory");
+ return false;
+ }
+
+ if (fid+1 == sy->out_count) {
+ /* no arguments */
+ paramcount = 0;
+ } else if (fid+2 == sy->out_count) {
+ ast_block *params;
+ sy->out_count--;
+ params = sy->out[sy->out_count].block;
+ if (!params) {
+ /* 1 param */
+ paramcount = 1;
+ if (!ast_call_params_add(call, sy->out[sy->out_count].out)) {
+ ast_delete(sy->out[sy->out_count].out);
+ parseerror(parser, "out of memory");
+ return false;
+ }
+ } else {
+ paramcount = params->exprs_count;
+ MEM_VECTOR_MOVE(params, exprs, call, params);
+ ast_delete(params);
+ }
+ } else {
+ parseerror(parser, "invalid function call");
+ return false;
+ }
+
+ /* overwrite fid, the function, with a call */
+ sy->out[fid] = syexp(call->expression.node.context, (ast_expression*)call);
+
+ if (fun->expression.vtype != TYPE_FUNCTION) {
+ parseerror(parser, "not a function");
+ return false;
+ }
+
+ if (!fun->expression.next) {
+ parseerror(parser, "could not determine function return type");
+ return false;
+ } else {
+ if (fun->expression.params_count != paramcount) {
+ parseerror(parser, "expected %i parameters, got %i", (int)fun->expression.params_count, paramcount);
+ return false;
+ }
+ }
+
+ return true;
+}
+
+static bool parser_close_paren(parser_t *parser, shunt *sy, bool functions_only)
{
if (!sy->ops_count) {
parseerror(parser, "unmatched closing paren");
}
while (sy->ops_count) {
if (sy->ops[sy->ops_count-1].paren == 'f') {
- /* was a function call */
- ast_block *params;
- ast_expression *fun;
- ast_call *call;
- sy->ops_count--;
- if (sy->out_count < 2) {
- parseerror(parser, "internal error: function call needs function and parameter list...");
- return false;
- }
- sy->out_count -= 2;
- fun = sy->out[sy->out_count+0].out;
- params = sy->out[sy->out_count+1].block;
- if (!params) {
- parseerror(parser, "function call needs a parameter-list as 2nd operand");
+ if (!parser_close_call(parser, sy))
return false;
- }
- if (fun->expression.vtype != TYPE_FUNCTION) {
- parseerror(parser, "not a function");
- return false;
- }
- call = ast_call_new(sy->ops[sy->ops_count].ctx, fun);
- if (!call) {
- parseerror(parser, "out of memory");
- return false;
- }
- MEM_VECTOR_MOVE(params, exprs, call, params);
- ast_delete(params);
- sy->out[sy->out_count++] = syexp(call->expression.node.context, (ast_expression*)call);
break;
}
if (sy->ops[sy->ops_count-1].paren == 1) {
sy->ops_count--;
- break;
+ return !functions_only;
}
if (!parser_sy_pop(parser, sy))
return false;
parseerror(parser, "unexpected ident: %s", parser_tokval(parser));
goto onerr;
}
- if (!shunt_out_add(&sy, syval(parser_ctx(parser), var))) {
+ if (!shunt_out_add(&sy, syexp(parser_ctx(parser), (ast_expression*)var))) {
parseerror(parser, "out of memory");
goto onerr;
}
goto onerr;
}
}
+ else if (parser->tok == TOKEN_STRINGCONST) {
+ ast_value *val = parser_const_string(parser, parser_tokval(parser));
+ if (!val)
+ return false;
+ if (!shunt_out_add(&sy, syexp(parser_ctx(parser), (ast_expression*)val))) {
+ parseerror(parser, "out of memory");
+ goto onerr;
+ }
+ }
+ else if (parser->tok == TOKEN_VECTORCONST) {
+ ast_value *val = parser_const_vector(parser, parser_token(parser)->constval.v);
+ if (!val)
+ return false;
+ if (!shunt_out_add(&sy, syexp(parser_ctx(parser), (ast_expression*)val))) {
+ parseerror(parser, "out of memory");
+ goto onerr;
+ }
+ }
else if (parser->tok == '(') {
nextwant = false; /* not expecting an operator next */
- if (!shunt_ops_add(&sy, syparen(parser_ctx(parser), 1))) {
+ if (!shunt_ops_add(&sy, syparen(parser_ctx(parser), 1, 0))) {
parseerror(parser, "out of memory");
goto onerr;
}
}
+ else if (parser->tok == ')') {
+ /* allowed for function calls */
+ if (!parser_close_paren(parser, &sy, true))
+ goto onerr;
+ }
else {
/* TODO: prefix operators */
parseerror(parser, "expected statement");
} else {
if (parser->tok == '(') {
/* we expected an operator, this is the function-call operator */
- ast_block *empty;
- if (!shunt_ops_add(&sy, syparen(parser_ctx(parser), 'f'))) {
- parseerror(parser, "out of memory");
- goto onerr;
- }
- empty = ast_block_new(parser_ctx(parser));
- if (!empty) {
- parseerror(parser, "out of memory");
- goto onerr;
- }
- if (!shunt_out_add(&sy, syblock(parser_ctx(parser), empty))) {
- ast_block_delete(empty);
+ if (!shunt_ops_add(&sy, syparen(parser_ctx(parser), 'f', sy.out_count-1))) {
parseerror(parser, "out of memory");
goto onerr;
}
else if (parser->tok == ')') {
/* we do expect an operator next */
/* closing an opening paren */
- if (!parser_close_paren(parser, &sy))
+ if (!parser_close_paren(parser, &sy, false))
goto onerr;
}
else if (parser->tok != TOKEN_OPERATOR) {
{
if (!strcmp(parser_tokval(parser), "return"))
{
- ast_expression *exp;
- ast_return *ret;
+ ast_expression *exp = NULL;
+ ast_return *ret = NULL;
+ ast_value *expected = parser->function->vtype;
if (!parser_next(parser)) {
parseerror(parser, "expected return expression");
return false;
}
- exp = parser_expression(parser);
- if (!exp)
- return false;
- ret = ast_return_new(exp->expression.node.context, exp);
- if (!ret) {
- ast_delete(exp);
- return false;
- }
- if (!ast_block_exprs_add(block, (ast_expression*)ret)) {
- ast_delete(ret);
- return false;
+ if (parser->tok != ';') {
+ exp = parser_expression(parser);
+ if (!exp)
+ return false;
+
+ if (exp->expression.vtype != expected->expression.next->expression.vtype) {
+ parseerror(parser, "return with invalid expression");
+ }
+
+ ret = ast_return_new(exp->expression.node.context, exp);
+ if (!ret) {
+ ast_delete(exp);
+ return false;
+ }
+
+ if (!ast_block_exprs_add(block, (ast_expression*)ret)) {
+ ast_delete(ret);
+ return false;
+ }
+ } else if (!parser_next(parser)) {
+ parseerror(parser, "expected semicolon");
+ if (expected->expression.next->expression.vtype != TYPE_VOID) {
+ parseerror(parser, "return without value");
+ }
}
return true;
}
}
fval->expression.next = (ast_expression*)var;
- MEM_VECTOR_MOVE(var, params, fval, params);
+ MEM_VECTOR_MOVE(&var->expression, params, &fval->expression, params);
if (!parser_t_functions_add(parser, func)) {
ast_value_delete(var);
return true;
}
-bool parser_compile(const char *filename)
+bool parser_compile(const char *filename, const char *datfile)
{
size_t i;
parser_t *parser;
lex_close(parser->lex);
- ir = ir_builder_new("gmqcc_out");
- if (!ir) {
- printf("failed to allocate builder\n");
- goto cleanup;
- }
+ if (!parser->errors)
+ {
+ ir = ir_builder_new("gmqcc_out");
+ if (!ir) {
+ printf("failed to allocate builder\n");
+ goto cleanup;
+ }
- for (i = 0; i < parser->imm_float_count; ++i) {
- if (!ast_global_codegen(parser->imm_float[i], ir)) {
- printf("failed to generate global %s\n", parser->imm_float[i]->name);
+ for (i = 0; i < parser->imm_float_count; ++i) {
+ if (!ast_global_codegen(parser->imm_float[i], ir)) {
+ printf("failed to generate global %s\n", parser->imm_float[i]->name);
+ }
}
- }
- for (i = 0; i < parser->globals_count; ++i) {
- if (!ast_global_codegen(parser->globals[i], ir)) {
- printf("failed to generate global %s\n", parser->globals[i]->name);
+ for (i = 0; i < parser->imm_string_count; ++i) {
+ if (!ast_global_codegen(parser->imm_string[i], ir)) {
+ printf("failed to generate global %s\n", parser->imm_string[i]->name);
+ }
}
- }
- 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);
+ for (i = 0; i < parser->imm_vector_count; ++i) {
+ if (!ast_global_codegen(parser->imm_vector[i], ir)) {
+ printf("failed to generate global %s\n", parser->imm_vector[i]->name);
+ }
}
- if (!ir_function_finalize(parser->functions[i]->ir_func)) {
- printf("failed to finalize function %s\n", parser->functions[i]->name);
+ for (i = 0; i < parser->globals_count; ++i) {
+ if (!ast_global_codegen(parser->globals[i], ir)) {
+ printf("failed to generate global %s\n", parser->globals[i]->name);
+ }
}
- }
+ 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);
+ }
+ if (!ir_function_finalize(parser->functions[i]->ir_func)) {
+ printf("failed to finalize function %s\n", parser->functions[i]->name);
+ }
+ }
+
+ ir_builder_dump(ir, printf);
- ir_builder_dump(ir, printf);
+ if (!ir_builder_generate(ir, datfile))
+ printf("*** failed to generate output file\n");
+
+ ir_builder_delete(ir);
+ } else {
+ printf("*** there were compile errors\n");
+ }
cleanup:
+ for (i = 0; i < parser->functions_count; ++i) {
+ ast_delete(parser->functions[i]);
+ }
+ for (i = 0; i < parser->imm_vector_count; ++i) {
+ ast_delete(parser->imm_vector[i]);
+ }
+ for (i = 0; i < parser->imm_string_count; ++i) {
+ ast_delete(parser->imm_string[i]);
+ }
+ for (i = 0; i < parser->imm_float_count; ++i) {
+ ast_delete(parser->imm_float[i]);
+ }
for (i = 0; i < parser->globals_count; ++i) {
- ast_value_delete(parser->globals[i]);
+ ast_delete(parser->globals[i]);
}
MEM_VECTOR_CLEAR(parser, globals);
projects / xonotic / gmqcc.git / blobdiff