ast_value* parser_find_local(parser_t *parser, const char *name, size_t upto)
{
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];
}
+ fun = parser->function->vtype;
+ for (i = 0; i < fun->params_count; ++i) {
+ if (!strcmp(fun->params[i]->name, name))
+ return fun->params[i];
+ }
return NULL;
}
lex_ctx ctx = parser_ctx(parser);
int vtype = basetype;
int temptype;
+ size_t i;
MEM_VECTOR_INIT(¶ms, p);
ast_value *param;
bool dummy;
- if (!parser_next(parser)) {
- MEM_VECTOR_CLEAR(¶ms, p);
- return NULL;
- }
+ if (!parser_next(parser))
+ goto on_error;
if (parser->tok == ')')
break;
temptype = parser_token(parser)->constval.t;
- if (!parser_next(parser)) {
- MEM_VECTOR_CLEAR(¶ms, p);
- return NULL;
- }
+ if (!parser_next(parser))
+ goto on_error;
+
param = parser_parse_type(parser, temptype, &dummy);
(void)dummy;
- if (!param) {
- MEM_VECTOR_CLEAR(¶ms, p);
- return NULL;
+ if (!param)
+ goto on_error;
+
+ if (parser->tok == TOKEN_IDENT) {
+ /* named parameter */
+ if (!ast_value_set_name(param, parser_tokval(parser)))
+ goto on_error;
+ if (!parser_next(parser))
+ goto on_error;
}
if (!paramlist_t_p_add(¶ms, param)) {
- MEM_VECTOR_CLEAR(¶ms, p);
parseerror(parser, "Out of memory while parsing typename");
- return NULL;
+ goto on_error;
}
if (parser->tok == ',')
continue;
if (parser->tok == ')')
break;
- MEM_VECTOR_CLEAR(¶ms, p);
parseerror(parser, "Unexpected token");
- return NULL;
- }
- if (!parser_next(parser)) {
- MEM_VECTOR_CLEAR(¶ms, p);
- return NULL;
+ goto on_error;
}
+ if (!parser_next(parser))
+ goto on_error;
}
var = ast_value_new(ctx, "<unnamed>", vtype);
- if (!var) {
- MEM_VECTOR_CLEAR(¶ms, p);
- return NULL;
- }
+ if (!var)
+ goto on_error;
MEM_VECTOR_MOVE(¶ms, p, var, params);
return var;
+on_error:
+ for (i = 0; i < params.p_count; ++i)
+ ast_value_delete(params.p[i]);
+ MEM_VECTOR_CLEAR(¶ms, p);
+ return NULL;
}
typedef struct
{
size_t etype; /* 0 = expression, others are operators */
- ast_expression* out;
+ int paren;
+ ast_expression *out;
+ ast_value *value; /* need to know if we can assign */
+ lex_ctx ctx;
} sy_elem;
typedef struct
{
MEM_VECTOR_MAKE(sy_elem, out);
MEM_VECTOR_MAKE(sy_elem, ops);
-} shynt;
-MEM_VEC_FUNCTIONS(shynt, sy_elem, out)
-MEM_VEC_FUNCTIONS(shynt, sy_elem, ops)
+} shunt;
+MEM_VEC_FUNCTIONS(shunt, sy_elem, out)
+MEM_VEC_FUNCTIONS(shunt, sy_elem, ops)
-static sy_elem syexp(ast_expression *v) {
+static sy_elem syexp(lex_ctx ctx, ast_expression *v) {
sy_elem e;
e.etype = 0;
- e.out = v;
+ e.out = v;
+ e.value = 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.ctx = ctx;
+ e.paren = 0;
return e;
}
-static sy_elem syval(ast_value *v) { return syexp((ast_expression*)v); }
-static sy_elem syop(const oper_info *op) {
+static sy_elem syop(lex_ctx ctx, const oper_info *op) {
sy_elem e;
e.etype = 1 + (op - operators);
- e.out = NULL;
+ e.out = NULL;
+ e.value = NULL;
+ e.ctx = ctx;
+ e.paren = 0;
+ return e;
+}
+
+static sy_elem syparen(lex_ctx ctx, int p) {
+ sy_elem e;
+ e.etype = 0;
+ e.out = NULL;
+ e.value = NULL;
+ e.ctx = ctx;
+ e.paren = p;
return e;
}
-static bool parser_sy_pop(parser_t *parser, shynt *sy)
+static bool parser_sy_pop(parser_t *parser, shunt *sy)
{
+ const oper_info *op;
+ lex_ctx ctx;
+ ast_expression *out = NULL;
+ ast_expression *exprs[3];
+ ast_value *vars[3];
+ size_t i;
+
if (!sy->ops_count) {
parseerror(parser, "internal error: missing operator");
return false;
}
+
+ if (sy->ops[sy->ops_count-1].paren) {
+ parseerror(parser, "unmatched parenthesis");
+ return false;
+ }
+
+ op = &operators[sy->ops[sy->ops_count-1].etype - 1];
+ ctx = sy->ops[sy->ops_count-1].ctx;
+
+ if (sy->out_count < op->operands) {
+ parseerror(parser, "internal error: not enough operands: %i", sy->out_count);
+ return false;
+ }
+
+ sy->ops_count--;
+
+ 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;
+ }
+
+ printf("Applying operator %s\n", op->op);
+ switch (op->id)
+ {
+ default:
+ parseerror(parser, "internal error: unhandled operand");
+ return false;
+
+ case opid1('+'):
+ 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;
+ }
+ 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, "Cannot add type %s and %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",
+ type_name[exprs[1]->expression.vtype],
+ type_name[exprs[0]->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]);
+ break;
+ case TYPE_VECTOR:
+ out = (ast_expression*)ast_binary_new(ctx, INSTR_SUB_V, exprs[0], exprs[1]);
+ break;
+ default:
+ parseerror(parser, "Cannot add type %s from %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_VECTOR &&
+ exprs[0]->expression.vtype != TYPE_FLOAT &&
+ exprs[1]->expression.vtype != TYPE_VECTOR &&
+ exprs[1]->expression.vtype != TYPE_FLOAT)
+ {
+ parseerror(parser, "Cannot multiply type %s from %s",
+ type_name[exprs[1]->expression.vtype],
+ type_name[exprs[0]->expression.vtype]);
+ return false;
+ }
+ switch (exprs[0]->expression.vtype) {
+ case TYPE_FLOAT:
+ if (exprs[1]->expression.vtype == TYPE_VECTOR)
+ out = (ast_expression*)ast_binary_new(ctx, INSTR_MUL_FV, exprs[0], exprs[1]);
+ else
+ out = (ast_expression*)ast_binary_new(ctx, INSTR_MUL_F, exprs[0], exprs[1]);
+ break;
+ case TYPE_VECTOR:
+ if (exprs[1]->expression.vtype == TYPE_FLOAT)
+ out = (ast_expression*)ast_binary_new(ctx, INSTR_MUL_VF, exprs[0], exprs[1]);
+ else
+ out = (ast_expression*)ast_binary_new(ctx, INSTR_MUL_V, exprs[0], exprs[1]);
+ break;
+ default:
+ parseerror(parser, "Cannot add type %s from %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",
+ 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('='):
+ 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]);
+ break;
+ }
+
+ if (!out) {
+ parseerror(parser, "failed to apply operand %s", op->op);
+ return false;
+ }
+
+ sy->out[sy->out_count++] = syexp(ctx, out);
return true;
}
static ast_expression* parser_expression(parser_t *parser)
{
ast_expression *expr = NULL;
- shynt sy;
+ shunt sy;
bool wantop = false;
MEM_VECTOR_INIT(&sy, out);
{
if (!wantop)
{
+ bool nextwant = true;
if (parser->tok == TOKEN_IDENT)
{
/* variable */
parseerror(parser, "unexpected ident: %s", parser_tokval(parser));
goto onerr;
}
- if (!shynt_out_add(&sy, syval(var))) {
+ if (!shunt_out_add(&sy, syval(parser_ctx(parser), var))) {
parseerror(parser, "out of memory");
goto onerr;
}
- } else if (parser->tok == TOKEN_FLOATCONST) {
+ printf("Added: %s\n", var->name);
+ }
+ else if (parser->tok == TOKEN_FLOATCONST) {
ast_value *val = parser_const_float(parser, (parser_token(parser)->constval.f));
if (!val)
return false;
- if (!shynt_out_add(&sy, syval(val))) {
+ if (!shunt_out_add(&sy, syexp(parser_ctx(parser), (ast_expression*)val))) {
parseerror(parser, "out of memory");
goto onerr;
}
- } else if (parser->tok == TOKEN_INTCONST) {
+ }
+ else if (parser->tok == TOKEN_INTCONST) {
ast_value *val = parser_const_float(parser, (double)(parser_token(parser)->constval.i));
if (!val)
return false;
- if (!shynt_out_add(&sy, syval(val))) {
+ if (!shunt_out_add(&sy, syexp(parser_ctx(parser), (ast_expression*)val))) {
+ parseerror(parser, "out of memory");
+ goto onerr;
+ }
+ printf("Added: %i\n", parser_token(parser)->constval.i);
+ }
+ else if (parser->tok == '(') {
+ nextwant = false; /* not expecting an operator next */
+ if (!shunt_ops_add(&sy, syparen(parser_ctx(parser), 1))) {
parseerror(parser, "out of memory");
goto onerr;
}
- } else {
+ }
+ else {
/* TODO: prefix operators */
parseerror(parser, "expected statement");
goto onerr;
}
- wantop = true;
- parser->lex->flags.noops = false;
- if (!parser_next(parser)) {
- goto onerr;
- }
+ wantop = nextwant;
+ parser->lex->flags.noops = !wantop;
} else {
- if (parser->tok != TOKEN_OPERATOR) {
+ if (parser->tok == ')') {
+ /* we do expect an operator next */
+ /* closing an opening paren */
+ printf("Applying closing paren\n");
+ if (!sy.ops_count) {
+ parseerror(parser, "unmatched closing paren");
+ goto onerr;
+ }
+ if (sy.ops[sy.ops_count-1].paren == 1) {
+ parseerror(parser, "empty parenthesis expression");
+ goto onerr;
+ }
+ while (sy.ops_count) {
+ if (sy.ops[sy.ops_count-1].paren == 1) {
+ sy.ops_count--;
+ break;
+ }
+ if (!parser_sy_pop(parser, &sy))
+ goto onerr;
+ }
+ }
+ else if (parser->tok != TOKEN_OPERATOR) {
parseerror(parser, "expected operator or end of statement");
goto onerr;
- } else {
+ }
+ else {
/* classify the operator */
/* TODO: suffix operators */
const oper_info *op;
/* found an operator */
op = &operators[o];
- if (sy.ops_count)
+ if (sy.ops_count && !sy.ops[sy.ops_count-1].paren)
olast = &operators[sy.ops[sy.ops_count-1].etype-1];
while (olast && (
{
if (!parser_sy_pop(parser, &sy))
goto onerr;
- olast = sy.ops_count ? (&operators[sy.ops[sy.ops_count-1].etype-1]) : NULL;
+ if (sy.ops_count && !sy.ops[sy.ops_count-1].paren)
+ olast = &operators[sy.ops[sy.ops_count-1].etype-1];
}
- if (!shynt_ops_add(&sy, syop(op)))
+ if (!shunt_ops_add(&sy, syop(parser_ctx(parser), op)))
goto onerr;
+ printf("Added op %s\n", op->op);
}
wantop = false;
parser->lex->flags.noops = true;
- if (!parser_next(parser)) {
- goto onerr;
- }
+ }
+ if (!parser_next(parser)) {
+ goto onerr;
+ }
+ if (parser->tok == ';') {
+ printf("End of statement\n");
+ break;
}
}
+ if (!parser_next(parser)) {
+ parseerror(parser, "Unexpected end of file");
+ goto onerr;
+ }
while (sy.ops_count) {
if (!parser_sy_pop(parser, &sy))
return NULL;
}
-static bool parser_variable(parser_t *parser, bool global);
+static bool parser_variable(parser_t *parser, ast_block *localblock);
static bool parser_body_do(parser_t *parser, ast_block *block)
{
if (parser->tok == TOKEN_TYPENAME)
{
/* local variable */
- if (!parser_variable(parser, false))
+ if (!parser_variable(parser, block))
return false;
return true;
}
+ else if (parser->tok == TOKEN_KEYWORD)
+ {
+ if (!strcmp(parser_tokval(parser), "return"))
+ {
+ ast_expression *exp;
+ ast_return *ret;
+
+ 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;
+ }
+ return true;
+ }
+ parseerror(parser, "Unexpected keyword");
+ return false;
+ }
else if (parser->tok == '{')
{
/* a block */
- parseerror(parser, "TODO: inner blocks");
+ parseerror(parser, "TODO: inner blocks: %s", parser_tokval(parser));
return false;
}
else
ast_expression *exp = parser_expression(parser);
if (!exp)
return false;
- if (!ast_block_exprs_add(block, exp))
+ if (!ast_block_exprs_add(block, exp)) {
+ ast_delete(exp);
return false;
+ }
return true;
}
}
return block;
}
-static bool parser_variable(parser_t *parser, bool global)
+static bool parser_variable(parser_t *parser, ast_block *localblock)
{
bool isfunc = false;
ast_function *func = NULL;
return false;
}
- if (global && parser_find_global(parser, parser_tokval(parser))) {
+ 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 (!global && parser_find_local(parser, parser_tokval(parser), parser->blocklocal)) {
+ 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;
var = fval;
}
- if ( ( global && !parser_t_globals_add(parser, var)) ||
- (!global && !parser_t_locals_add(parser, var)) )
+ if ( (!localblock && !parser_t_globals_add(parser, var)) ||
+ ( localblock && !parser_t_locals_add(parser, var)) )
+ {
+ ast_value_delete(var);
+ return false;
+ }
+ if (localblock && !ast_block_locals_add(localblock, var))
{
+ parser->locals_count--;
ast_value_delete(var);
return false;
}
return false;
if (parser->tok == '#') {
- if (!global) {
+ if (localblock) {
parseerror(parser, "cannot declare builtins within functions");
return false;
}
ast_block *block;
ast_function *old = parser->function;
- if (!global) {
+ if (localblock) {
parseerror(parser, "cannot declare functions within functions");
return false;
}
{
if (parser->tok == TOKEN_TYPENAME)
{
- return parser_variable(parser, true);
+ return parser_variable(parser, NULL);
}
else if (parser->tok == TOKEN_KEYWORD)
{
projects / xonotic / gmqcc.git / blobdiff