static bool parser_leaveblock(parser_t *parser);
static void parser_addlocal(parser_t *parser, const char *name, ast_expression *e);
static bool parse_typedef(parser_t *parser);
-static bool parse_variable(parser_t *parser, ast_block *localblock, bool nofields, int qualifier, ast_value *cached_typedef, bool noref);
+static bool parse_variable(parser_t *parser, ast_block *localblock, bool nofields, int qualifier, ast_value *cached_typedef, bool noref, bool noreturn);
static ast_block* parse_block(parser_t *parser);
static bool parse_block_into(parser_t *parser, ast_block *block);
static bool parse_statement_or_block(parser_t *parser, ast_expression **out);
out = (ast_expression*)parser_const_float(parser,
(generated_op == INSTR_OR ? (ConstF(0) || ConstF(1)) : (ConstF(0) && ConstF(1))));
else
+ {
+ if (OPTS_FLAG(PERL_LOGIC) && !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));
+ parseerror(parser, "invalid types for logical operation with -fperl-logic: %s and %s", ty1, ty2);
+ return false;
+ }
out = (ast_expression*)ast_binary_new(ctx, generated_op, exprs[0], exprs[1]);
+ }
break;
case opid2('?',':'):
return false;
} else {
if (vec_size(fun->expression.params) != paramcount &&
- !(fun->expression.variadic &&
+ !((fun->expression.flags & AST_FLAG_VARIADIC) &&
vec_size(fun->expression.params) < paramcount))
{
ast_value *fval;
fval->name, ast_ctx(fun).file, (int)ast_ctx(fun).line);
else
parseerror(parser, "too %s parameters for function call: expected %i, got %i\n"
- " -> `%s` has been declared here: %s:%i",
- fewmany, fval->name, (int)vec_size(fun->expression.params), (int)paramcount,
- fval->name, ast_ctx(fun).file, (int)ast_ctx(fun).line);
+ " -> it has been declared here: %s:%i",
+ fewmany, (int)vec_size(fun->expression.params), (int)paramcount,
+ ast_ctx(fun).file, (int)ast_ctx(fun).line);
return false;
}
else
else
return !parsewarning(parser, WARN_TOO_FEW_PARAMETERS,
"too %s parameters for function call: expected %i, got %i\n"
- " -> `%s` has been declared here: %s:%i",
- fewmany, fval->name, (int)vec_size(fun->expression.params), (int)paramcount,
- fval->name, ast_ctx(fun).file, (int)ast_ctx(fun).line);
+ " -> it has been declared here: %s:%i",
+ fewmany, (int)vec_size(fun->expression.params), (int)paramcount,
+ ast_ctx(fun).file, (int)ast_ctx(fun).line);
}
}
}
vec_push(sy.ops, syparen(parser_ctx(parser), SY_PAREN_INDEX, 0));
wantop = false;
} else if (op->id == opid2('?',':')) {
- wantop = false;
vec_push(sy.ops, syop(parser_ctx(parser), op));
vec_push(sy.ops, syparen(parser_ctx(parser), SY_PAREN_TERNARY, 0));
wantop = false;
"current standard does not allow variable declarations in for-loop initializers"))
goto onerr;
}
- if (!parse_variable(parser, block, true, CV_VAR, typevar, false))
+ if (!parse_variable(parser, block, true, CV_VAR, typevar, false, false))
goto onerr;
}
else if (parser->tok != ';')
parseerror(parser, "return with invalid expression");
}
- ret = ast_return_new(exp->expression.node.context, exp);
+ ret = ast_return_new(ctx, exp);
if (!ret) {
ast_delete(exp);
return false;
/* returns true when it was a variable qualifier, false otherwise!
* on error, cvq is set to CV_WRONG
*/
-static bool parse_var_qualifiers(parser_t *parser, bool with_local, int *cvq, bool *noref)
+static bool parse_var_qualifiers(parser_t *parser, bool with_local, int *cvq, bool *noref, bool *noreturn)
{
bool had_const = false;
bool had_var = false;
bool had_noref = false;
+ bool had_noreturn = false;
for (;;) {
if (!strcmp(parser_tokval(parser), "const"))
had_var = true;
else if (!strcmp(parser_tokval(parser), "noref"))
had_noref = true;
- else if (!had_const && !had_var && !had_noref) {
+ else if (!strcmp(parser_tokval(parser), "noreturn"))
+ had_noreturn = true;
+ else if (!had_const && !had_var && !had_noref && !had_noreturn) {
return false;
}
else
*cvq = CV_VAR;
else
*cvq = CV_NONE;
- *noref = had_noref;
+ *noref = had_noref;
+ *noreturn = had_noreturn;
return true;
onerr:
parseerror(parser, "parse error after variable qualifier");
ast_switch_case swcase;
int cvq;
- bool noref;
+ bool noref, noreturn;
lex_ctx ctx = parser_ctx(parser);
if (parser->tok == TOKEN_IDENT)
typevar = parser_find_typedef(parser, parser_tokval(parser), 0);
if (typevar || parser->tok == TOKEN_TYPENAME) {
- if (!parse_variable(parser, block, false, CV_NONE, typevar, false)) {
+ if (!parse_variable(parser, block, false, CV_NONE, typevar, false, false)) {
ast_delete(switchnode);
return false;
}
continue;
}
- if (parse_var_qualifiers(parser, true, &cvq, &noref))
+ if (parse_var_qualifiers(parser, true, &cvq, &noref, &noreturn))
{
if (cvq == CV_WRONG) {
ast_delete(switchnode);
return false;
}
- if (!parse_variable(parser, block, false, cvq, NULL, noref)) {
+ if (!parse_variable(parser, block, false, cvq, NULL, noref, noreturn)) {
ast_delete(switchnode);
return false;
}
return false;
}
if (!OPTS_FLAG(RELAXED_SWITCH)) {
- opval = (ast_value*)swcase.value;
- if (!ast_istype(swcase.value, ast_value)) { /* || opval->cvq != CV_CONST) { */
+ if (!ast_istype(swcase.value, ast_value)) { /* || ((ast_value*)swcase.value)->cvq != CV_CONST) { */
parseerror(parser, "case on non-constant values need to be explicitly enabled via -frelaxed-switch");
ast_unref(operand);
return false;
static bool parse_statement(parser_t *parser, ast_block *block, ast_expression **out, bool allow_cases)
{
- bool noref;
+ bool noref, noreturn;
int cvq = CV_NONE;
ast_value *typevar = NULL;
if (parsewarning(parser, WARN_EXTENSIONS, "missing 'local' keyword when declaring a local variable"))
return false;
}
- if (!parse_variable(parser, block, false, CV_NONE, typevar, false))
+ if (!parse_variable(parser, block, false, CV_NONE, typevar, false, false))
return false;
return true;
}
- else if (parse_var_qualifiers(parser, !!block, &cvq, &noref))
+ else if (parse_var_qualifiers(parser, !!block, &cvq, &noref, &noreturn))
{
if (cvq == CV_WRONG)
return false;
- return parse_variable(parser, block, true, cvq, NULL, noref);
+ return parse_variable(parser, block, true, cvq, NULL, noref, noreturn);
}
else if (parser->tok == TOKEN_KEYWORD)
{
return false;
}
- if (var->expression.variadic) {
+ if (var->expression.flags & AST_FLAG_VARIADIC) {
if (parsewarning(parser, WARN_VARIADIC_FUNCTION,
"variadic function with implementation will not be able to access additional parameters"))
{
/* now turn 'var' into a function type */
fval = ast_value_new(ctx, "<type()>", TYPE_FUNCTION);
fval->expression.next = (ast_expression*)var;
- fval->expression.variadic = variadic;
+ if (variadic)
+ fval->expression.flags |= AST_FLAG_VARIADIC;
var = fval;
var->expression.params = params;
return true;
}
-static bool parse_variable(parser_t *parser, ast_block *localblock, bool nofields, int qualifier, ast_value *cached_typedef, bool noref)
+static bool parse_variable(parser_t *parser, ast_block *localblock, bool nofields, int qualifier, ast_value *cached_typedef, bool noref, bool noreturn)
{
ast_value *var;
ast_value *proto;
/* in a noref section we simply bump the usecount */
if (noref || parser->noref)
var->uses++;
+ if (noreturn)
+ var->expression.flags |= AST_FLAG_NORETURN;
/* Part 1:
* check for validity: (end_sys_..., multiple-definitions, prototypes, ...)
static bool parser_global_statement(parser_t *parser)
{
- int cvq = CV_WRONG;
- bool noref = false;
- ast_value *istype = NULL;
+ int cvq = CV_WRONG;
+ bool noref = false;
+ bool noreturn = false;
+ ast_value *istype = NULL;
if (parser->tok == TOKEN_IDENT)
istype = parser_find_typedef(parser, parser_tokval(parser), 0);
if (istype || parser->tok == TOKEN_TYPENAME || parser->tok == '.')
{
- return parse_variable(parser, NULL, false, CV_NONE, istype, false);
+ return parse_variable(parser, NULL, false, CV_NONE, istype, false, false);
}
- else if (parse_var_qualifiers(parser, false, &cvq, &noref))
+ else if (parse_var_qualifiers(parser, false, &cvq, &noref, &noreturn))
{
if (cvq == CV_WRONG)
return false;
- return parse_variable(parser, NULL, true, cvq, NULL, noref);
+ return parse_variable(parser, NULL, true, cvq, NULL, noref, noreturn);
}
else if (parser->tok == TOKEN_KEYWORD)
{
projects / xonotic / gmqcc.git / blobdiff