typedef declaration_t* (*parsed_declaration_func) (declaration_t *declaration, bool is_definition);
+/** The current token. */
static token_t token;
+/** The lookahead ring-buffer. */
static token_t lookahead_buffer[MAX_LOOKAHEAD];
+/** Position of the next token in the lookahead buffer. */
static int lookahead_bufpos;
static stack_entry_t *environment_stack = NULL;
static stack_entry_t *label_stack = NULL;
static goto_statement_t *goto_last = NULL;
static label_statement_t *label_first = NULL;
static label_statement_t *label_last = NULL;
+/** current translation unit. */
static translation_unit_t *unit = NULL;
+/** true if we are in a type property context (evaluation only for type. */
+static bool in_type_prop = false;
+/** true in we are in a __extension__ context. */
+static bool in_gcc_extension = false;
static struct obstack temp_obst;
+
#define PUSH_PARENT(stmt) \
statement_t *const prev_parent = current_parent; \
current_parent = (stmt);
/** The current source position. */
#define HERE (&token.source_position)
+/** true if we are in GCC mode. */
+#define GNU_MODE ((c_mode & _GNUC) || in_gcc_extension)
+
static type_t *type_valist;
static statement_t *parse_compound_statement(bool inside_expression_statement);
next_token();
}
-/**
- * eat all token until a ';' is reached or a stop token is found.
- */
-static void eat_statement(void)
-{
- eat_until_matching_token(';');
- if (token.type == ';')
- next_token();
-}
-
#define eat(token_type) do { assert(token.type == token_type); next_token(); } while (0)
/**
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;
}
expression_t *expression = NULL;
-restart:
- switch(token.type) {
- case T___extension__:
- /* This can be a prefix to a typename or an expression. We simply eat
- * it now. */
- do {
- next_token();
- } while (token.type == T___extension__);
- goto restart;
+ bool old_type_prop = in_type_prop;
+ bool old_gcc_extension = in_gcc_extension;
+ in_type_prop = true;
+ while (token.type == T___extension__) {
+ /* This can be a prefix to a typename or an expression. */
+ next_token();
+ in_gcc_extension = true;
+ }
+ switch (token.type) {
case T_IDENTIFIER:
if (is_typedef_symbol(token.v.symbol)) {
type = parse_typename();
type = expression->base.type;
break;
}
+ in_type_prop = old_type_prop;
+ in_gcc_extension = old_gcc_extension;
rem_anchor_token(')');
expect(')');
return false;
}
unsigned v = (unsigned)intvalue;
- for(unsigned i = 1; i <= 8192; i += i) {
+ for (unsigned i = 1; i <= 8192; i += i) {
if (i == v)
return true;
}
} else if (symbol == sym_property) {
next_token();
expect('(');
- for(;;) {
+ for (;;) {
bool is_get = false;
if (token.type != T_IDENTIFIER)
goto end_error;
static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
{
- type_t *type = NULL;
- type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE;
- type_modifiers_t modifiers = TYPE_MODIFIER_NONE;
- unsigned type_specifiers = 0;
- bool newtype = false;
- bool saw_error = false;
+ type_t *type = NULL;
+ type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE;
+ type_modifiers_t modifiers = TYPE_MODIFIER_NONE;
+ unsigned type_specifiers = 0;
+ bool newtype = false;
+ bool saw_error = false;
+ bool old_gcc_extension = in_gcc_extension;
specifiers->source_position = token.source_position;
if (specifiers->modifiers & DM_TRANSPARENT_UNION)
modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION;
- switch(token.type) {
+ switch (token.type) {
/* storage class */
#define MATCH_STORAGE_CLASS(token, class) \
MATCH_TYPE_QUALIFIER(T___sptr, TYPE_QUALIFIER_SPTR);
case T___extension__:
- /* TODO */
next_token();
+ in_gcc_extension = true;
break;
/* type specifiers */
}
finish_specifiers:
+ in_gcc_extension = old_gcc_extension;
+
if (type == NULL || (saw_error && type_specifiers != 0)) {
atomic_type_kind_t atomic_type;
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;
}
rem_anchor_token(']');
expect(']');
- return (construct_type_t*) array;
end_error:
- return NULL;
+ return (construct_type_t*) array;
}
static construct_type_t *parse_function_declarator(declaration_t *declaration)
if (may_be_abstract)
break;
parse_error_expected("while parsing declarator", T_IDENTIFIER, '(', NULL);
- /* avoid a loop in the outermost scope, because eat_statement doesn't
- * eat '}' */
- if (token.type == '}' && current_function == NULL) {
- next_token();
- } else {
- eat_statement();
- }
+ eat_until_anchor();
return NULL;
}
function_type->function.return_type = type;
type_t *skipped_return_type = skip_typeref(type);
+ /* §6.7.5.3(1) */
if (is_type_function(skipped_return_type)) {
errorf(HERE, "function returning function is not allowed");
- type = type_error_type;
} else if (is_type_array(skipped_return_type)) {
errorf(HERE, "function returning array is not allowed");
- type = type_error_type;
} else {
- type = function_type;
+ if (skipped_return_type->base.qualifiers != 0) {
+ warningf(HERE,
+ "type qualifiers in return type of function type are meaningless");
+ }
}
+
+ type = function_type;
break;
}
}
type_t *skipped_type = skip_typeref(type);
- if (is_type_atomic(skipped_type, ATOMIC_TYPE_VOID)) {
- errorf(HERE, "array of void is not allowed");
- type = type_error_type;
- } else {
- type = array_type;
+ /* §6.7.5.2(1) */
+ if (is_type_incomplete(skipped_type)) {
+ errorf(HERE, "array of incomplete type '%T' is not allowed", type);
+ } else if (is_type_function(skipped_type)) {
+ errorf(HERE, "array of functions is not allowed");
}
+ type = array_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);
previous_declaration == NULL) {
warningf(&declaration->source_position,
"function declaration '%#T' is not a prototype",
- orig_type, declaration->symbol);
+ orig_type, symbol);
}
if (warning.main && is_type_function(type) && is_sym_main(symbol)) {
static bool is_declaration_specifier(const token_t *token,
bool only_specifiers_qualifiers)
{
- switch(token->type) {
+ switch (token->type) {
TYPE_SPECIFIERS
TYPE_QUALIFIERS
return true;
{
eat(';');
- declaration_t *const declaration = allocate_declaration_zero();
- declaration->type = specifiers->type;
- declaration->declared_storage_class = specifiers->declared_storage_class;
- declaration->source_position = specifiers->source_position;
- declaration->modifiers = specifiers->modifiers;
-
- if (declaration->declared_storage_class != STORAGE_CLASS_NONE) {
- warningf(&declaration->source_position,
+ if (specifiers->declared_storage_class != STORAGE_CLASS_NONE) {
+ warningf(&specifiers->source_position,
"useless storage class in empty declaration");
}
- declaration->storage_class = STORAGE_CLASS_NONE;
- type_t *type = declaration->type;
+ type_t *type = specifiers->type;
switch (type->kind) {
case TYPE_COMPOUND_STRUCT:
case TYPE_COMPOUND_UNION: {
if (type->compound.declaration->symbol == NULL) {
- warningf(&declaration->source_position,
+ warningf(&specifiers->source_position,
"unnamed struct/union that defines no instances");
}
break;
break;
default:
- warningf(&declaration->source_position, "empty declaration");
+ warningf(&specifiers->source_position, "empty declaration");
break;
}
+#ifdef RECORD_EMPTY_DECLARATIONS
+ declaration_t *const declaration = allocate_declaration_zero();
+ declaration->type = specifiers->type;
+ declaration->declared_storage_class = specifiers->declared_storage_class;
+ declaration->source_position = specifiers->source_position;
+ declaration->modifiers = specifiers->modifiers;
+ declaration->storage_class = STORAGE_CLASS_NONE;
+
append_declaration(declaration);
+#endif
}
static void parse_declaration_rest(declaration_t *ndeclaration,
parsed_declaration_func finished_declaration)
{
add_anchor_token(';');
- add_anchor_token('=');
add_anchor_token(',');
while(true) {
declaration_t *declaration =
break;
eat(',');
+ add_anchor_token('=');
ndeclaration = parse_declarator(specifiers, /*may_be_abstract=*/false);
+ rem_anchor_token('=');
}
expect(';');
end_error:
rem_anchor_token(';');
- rem_anchor_token('=');
rem_anchor_token(',');
}
{
declaration_specifiers_t specifiers;
memset(&specifiers, 0, sizeof(specifiers));
+
+ add_anchor_token(';');
parse_declaration_specifiers(&specifiers);
+ rem_anchor_token(';');
if (token.type == ';') {
parse_anonymous_declaration_rest(&specifiers);
cnst->conste.v.character = token.v.string;
if (cnst->conste.v.character.size != 1) {
- if (warning.multichar && (c_mode & _GNUC)) {
- /* TODO */
+ if (warning.multichar && GNU_MODE) {
warningf(HERE, "multi-character character constant");
} else {
errorf(HERE, "more than 1 characters in character constant");
cnst->conste.v.wide_character = token.v.wide_string;
if (cnst->conste.v.wide_character.size != 1) {
- if (warning.multichar && (c_mode & _GNUC)) {
- /* TODO */
+ if (warning.multichar && GNU_MODE) {
warningf(HERE, "multi-character character constant");
} else {
errorf(HERE, "more than 1 characters in character constant");
declaration->symbol, &declaration->source_position);
}
}
- if (warning.init_self && declaration == current_init_decl) {
+ if (warning.init_self && declaration == current_init_decl && !in_type_prop) {
current_init_decl = NULL;
warningf(HERE, "variable '%#T' is initialized by itself",
declaration->type, declaration->symbol);
case T___builtin_prefetch: return parse_builtin_prefetch();
case T__assume: return parse_assume();
case T_ANDAND:
- if (c_mode & _GNUC)
+ if (GNU_MODE)
return parse_label_address();
break;
source_position_t const pos,
unsigned const precedence)
{
- expression_t *tp_expression = allocate_expression_zero(kind);
+ expression_t *tp_expression = allocate_expression_zero(kind);
tp_expression->base.type = type_size_t;
tp_expression->base.source_position = pos;
char const* const what = kind == EXPR_SIZEOF ? "sizeof" : "alignof";
+ /* we only refer to a type property, mark this case */
+ bool old = in_type_prop;
+ in_type_prop = true;
if (token.type == '(' && is_declaration_specifier(look_ahead(1), true)) {
next_token();
add_anchor_token(')');
}
end_error:
+ in_type_prop = old;
return tp_expression;
}
expression_t *true_expression = expression;
bool gnu_cond = false;
- if ((c_mode & _GNUC) && token.type == ':') {
+ if (GNU_MODE && token.type == ':') {
gnu_cond = true;
} else
true_expression = parse_expression();
{
eat(T___extension__);
- /* TODO enable extensions */
+ bool old_gcc_extension = in_gcc_extension;
+ in_gcc_extension = true;
expression_t *expression = parse_sub_expression(precedence);
- /* TODO disable extensions */
+ in_gcc_extension = old_gcc_extension;
return expression;
}
points_to = skip_typeref(points_to);
if (is_type_incomplete(points_to)) {
- if (!(c_mode & _GNUC) || !is_type_atomic(points_to, ATOMIC_TYPE_VOID)) {
+ if (!GNU_MODE || !is_type_atomic(points_to, ATOMIC_TYPE_VOID)) {
errorf(source_position,
"arithmetic with pointer to incomplete type '%T' not allowed",
orig_pointer_type);
orig_pointer_type);
}
} else if (is_type_function(points_to)) {
- if (!(c_mode && _GNUC)) {
+ if (!GNU_MODE) {
errorf(source_position,
"arithmetic with pointer to function type '%T' not allowed",
orig_pointer_type);
statement->case_label.last_case = val;
}
- if (c_mode & _GNUC) {
+ if (GNU_MODE) {
if (token.type == T_DOTDOTDOT) {
next_token();
expression_t *const end_range = parse_expression();
eat(T_goto);
statement_t *statement;
- if (c_mode & _GNUC && token.type == '*') {
+ if (GNU_MODE && token.type == '*') {
next_token();
expression_t *expression = parse_expression();
statement->gotos.expression = expression;
} else {
if (token.type != T_IDENTIFIER) {
- if (c_mode & _GNUC)
+ if (GNU_MODE)
parse_error_expected("while parsing goto", T_IDENTIFIER, '*', NULL);
else
parse_error_expected("while parsing goto", T_IDENTIFIER, NULL);
- eat_statement();
+ eat_until_anchor();
goto end_error;
}
symbol_t *symbol = token.v.symbol;
statement->base.source_position = token.source_position;
declaration_t *before = last_declaration;
- parse_declaration(record_declaration);
+ if (GNU_MODE)
+ parse_external_declaration();
+ else
+ parse_declaration(record_declaration);
if (before == NULL) {
statement->declaration.declarations_begin = scope->declarations;
do {
next_token();
} while (token.type == T___extension__);
+ bool old_gcc_extension = in_gcc_extension;
+ in_gcc_extension = true;
statement = parse_statement();
+ in_gcc_extension = false;
break;
DECLARATION_START
for (;;) {
#ifndef NDEBUG
bool anchor_leak = false;
- for (token_type_t i = 0; i != T_LAST_TOKEN; ++i) {
+ for (int 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 (in_gcc_extension) {
+ errorf(HERE, "Leaked __extension__");
+ anchor_leak = true;
+ }
+
if (anchor_leak)
- exit(1);
+ abort();
#endif
switch (token.type) {
projects / cparser / blobdiff