static void rem_anchor_token(int token_type)
{
assert(0 <= token_type && token_type < T_LAST_TOKEN);
+ assert(token_anchor_set[token_type] != 0);
--token_anchor_set[token_type];
}
* If not, generate an error, eat the current statement,
* and goto the end_error label.
*/
-#define expect(expected) \
- do { \
- if (UNLIKELY(token.type != (expected))) { \
- parse_error_expected(NULL, (expected), NULL); \
- add_anchor_token(expected); \
- eat_until_anchor(); \
- if (token.type == expected) \
- next_token(); \
- rem_anchor_token(expected); \
- goto end_error; \
- } \
- next_token(); \
+#define expect(expected) \
+ do { \
+ if (UNLIKELY(token.type != (expected))) { \
+ parse_error_expected(NULL, (expected), NULL); \
+ add_anchor_token(expected); \
+ eat_until_anchor(); \
+ if (token.type == expected) \
+ next_token(); \
+ rem_anchor_token(expected); \
+ goto end_error; \
+ } \
+ next_token(); \
} while (0)
static void set_scope(scope_t *new_scope)
add_anchor_token(',');
parse_constant_expression();
rem_anchor_token(',');
- rem_anchor_token('(');
+ rem_anchor_token(')');
expect(',');
add_anchor_token(')');
parse_constant_expression();
- rem_anchor_token('(');
+ rem_anchor_token(')');
expect(')');
return;
end_error:
if (type == NULL) {
/* we are already outside, ... */
+ if (is_type_compound(outer_type) &&
+ !outer_type->compound.declaration->init.complete) {
+ goto error_parse_next;
+ }
goto error_excess;
}
default:
/* invalid specifier combination, give an error message */
if (type_specifiers == 0) {
- if (saw_error) {
- specifiers->type = type_error_type;
- return;
- }
+ if (saw_error)
+ goto end_error;
if (!strict_mode) {
if (warning.implicit_int) {
} else {
errorf(HERE, "multiple datatypes in declaration");
}
- atomic_type = ATOMIC_TYPE_INVALID;
+ goto end_error;
}
- if (type_specifiers & SPECIFIER_COMPLEX &&
- atomic_type != ATOMIC_TYPE_INVALID) {
+ if (type_specifiers & SPECIFIER_COMPLEX) {
type = allocate_type_zero(TYPE_COMPLEX, &builtin_source_position);
type->complex.akind = atomic_type;
- } else if (type_specifiers & SPECIFIER_IMAGINARY &&
- atomic_type != ATOMIC_TYPE_INVALID) {
+ } else if (type_specifiers & SPECIFIER_IMAGINARY) {
type = allocate_type_zero(TYPE_IMAGINARY, &builtin_source_position);
type->imaginary.akind = atomic_type;
} else {
}
specifiers->type = result;
+ return;
+
end_error:
+ specifiers->type = type_error_type;
return;
}
errorf(HERE, "function returning array is not allowed");
type = type_error_type;
} else {
+ if (skipped_return_type->base.qualifiers != 0) {
+ warningf(HERE,
+ "type qualifiers in return type of function type are meaningless");
+ }
type = function_type;
}
break;
warningf(&decl->source_position,
"'main' is normally a non-static function");
}
- if (skip_typeref(func_type->return_type) != type_int) {
+ if (!types_compatible(skip_typeref(func_type->return_type), type_int)) {
warningf(&decl->source_position,
"return type of 'main' should be 'int', but is '%T'",
func_type->return_type);
add_anchor_token(',');
add_anchor_token('=');
- rem_anchor_token(';');
+ add_anchor_token(';');
/* declarator is common to both function-definitions and declarations */
declaration_t *ndeclaration = parse_declarator(&specifiers, /*may_be_abstract=*/false);
*/
static expression_t *parse_cast(void)
{
+ add_anchor_token(')');
+
source_position_t source_position = token.source_position;
type_t *type = parse_typename();
- /* matching add_anchor_token() is at call site */
rem_anchor_token(')');
expect(')');
*/
static expression_t *parse_statement_expression(void)
{
+ add_anchor_token(')');
+
expression_t *expression = allocate_expression_zero(EXPR_STATEMENT);
statement_t *statement = parse_compound_statement(true);
}
expression->base.type = type;
+ rem_anchor_token(')');
expect(')');
- return expression;
end_error:
- return create_invalid_expression();
+ return expression;
}
/**
static expression_t *parse_parenthesized_expression(void)
{
eat('(');
- add_anchor_token(')');
switch(token.type) {
case '{':
}
}
+ add_anchor_token(')');
expression_t *result = parse_expression();
rem_anchor_token(')');
expect(')');
- return result;
end_error:
- return create_invalid_expression();
+ return result;
}
static expression_t *parse_function_keyword(void)
expression_t *const expr = parse_assignment_expression();
if (expr->kind == EXPR_REFERENCE) {
declaration_t *const decl = expr->reference.declaration;
- if (decl == NULL)
- return create_invalid_expression();
- if (decl->parent_scope == ¤t_function->scope &&
- decl->next == NULL) {
- expression->va_starte.parameter = decl;
- expect(')');
- return expression;
+ if (decl->parent_scope != ¤t_function->scope || decl->next != NULL) {
+ errorf(&expr->base.source_position,
+ "second argument of 'va_start' must be last parameter of the current function");
}
+ expression->va_starte.parameter = decl;
+ expect(')');
+ return expression;
}
- errorf(&expr->base.source_position,
- "second argument of 'va_start' must be last parameter of the current function");
+ expect(')');
end_error:
return create_invalid_expression();
}
tp_expression->typeprop.tp_expression = expression;
}
- return tp_expression;
end_error:
- return create_invalid_expression();
+ return tp_expression;
}
static expression_t *parse_sizeof(unsigned precedence)
"function call has aggregate value");
}
- return result;
end_error:
- return create_invalid_expression();
+ return result;
}
static type_t *semantic_arithmetic(type_t *type_left, type_t *type_right);
case ';': statement = parse_empty_statement(); break;
case '{': statement = parse_compound_statement(false); break;
- case T___leave: statement = parse_leave_statement(); break;
+ case T___leave: statement = parse_leave_statement(); break;
case T___try: statement = parse_ms_try_statment(); break;
case T_asm: statement = parse_asm_statement(); break;
case T_break: statement = parse_break(); break;
case T_return: statement = parse_return(); break;
case T_switch: statement = parse_switch(); break;
case T_while: statement = parse_while(); break;
- default: statement = parse_expression_statement(); break;
+
+ case '!':
+ case '&':
+ case '(':
+ case '*':
+ case '+':
+ case '-':
+ case '~':
+ case T_ANDAND:
+ case T_CHARACTER_CONSTANT:
+ case T_FLOATINGPOINT:
+ case T_INTEGER:
+ case T_MINUSMINUS:
+ case T_PLUSPLUS:
+ case T_STRING_LITERAL:
+ case T_WIDE_CHARACTER_CONSTANT:
+ case T_WIDE_STRING_LITERAL:
+ case T___FUNCDNAME__:
+ case T___FUNCSIG__:
+ case T___FUNCTION__:
+ case T___PRETTY_FUNCTION__:
+ case T___builtin_alloca:
+ case T___builtin_classify_type:
+ case T___builtin_constant_p:
+ case T___builtin_expect:
+ case T___builtin_huge_val:
+ case T___builtin_isgreater:
+ case T___builtin_isgreaterequal:
+ case T___builtin_isless:
+ case T___builtin_islessequal:
+ case T___builtin_islessgreater:
+ case T___builtin_isunordered:
+ case T___builtin_nan:
+ case T___builtin_nand:
+ case T___builtin_nanf:
+ case T___builtin_offsetof:
+ case T___builtin_prefetch:
+ case T___builtin_va_arg:
+ case T___builtin_va_end:
+ case T___builtin_va_start:
+ case T___func__:
+ case T___noop:
+ case T__assume:
+ statement = parse_expression_statement();
+ break;
+
+ default:
+ errorf(HERE, "unexpected token %K while parsing statement", &token);
+ statement = create_invalid_statement();
+ if (!at_anchor())
+ next_token();
+ break;
}
rem_anchor_token(';');
*/
static void parse_translation_unit(void)
{
- for (;;) switch (token.type) {
- DECLARATION_START
- case T_IDENTIFIER:
- case T___extension__:
- parse_external_declaration();
- break;
+ for (;;) {
+#ifndef NDEBUG
+ bool anchor_leak = false;
+ for (token_type_t i = 0; i != T_LAST_TOKEN; ++i) {
+ unsigned char count = token_anchor_set[i];
+ if (count != 0) {
+ errorf(HERE, "Leaked anchor token %k %d times", i, count);
+ anchor_leak = true;
+ }
+ }
+ if (anchor_leak)
+ abort();
+#endif
- case T_asm:
- parse_global_asm();
- break;
+ switch (token.type) {
+ DECLARATION_START
+ case T_IDENTIFIER:
+ case T___extension__:
+ parse_external_declaration();
+ break;
- case T_EOF:
- return;
+ case T_asm:
+ parse_global_asm();
+ break;
- case ';':
- /* TODO error in strict mode */
- warningf(HERE, "stray ';' outside of function");
- next_token();
- break;
+ case T_EOF:
+ return;
- default:
- errorf(HERE, "stray %K outside of function", &token);
- if (token.type == '(' || token.type == '{' || token.type == '[')
- eat_until_matching_token(token.type);
- next_token();
- break;
+ case ';':
+ /* TODO error in strict mode */
+ warningf(HERE, "stray ';' outside of function");
+ next_token();
+ break;
+
+ default:
+ errorf(HERE, "stray %K outside of function", &token);
+ if (token.type == '(' || token.type == '{' || token.type == '[')
+ eat_until_matching_token(token.type);
+ next_token();
+ break;
+ }
}
}
projects / cparser / blobdiff