ast_function *function;
+ /* All the labels the function defined...
+ * Should they be in ast_function instead?
+ */
+ ast_label **labels;
+ ast_goto **gotos;
+
/* A list of hashtables for each scope */
ht *variables;
ht htfields;
ast_expression *exprs[3];
ast_block *blocks[3];
ast_value *asvalue[3];
+ ast_binstore *asbinstore;
size_t i, assignop, addop, subop;
qcint generated_op = 0;
vec_push(sy->out, syblock(ctx, blocks[0]));
return true;
+ case opid2('+','P'):
+ out = exprs[0];
+ break;
case opid2('-','P'):
switch (exprs[0]->expression.vtype) {
case TYPE_FLOAT:
if (exprs[1]->expression.vtype != exprs[2]->expression.vtype) {
ast_type_to_string(exprs[1], ty1, sizeof(ty1));
ast_type_to_string(exprs[2], ty2, sizeof(ty2));
- parseerror(parser, "iperands of ternary expression must have the same type, got %s and %s", ty1, ty2);
+ parseerror(parser, "operands of ternary expression must have the same type, got %s and %s", ty1, ty2);
return false;
}
if (CanConstFold1(exprs[0]))
if (!ast_compare_type(field->expression.next, exprs[1])) {
ast_type_to_string(field->expression.next, ty1, sizeof(ty1));
ast_type_to_string(exprs[1], ty2, sizeof(ty2));
- if (opts_standard == COMPILER_QCC &&
+ if (OPTS_FLAG(ASSIGN_FUNCTION_TYPES) &&
field->expression.next->expression.vtype == TYPE_FUNCTION &&
exprs[1]->expression.vtype == TYPE_FUNCTION)
{
else if (!ast_compare_type(exprs[0], exprs[1])) {
ast_type_to_string(exprs[0], ty1, sizeof(ty1));
ast_type_to_string(exprs[1], ty2, sizeof(ty2));
- if (opts_standard == COMPILER_QCC &&
+ if (OPTS_FLAG(ASSIGN_FUNCTION_TYPES) &&
exprs[0]->expression.vtype == TYPE_FUNCTION &&
exprs[1]->expression.vtype == TYPE_FUNCTION)
{
if (ast_istype(exprs[0], ast_value) && asvalue[0]->constant) {
parseerror(parser, "assignment to constant `%s`", asvalue[0]->name);
}
- out = (ast_expression*)ast_binstore_new(ctx, assignop, INSTR_SUB_F, exprs[0], out);
+ asbinstore = ast_binstore_new(ctx, assignop, INSTR_SUB_F, exprs[0], out);
+ asbinstore->keep_dest = true;
+ out = (ast_expression*)asbinstore;
break;
}
#undef NotSameType
vec_push(sy.out, syexp(parser_ctx(parser), (ast_expression*)val));
DEBUGSHUNTDO(con_out("push %g\n", parser_token(parser)->constval.f));
}
- else if (parser->tok == TOKEN_INTCONST) {
+ else if (parser->tok == TOKEN_INTCONST || parser->tok == TOKEN_CHARCONST) {
ast_value *val;
if (wantop) {
parseerror(parser, "expected operator or end of statement, got constant");
lex_ctx ctx = parser_ctx(parser);
(void)block; /* not touching */
+ (void)opval;
/* parse over the opening paren */
if (!parser_next(parser) || parser->tok != '(') {
}
if (!OPTS_FLAG(RELAXED_SWITCH)) {
opval = (ast_value*)swcase.value;
- if (!ast_istype(swcase.value, ast_value) || !opval->constant) {
+ if (!ast_istype(swcase.value, ast_value)) { /* || !opval->constant) { */
parseerror(parser, "case on non-constant values need to be explicitly enabled via -frelaxed-switch");
ast_unref(operand);
return false;
return true;
}
+static bool parse_goto(parser_t *parser, ast_expression **out)
+{
+ size_t i;
+ ast_goto *gt;
+
+ if (!parser_next(parser) || parser->tok != TOKEN_IDENT) {
+ parseerror(parser, "expected label name after `goto`");
+ return false;
+ }
+
+ gt = ast_goto_new(parser_ctx(parser), parser_tokval(parser));
+
+ for (i = 0; i < vec_size(parser->labels); ++i) {
+ if (!strcmp(parser->labels[i]->name, parser_tokval(parser))) {
+ ast_goto_set_label(gt, parser->labels[i]);
+ break;
+ }
+ }
+ if (i == vec_size(parser->labels))
+ vec_push(parser->gotos, gt);
+
+ if (!parser_next(parser) || parser->tok != ';') {
+ parseerror(parser, "semicolon expected after goto label");
+ return false;
+ }
+ if (!parser_next(parser)) {
+ parseerror(parser, "parse error after goto");
+ return false;
+ }
+
+ *out = (ast_expression*)gt;
+ return true;
+}
+
static bool parse_statement(parser_t *parser, ast_block *block, ast_expression **out, bool allow_cases)
{
+ int cvq;
ast_value *typevar = NULL;
*out = NULL;
*out = NULL;
return true;
}
+ else if (parser->tok == TOKEN_IDENT && !strcmp(parser_tokval(parser), "var"))
+ {
+ goto ident_var;
+ }
else if (parser->tok == TOKEN_KEYWORD)
{
if (!strcmp(parser_tokval(parser), "local") ||
- !strcmp(parser_tokval(parser), "const"))
+ !strcmp(parser_tokval(parser), "const") ||
+ !strcmp(parser_tokval(parser), "var"))
{
- int cvq = parser_tokval(parser)[0] == 'c' ? CV_CONST : CV_VAR;
+ident_var:
+ if (parser_tokval(parser)[0] == 'c')
+ cvq = CV_CONST;
+ else if (parser_tokval(parser)[0] == 'v')
+ cvq = CV_VAR;
+ else
+ cvq = CV_NONE;
if (!block) {
parseerror(parser, "cannot declare a local variable here");
*out = NULL;
return true;
}
+ else if (!strcmp(parser_tokval(parser), "__builtin_debug_printtype"))
+ {
+ char ty[1024];
+ ast_value *tdef;
+
+ if (!parser_next(parser)) {
+ parseerror(parser, "parse error after __builtin_debug_printtype");
+ return false;
+ }
+
+ if (parser->tok == TOKEN_IDENT && (tdef = parser_find_typedef(parser, parser_tokval(parser), 0)))
+ {
+ ast_type_to_string((ast_expression*)tdef, ty, sizeof(ty));
+ con_out("__builtin_debug_printtype: `%s`=`%s`\n", tdef->name, ty);
+ if (!parser_next(parser)) {
+ parseerror(parser, "parse error after __builtin_debug_printtype typename argument");
+ return false;
+ }
+ }
+ else
+ {
+ if (!parse_statement(parser, block, out, allow_cases))
+ return false;
+ if (!*out)
+ con_out("__builtin_debug_printtype: got no output node\n");
+ else
+ {
+ ast_type_to_string(*out, ty, sizeof(ty));
+ con_out("__builtin_debug_printtype: `%s`\n", ty);
+ }
+ }
+ return true;
+ }
else if (!strcmp(parser_tokval(parser), "return"))
{
return parse_return(parser, block, out);
}
return true;
}
+ else if (!strcmp(parser_tokval(parser), "goto"))
+ {
+ return parse_goto(parser, out);
+ }
else if (!strcmp(parser_tokval(parser), "typedef"))
{
if (!parser_next(parser)) {
}
else if (parser->tok == ':')
{
+ size_t i;
ast_label *label;
if (!parser_next(parser)) {
parseerror(parser, "expected label name");
label = ast_label_new(parser_ctx(parser), parser_tokval(parser));
if (!label)
return false;
+ vec_push(parser->labels, label);
*out = (ast_expression*)label;
if (!parser_next(parser)) {
parseerror(parser, "parse error after label");
return false;
}
+ for (i = 0; i < vec_size(parser->gotos); ++i) {
+ if (!strcmp(parser->gotos[i]->name, label->name)) {
+ ast_goto_set_label(parser->gotos[i], label);
+ vec_remove(parser->gotos, i, 1);
+ --i;
+ }
+ }
return true;
}
else if (parser->tok == ';')
has_frame_think = false;
old = parser->function;
+ if (vec_size(parser->gotos) || vec_size(parser->labels)) {
+ parseerror(parser, "gotos/labels leaking");
+ return false;
+ }
+
if (var->expression.variadic) {
if (parsewarning(parser, WARN_VARIADIC_FUNCTION,
"variadic function with implementation will not be able to access additional parameters"))
return NULL;
}
}
-
- if (parser->tok == TOKEN_IDENT)
- cached_typedef = parser_find_typedef(parser, parser_tokval(parser), 0);
- if (!cached_typedef && parser->tok != TOKEN_TYPENAME) {
- parseerror(parser, "expected typename");
- return NULL;
- }
+ }
+ if (parser->tok == TOKEN_IDENT)
+ cached_typedef = parser_find_typedef(parser, parser_tokval(parser), 0);
+ if (!cached_typedef && parser->tok != TOKEN_TYPENAME) {
+ parseerror(parser, "expected typename");
+ return NULL;
}
/* generate the basic type value */
retval = false;
goto cleanup;
}
+ proto = (ast_value*)old;
+ if (!ast_istype(old, ast_value)) {
+ parseerror(parser, "internal error: not an ast_value");
+ retval = false;
+ proto = NULL;
+ goto cleanup;
+ }
+ ast_delete(var);
+ var = proto;
}
}
if (opts_standard == COMPILER_QCC &&
}
else if (parser->tok == '{' || parser->tok == '[')
{
+ size_t i;
if (localblock) {
parseerror(parser, "cannot declare functions within functions");
break;
if (!parse_function_body(parser, var))
break;
ast_delete(basetype);
+ for (i = 0; i < vec_size(parser->gotos); ++i)
+ parseerror(parser, "undefined label: `%s`", parser->gotos[i]->name);
+ vec_free(parser->gotos);
+ vec_free(parser->labels);
return true;
} else {
ast_expression *cexp;
vec_free(parser->typedefs);
vec_free(parser->_blocktypedefs);
+ vec_free(parser->labels);
+ vec_free(parser->gotos);
+
mem_d(parser);
}
projects / xonotic / gmqcc.git / blobdiff