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 stack_entry_t *local_label_stack = NULL;
-static scope_t *global_scope = NULL;
+/** The global file scope. */
+static scope_t *file_scope = NULL;
+/** The current scope. */
static scope_t *scope = NULL;
static declaration_t *last_declaration = NULL;
+/** Point to the current function declaration if inside a function. */
static declaration_t *current_function = NULL;
static declaration_t *current_init_decl = NULL;
static switch_statement_t *current_switch = 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);
static source_position_t null_position = { NULL, 0 };
+/** special symbol used for anonymous entities. */
+static const symbol_t *sym_anonymous = NULL;
+
/* symbols for Microsoft extended-decl-modifier */
static const symbol_t *sym_align = NULL;
static const symbol_t *sym_allocate = NULL;
/** 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);
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];
}
*/
static void eat_until_anchor(void)
{
- if (token.type == T_EOF)
- return;
while (token_anchor_set[token.type] == 0) {
if (token.type == '(' || token.type == '{' || token.type == '[')
eat_until_matching_token(token.type);
- if (token.type == T_EOF)
- break;
next_token();
}
}
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 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)
+static void scope_push(scope_t *new_scope)
{
if (scope != NULL) {
scope->last_declaration = last_declaration;
+ new_scope->depth = scope->depth + 1;
}
- scope = new_scope;
+ new_scope->parent = scope;
+ scope = new_scope;
last_declaration = new_scope->last_declaration;
}
+static void scope_pop(void)
+{
+ scope->last_declaration = last_declaration;
+ scope = scope->parent;
+ last_declaration = scope->last_declaration;
+}
+
/**
* Search a symbol in a given namespace and returns its declaration or
* NULL if this symbol was not found.
namespace_t namespc = (namespace_t) declaration->namespc;
/* replace/add declaration into declaration list of the symbol */
- declaration_t *iter = symbol->declaration;
- if (iter == NULL) {
- symbol->declaration = declaration;
- } else {
- declaration_t *iter_last = NULL;
- for( ; iter != NULL; iter_last = iter, iter = iter->symbol_next) {
- /* replace an entry? */
- if (iter->namespc == namespc) {
- if (iter_last == NULL) {
- symbol->declaration = declaration;
- } else {
- iter_last->symbol_next = declaration;
- }
- declaration->symbol_next = iter->symbol_next;
- break;
- }
- }
- if (iter == NULL) {
- assert(iter_last->symbol_next == NULL);
- iter_last->symbol_next = declaration;
+ declaration_t **anchor;
+ declaration_t *iter;
+ for (anchor = &symbol->declaration;; anchor = &iter->symbol_next) {
+ iter = *anchor;
+ if (iter == NULL)
+ break;
+
+ /* replace an entry? */
+ if (iter->namespc == namespc) {
+ declaration->symbol_next = iter->symbol_next;
+ break;
}
}
+ *anchor = declaration;
/* remember old declaration */
stack_entry_t entry;
namespace_t namespc = (namespace_t)entry->namespc;
/* replace/remove declaration */
- declaration_t *declaration = symbol->declaration;
- assert(declaration != NULL);
- if (declaration->namespc == namespc) {
- if (old_declaration == NULL) {
- symbol->declaration = declaration->symbol_next;
- } else {
- symbol->declaration = old_declaration;
- }
- } else {
- declaration_t *iter_last = declaration;
- declaration_t *iter = declaration->symbol_next;
- for( ; iter != NULL; iter_last = iter, iter = iter->symbol_next) {
- /* replace an entry? */
- if (iter->namespc == namespc) {
- assert(iter_last != NULL);
- iter_last->symbol_next = old_declaration;
- if (old_declaration != NULL) {
- old_declaration->symbol_next = iter->symbol_next;
- }
- break;
- }
- }
+ declaration_t **anchor;
+ declaration_t *iter;
+ for (anchor = &symbol->declaration;; anchor = &iter->symbol_next) {
+ iter = *anchor;
assert(iter != NULL);
+ /* replace an entry? */
+ if (iter->namespc == namespc)
+ break;
}
+
+ /* Because of scopes and appending other namespaces to the end of
+ * the list, this must hold. */
+ assert((old_declaration != NULL ? old_declaration->symbol_next : NULL) == iter->symbol_next);
+ *anchor = old_declaration;
}
ARR_SHRINKLEN(*stack_ptr, (int) new_top);
case ASSIGN_WARNING_POINTER_FROM_INT:
warningf(source_position,
- "%s makes integer '%T' from pointer '%T' without a cast",
+ "%s makes pointer '%T' from integer '%T' without a cast",
context, orig_type_left, orig_type_right);
return;
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:
type_t *orig_top_type = path->top_type;
type_t *top_type = skip_typeref(orig_top_type);
- assert(is_type_compound(top_type) || is_type_array(top_type));
-
type_path_entry_t *top = append_to_type_path(path);
top->type = top_type;
} else {
path->top_type = NULL;
}
- } else {
- assert(is_type_array(top_type));
-
+ } else if (is_type_array(top_type)) {
top->v.index = 0;
path->top_type = top_type->array.element_type;
+ } else {
+ assert(!is_type_valid(top_type));
}
}
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;
decl->source_position = *HERE;
decl->declared_storage_class = storage_class;
decl->storage_class =
- storage_class != STORAGE_CLASS_NONE || scope == global_scope ?
+ storage_class != STORAGE_CLASS_NONE || scope == file_scope ?
storage_class : STORAGE_CLASS_AUTO;
decl->symbol = symbol;
decl->implicit = true;
if (! struct_decl->init.complete)
return;
- il_size_t size = 0;
- il_size_t new_size;
- il_alignment_t alignment = 1;
- bool need_pad = false;
+ il_size_t size = 0;
+ il_size_t offset;
+ il_alignment_t alignment = 1;
+ bool need_pad = false;
declaration_t *entry = struct_decl->scope.declarations;
for (; entry != NULL; entry = entry->next) {
if (entry->namespc != NAMESPACE_NORMAL)
continue;
- type_t *m_type = skip_typeref(entry->type);
- il_alignment_t m_alignment = m_type->base.alignment;
-
- new_size = (size + m_alignment - 1) & -m_alignment;
+ type_t *m_type = skip_typeref(entry->type);
+ if (! is_type_valid(m_type)) {
+ /* simply ignore errors here */
+ continue;
+ }
+ il_alignment_t m_alignment = m_type->base.alignment;
if (m_alignment > alignment)
alignment = m_alignment;
- if (new_size > size)
+
+ offset = (size + m_alignment - 1) & -m_alignment;
+
+ if (offset > size)
need_pad = true;
- entry->offset = new_size;
- size = new_size + m_type->base.size;
+ entry->offset = offset;
+ size = offset + m_type->base.size;
}
if (type->base.alignment != 0) {
alignment = type->base.alignment;
}
- new_size = (size + alignment - 1) & -alignment;
- if (new_size > size)
+ offset = (size + alignment - 1) & -alignment;
+ if (offset > size)
need_pad = true;
if (warning.padded && need_pad) {
type, struct_decl->symbol);
}
- type->base.size = new_size;
+ type->base.size = offset;
type->base.alignment = alignment;
}
continue;
type_t *m_type = skip_typeref(entry->type);
+ if (! is_type_valid(m_type))
+ continue;
entry->offset = 0;
if (m_type->base.size > size)
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 */
type->compound.declaration = parse_compound_type_specifier(false);
if (type->compound.declaration->modifiers & DM_TRANSPARENT_UNION)
modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION;
- break;
finish_union_type(&type->compound);
+ break;
}
case T_enum:
type = parse_enum_specifier();
}
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;
}
}
}
-static declaration_t *parse_identifier_list(void)
+/**
+ * Parses an K&R identifier list and return a list of declarations.
+ *
+ * @param last points to the last declaration in the list
+ * @return the list of declarations
+ */
+static declaration_t *parse_identifier_list(declaration_t **last)
{
declaration_t *declarations = NULL;
declaration_t *last_declaration = NULL;
next_token();
} while (token.type == T_IDENTIFIER);
+ *last = last_declaration;
return declarations;
}
return declaration;
}
-static declaration_t *parse_parameters(function_type_t *type)
+/**
+ * Parses a function type parameter list and return a list of declarations.
+ *
+ * @param last point to the last element of the list
+ * @return the parameter list
+ */
+static declaration_t *parse_parameters(function_type_t *type, declaration_t **last)
{
declaration_t *declarations = NULL;
token_type_t la1_type = (token_type_t)look_ahead(1)->type;
if (la1_type == ',' || la1_type == ')') {
type->kr_style_parameters = true;
- declarations = parse_identifier_list();
+ declarations = parse_identifier_list(last);
goto parameters_finished;
}
}
expect(')');
restore_anchor_state(',', saved_comma_state);
+ *last = last_declaration;
return declarations;
end_error:
restore_anchor_state(',', saved_comma_state);
+ *last = NULL;
return NULL;
}
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)
type = allocate_type_zero(TYPE_FUNCTION, HERE);
}
- declaration_t *parameters = parse_parameters(&type->function);
+ declaration_t *last;
+ declaration_t *parameters = parse_parameters(&type->function, &last);
if (declaration != NULL) {
- declaration->scope.declarations = parameters;
+ declaration->scope.declarations = parameters;
+ declaration->scope.last_declaration = last;
+ declaration->scope.is_parameter = true;
}
construct_function_type_t *construct_function_type =
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;
}
}
declaration->is_inline = specifiers->is_inline;
declaration->storage_class = specifiers->declared_storage_class;
- if (declaration->storage_class == STORAGE_CLASS_NONE
- && scope != global_scope) {
+ if (declaration->storage_class == STORAGE_CLASS_NONE &&
+ scope != file_scope) {
declaration->storage_class = STORAGE_CLASS_AUTO;
}
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)) {
if (warning.nested_externs &&
declaration->storage_class == STORAGE_CLASS_EXTERN &&
- scope != global_scope) {
+ scope != file_scope) {
warningf(&declaration->source_position,
"nested extern declaration of '%#T'", declaration->type, symbol);
}
assert(declaration != previous_declaration);
- if (previous_declaration != NULL
- && previous_declaration->parent_scope == scope) {
+ if (previous_declaration != NULL &&
+ previous_declaration->parent_scope->is_parameter &&
+ scope->depth == previous_declaration->parent_scope->depth + 1) {
+ errorf(&declaration->source_position,
+ "declaration '%#T' redeclares the parameter '%#T' (declared %P)",
+ orig_type, symbol, previous_declaration->type, symbol,
+ &previous_declaration->source_position);
+ goto finish;
+ }
+ if (previous_declaration != NULL &&
+ previous_declaration->parent_scope == scope) {
/* can happen for K&R style declarations */
if (previous_declaration->type == NULL) {
previous_declaration->type = declaration->type;
}
} else {
if (warning.missing_declarations &&
- scope == global_scope && (
+ scope == file_scope && (
declaration->storage_class == STORAGE_CLASS_NONE ||
declaration->storage_class == STORAGE_CLASS_THREAD
)) {
"no previous declaration for '%#T'", orig_type, symbol);
}
}
-
+finish:
assert(declaration->parent_scope == NULL);
assert(scope != NULL);
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;
}
bool must_be_constant = false;
- if (declaration->storage_class == STORAGE_CLASS_STATIC
- || declaration->storage_class == STORAGE_CLASS_THREAD_STATIC
- || declaration->parent_scope == global_scope) {
+ if (declaration->storage_class == STORAGE_CLASS_STATIC ||
+ declaration->storage_class == STORAGE_CLASS_THREAD_STATIC ||
+ declaration->parent_scope == file_scope) {
must_be_constant = 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);
if (!type->function.kr_style_parameters)
return;
+ add_anchor_token('{');
+
/* push function parameters */
- int top = environment_top();
- scope_t *last_scope = scope;
- set_scope(&declaration->scope);
+ size_t const top = environment_top();
+ scope_push(&declaration->scope);
declaration_t *parameter = declaration->scope.declarations;
for ( ; parameter != NULL; parameter = parameter->next) {
/* pop function parameters */
assert(scope == &declaration->scope);
- set_scope(last_scope);
+ scope_pop();
environment_pop_to(top);
/* update function type */
}
declaration->type = type;
+
+ rem_anchor_token('{');
}
static bool first_err = true;
add_anchor_token(',');
add_anchor_token('=');
- rem_anchor_token(';');
+ add_anchor_token(';');
+ add_anchor_token('{');
/* declarator is common to both function-definitions and declarations */
declaration_t *ndeclaration = parse_declarator(&specifiers, /*may_be_abstract=*/false);
- rem_anchor_token(',');
- rem_anchor_token('=');
+ rem_anchor_token('{');
rem_anchor_token(';');
+ rem_anchor_token('=');
+ rem_anchor_token(',');
/* must be a declaration */
switch (token.type) {
type = skip_typeref(declaration->type);
/* push function parameters and switch scope */
- int top = environment_top();
- scope_t *last_scope = scope;
- set_scope(&declaration->scope);
+ size_t const top = environment_top();
+ scope_push(&declaration->scope);
declaration_t *parameter = declaration->scope.declarations;
for( ; parameter != NULL; parameter = parameter->next) {
}
assert(scope == &declaration->scope);
- set_scope(last_scope);
+ scope_pop();
environment_pop_to(top);
}
static type_t *make_bitfield_type(type_t *base_type, expression_t *size,
- source_position_t *source_position)
+ source_position_t *source_position,
+ const symbol_t *symbol)
{
type_t *type = allocate_type_zero(TYPE_BITFIELD, source_position);
- type->bitfield.base_type = base_type;
- type->bitfield.size = size;
+ type->bitfield.base_type = base_type;
+ type->bitfield.size_expression = size;
+
+ il_size_t bit_size;
+ type_t *skipped_type = skip_typeref(base_type);
+ if (!is_type_integer(skipped_type)) {
+ errorf(HERE, "bitfield base type '%T' is not an integer type",
+ base_type);
+ bit_size = 0;
+ } else {
+ bit_size = skipped_type->base.size * 8;
+ }
+
+ if (is_constant_expression(size)) {
+ long v = fold_constant(size);
+
+ if (v < 0) {
+ errorf(source_position, "negative width in bit-field '%Y'",
+ symbol);
+ } else if (v == 0) {
+ errorf(source_position, "zero width for bit-field '%Y'",
+ symbol);
+ } else if (bit_size > 0 && (il_size_t)v > bit_size) {
+ errorf(source_position, "width of '%Y' exceeds its type",
+ symbol);
+ } else {
+ type->bitfield.bit_size = v;
+ }
+ }
return type;
}
type_t *base_type = specifiers->type;
expression_t *size = parse_constant_expression();
- if (!is_type_integer(skip_typeref(base_type))) {
- errorf(HERE, "bitfield base type '%T' is not an integer type",
- base_type);
- }
-
- type_t *type = make_bitfield_type(base_type, size, &source_position);
+ type_t *type = make_bitfield_type(base_type, size,
+ &source_position, sym_anonymous);
declaration = allocate_declaration_zero();
declaration->namespc = NAMESPACE_NORMAL;
next_token();
expression_t *size = parse_constant_expression();
- if (!is_type_integer(type)) {
- errorf(HERE, "bitfield base type '%T' is not an integer type",
- orig_type);
- }
-
- type_t *bitfield_type = make_bitfield_type(orig_type, size, &source_position);
+ type_t *bitfield_type = make_bitfield_type(orig_type, size,
+ &source_position, declaration->symbol);
declaration->type = bitfield_type;
} else {
/* TODO we ignore arrays for now... what is missing is a check
eat('{');
add_anchor_token('}');
- while (token.type != '}' && token.type != T_EOF) {
+ while (token.type != '}') {
+ if (token.type == T_EOF) {
+ errorf(HERE, "EOF while parsing struct");
+ break;
+ }
declaration_specifiers_t specifiers;
memset(&specifiers, 0, sizeof(specifiers));
parse_declaration_specifiers(&specifiers);
parse_compound_declarators(compound_declaration, &specifiers);
}
rem_anchor_token('}');
-
- if (token.type == T_EOF) {
- errorf(HERE, "EOF while parsing struct");
- }
next_token();
}
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_t *declaration = get_declaration(symbol, NAMESPACE_NORMAL);
- source_position_t source_position = token.source_position;
- next_token();
-
if (declaration == NULL) {
- if (token.type == '(') {
+ if (!strict_mode && look_ahead(1)->type == '(') {
/* an implicitly declared function */
- if (strict_mode) {
- errorf(HERE, "unknown symbol '%Y' found.", symbol);
- } else if (warning.implicit_function_declaration) {
+ if (warning.implicit_function_declaration) {
warningf(HERE, "implicit declaration of function '%Y'",
symbol);
}
- declaration = create_implicit_function(symbol,
- &source_position);
+ declaration = create_implicit_function(symbol, HERE);
} else {
errorf(HERE, "unknown symbol '%Y' found.", symbol);
declaration = create_error_declaration(symbol, STORAGE_CLASS_NONE);
}
}
- type_t *type = declaration->type;
+ type_t *orig_type = declaration->type;
/* we always do the auto-type conversions; the & and sizeof parser contains
* code to revert this! */
- type = automatic_type_conversion(type);
+ type_t *type = automatic_type_conversion(orig_type);
ref->declaration = declaration;
ref->base.type = type;
/* this declaration is used */
declaration->used = true;
+ if (declaration->parent_scope != file_scope &&
+ declaration->parent_scope->depth < current_function->scope.depth &&
+ is_type_valid(orig_type) && !is_type_function(orig_type)) {
+ /* access of a variable from an outer function */
+ declaration->address_taken = true;
+ ref->is_outer_ref = true;
+ current_function->need_closure = true;
+ }
+
/* check for deprecated functions */
if (warning.deprecated_declarations &&
declaration->modifiers & DM_DEPRECATED) {
"function" : "variable";
if (declaration->deprecated_string != NULL) {
- warningf(&source_position,
- "%s '%Y' is deprecated (declared %P): \"%s\"", prefix,
- declaration->symbol, &declaration->source_position,
+ warningf(HERE, "%s '%Y' is deprecated (declared %P): \"%s\"",
+ prefix, declaration->symbol, &declaration->source_position,
declaration->deprecated_string);
} else {
- warningf(&source_position,
- "%s '%Y' is deprecated (declared %P)", prefix,
+ warningf(HERE, "%s '%Y' is deprecated (declared %P)", prefix,
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(&source_position,
- "variable '%#T' is initialized by itself",
+ warningf(HERE, "variable '%#T' is initialized by itself",
declaration->type, declaration->symbol);
}
+ next_token();
return expression;
}
*/
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();
}
break;
default:
internal_errorf(HERE, "invalid compare builtin found");
- break;
}
expression->base.source_position = *HERE;
next_token();
candidate = get_declaration(symbol, NAMESPACE_LOCAL_LABEL);
/* if we found a local label, we already created the declaration */
if (candidate != NULL) {
- assert(candidate->parent_scope == scope);
+ if (candidate->parent_scope != scope) {
+ assert(candidate->parent_scope->depth < scope->depth);
+ current_function->goto_to_outer = true;
+ }
return candidate;
}
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;
orig_type_left, orig_type_inside);
}
return_type = type_error_type;
- array_access->array_ref = create_invalid_expression();
+ array_access->array_ref = left;
+ array_access->index = inside;
}
+ expression->base.type = automatic_type_conversion(return_type);
+
rem_anchor_token(']');
- if (token.type != ']') {
+ if (token.type == ']') {
+ next_token();
+ } else {
parse_error_expected("Problem while parsing array access", ']', NULL);
- return expression;
}
- next_token();
-
- return_type = automatic_type_conversion(return_type);
- expression->base.type = return_type;
-
return expression;
}
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(')');
tp_expression->typeprop.tp_expression = expression;
}
- return tp_expression;
end_error:
- return create_invalid_expression();
+ in_type_prop = old;
+ return tp_expression;
}
static expression_t *parse_sizeof(unsigned precedence)
snprintf(buf, sizeof(buf), "call argument %u", pos);
report_assign_error(error, expected_type, arg_expr, buf,
&arg_expr->base.source_position);
- } else if (warning.traditional | warning.conversion) {
- if (
- /* passing as integer instead of float or complex */
- (is_type_integer(expected_type) &&
- (is_type_float(arg_type) || is_type_complex(arg_type))) ||
- /* passing as complex instead of integer or float */
- (is_type_complex(expected_type) &&
- (is_type_integer(arg_type) || is_type_float(arg_type))) ||
- /* passing as float instead of integer or complex */
- (is_type_float(expected_type) &&
- (is_type_integer(arg_type) || is_type_complex(arg_type))) ||
- /* passing as float instead of double */
- (is_type_float(expected_type) && expected_type != type_double &&
- is_type_float(arg_type))) {
+ } else if (warning.traditional || warning.conversion) {
+ type_t *const promoted_type = get_default_promoted_type(arg_type);
+ if (!types_compatible(expected_type_skip, promoted_type) &&
+ !types_compatible(expected_type_skip, type_void_ptr) &&
+ !types_compatible(type_void_ptr, promoted_type)) {
+ /* Deliberately show the skipped types in this warning */
warningf(&arg_expr->base.source_position,
"passing call argument %u as '%T' rather than '%T' due to prototype",
- pos, expected_type, arg_type);
- }
- if (is_type_integer(expected_type) && is_type_integer(arg_type)) {
- /* TODO check for size HERE */
+ pos, expected_type_skip, promoted_type);
}
}
}
"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);
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);
"traditional C rejects the unary plus operator");
}
+static expression_t const *get_reference_address(expression_t const *expr)
+{
+ bool regular_take_address = true;
+ for (;;) {
+ if (expr->kind == EXPR_UNARY_TAKE_ADDRESS) {
+ expr = expr->unary.value;
+ } else {
+ regular_take_address = false;
+ }
+
+ if (expr->kind != EXPR_UNARY_DEREFERENCE)
+ break;
+
+ expr = expr->unary.value;
+ }
+
+ if (expr->kind != EXPR_REFERENCE)
+ return NULL;
+
+ if (!regular_take_address &&
+ !is_type_function(skip_typeref(expr->reference.declaration->type))) {
+ return NULL;
+ }
+
+ return expr;
+}
+
+static void warn_function_address_as_bool(expression_t const* expr)
+{
+ if (!warning.address)
+ return;
+
+ expr = get_reference_address(expr);
+ if (expr != NULL) {
+ warningf(&expr->base.source_position,
+ "the address of '%Y' will always evaluate as 'true'",
+ expr->reference.declaration->symbol);
+ }
+}
+
static void semantic_not(unary_expression_t *expression)
{
type_t *const orig_type = expression->value->base.type;
"operand of ! must be of scalar type");
}
+ warn_function_address_as_bool(expression->value);
+
expression->base.type = type_int;
}
{
/* TODO: handle complex + imaginary types */
+ type_left = get_unqualified_type(type_left);
+ type_right = get_unqualified_type(type_right);
+
/* § 6.3.1.8 Usual arithmetic conversions */
if (type_left == type_long_double || type_right == type_long_double) {
return type_long_double;
static void warn_div_by_zero(binary_expression_t const *const expression)
{
- if (warning.div_by_zero &&
- is_type_integer(expression->base.type) &&
- is_constant_expression(expression->right) &&
- fold_constant(expression->right) == 0) {
+ if (!warning.div_by_zero ||
+ !is_type_integer(expression->base.type))
+ return;
+
+ expression_t const *const right = expression->right;
+ /* The type of the right operand can be different for /= */
+ if (is_type_integer(right->base.type) &&
+ is_constant_expression(right) &&
+ fold_constant(right) == 0) {
warningf(&expression->base.source_position, "division by zero");
}
}
}
}
+static void warn_string_literal_address(expression_t const* expr)
+{
+ while (expr->kind == EXPR_UNARY_TAKE_ADDRESS) {
+ expr = expr->unary.value;
+ if (expr->kind != EXPR_UNARY_DEREFERENCE)
+ return;
+ expr = expr->unary.value;
+ }
+
+ if (expr->kind == EXPR_STRING_LITERAL ||
+ expr->kind == EXPR_WIDE_STRING_LITERAL) {
+ warningf(&expr->base.source_position,
+ "comparison with string literal results in unspecified behaviour");
+ }
+}
+
/**
* Check the semantics of comparison expressions.
*
*/
static void semantic_comparison(binary_expression_t *expression)
{
- expression_t *left = expression->left;
- expression_t *right = expression->right;
- type_t *orig_type_left = left->base.type;
- type_t *orig_type_right = right->base.type;
+ expression_t *left = expression->left;
+ expression_t *right = expression->right;
- type_t *type_left = skip_typeref(orig_type_left);
- type_t *type_right = skip_typeref(orig_type_right);
+ if (warning.address) {
+ warn_string_literal_address(left);
+ warn_string_literal_address(right);
+
+ expression_t const* const func_left = get_reference_address(left);
+ if (func_left != NULL && is_null_pointer_constant(right)) {
+ warningf(&expression->base.source_position,
+ "the address of '%Y' will never be NULL",
+ func_left->reference.declaration->symbol);
+ }
+
+ expression_t const* const func_right = get_reference_address(right);
+ if (func_right != NULL && is_null_pointer_constant(right)) {
+ warningf(&expression->base.source_position,
+ "the address of '%Y' will never be NULL",
+ func_right->reference.declaration->symbol);
+ }
+ }
+
+ type_t *orig_type_left = left->base.type;
+ type_t *orig_type_right = right->base.type;
+ type_t *type_left = skip_typeref(orig_type_left);
+ type_t *type_right = skip_typeref(orig_type_right);
/* TODO non-arithmetic types */
if (is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) {
type_t *const type_left = skip_typeref(orig_type_left);
type_t *const type_right = skip_typeref(orig_type_right);
+ warn_function_address_as_bool(left);
+ warn_function_address_as_bool(right);
+
if (!is_type_scalar(type_left) || !is_type_scalar(type_right)) {
/* TODO: improve error message */
if (is_type_valid(type_left) && is_type_valid(type_right)) {
source_position_t *const pos = &statement->base.source_position;
*pos = token.source_position;
- statement->case_label.expression = parse_expression();
- if (! is_constant_expression(statement->case_label.expression)) {
- errorf(pos, "case label does not reduce to an integer constant");
+ expression_t *const expression = parse_expression();
+ statement->case_label.expression = expression;
+ if (!is_constant_expression(expression)) {
+ /* This check does not prevent the error message in all cases of an
+ * prior error while parsing the expression. At least it catches the
+ * common case of a mistyped enum entry. */
+ if (is_type_valid(expression->base.type)) {
+ errorf(pos, "case label does not reduce to an integer constant");
+ }
statement->case_label.is_bad = true;
} else {
- long const val = fold_constant(statement->case_label.expression);
+ long const val = fold_constant(expression);
statement->case_label.first_case = val;
statement->case_label.last_case = val;
}
- if (c_mode & _GNUC) {
+ if (GNU_MODE) {
if (token.type == T_DOTDOTDOT) {
next_token();
- statement->case_label.end_range = parse_expression();
- if (! is_constant_expression(statement->case_label.end_range)) {
- errorf(pos, "case range does not reduce to an integer constant");
+ expression_t *const end_range = parse_expression();
+ statement->case_label.end_range = end_range;
+ if (!is_constant_expression(end_range)) {
+ /* This check does not prevent the error message in all cases of an
+ * prior error while parsing the expression. At least it catches the
+ * common case of a mistyped enum entry. */
+ if (is_type_valid(end_range->base.type)) {
+ errorf(pos, "case range does not reduce to an integer constant");
+ }
statement->case_label.is_bad = true;
} else {
- long const val = fold_constant(statement->case_label.end_range);
+ long const val = fold_constant(end_range);
statement->case_label.last_case = val;
if (val < statement->case_label.first_case) {
- statement->case_label.is_empty = true;
+ statement->case_label.is_empty_range = true;
warningf(pos, "empty range specified");
}
}
/* Check for duplicate case values */
case_label_statement_t *c = &statement->case_label;
for (case_label_statement_t *l = current_switch->first_case; l != NULL; l = l->next) {
- if (l->is_bad || l->is_empty || l->expression == NULL)
+ if (l->is_bad || l->is_empty_range || l->expression == NULL)
continue;
if (c->last_case < l->first_case || c->first_case > l->last_case)
PUSH_PARENT(statement);
- int top = environment_top();
- scope_t *last_scope = scope;
- set_scope(&statement->fors.scope);
+ size_t const top = environment_top();
+ scope_push(&statement->fors.scope);
expect('(');
add_anchor_token(')');
statement->fors.body = parse_loop_body(statement);
assert(scope == &statement->fors.scope);
- set_scope(last_scope);
+ scope_pop();
environment_pop_to(top);
POP_PARENT;
POP_PARENT;
rem_anchor_token(')');
assert(scope == &statement->fors.scope);
- set_scope(last_scope);
+ scope_pop();
environment_pop_to(top);
return create_invalid_statement();
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 = allocate_statement_zero(STATEMENT_GOTO);
statement->base.source_position = source_position;
statement->gotos.label = get_label(symbol);
+
+ if (statement->gotos.label->parent_scope->depth < current_function->scope.depth) {
+ statement->gotos.outer_fkt_jmp = true;
+ }
}
/* remember the goto's in a list for later checking */
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;
} else if (is_typedef_symbol(token.v.symbol)) {
statement = parse_declaration_statement();
} else switch (la1_type) {
+ case '*':
+ if (get_declaration(token.v.symbol, NAMESPACE_NORMAL) != NULL)
+ goto expression_statment;
+ /* FALLTHROUGH */
+
DECLARATION_START
case T_IDENTIFIER:
- case '*':
statement = parse_declaration_statement();
break;
default:
+expression_statment:
statement = parse_expression_statement();
break;
}
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 = old_gcc_extension;
break;
DECLARATION_START
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(';');
eat('{');
add_anchor_token('}');
- int top = environment_top();
- int top_local = local_label_top();
- scope_t *last_scope = scope;
- set_scope(&statement->compound.scope);
+ size_t const top = environment_top();
+ size_t const top_local = local_label_top();
+ scope_push(&statement->compound.scope);
statement_t **anchor = &statement->compound.statements;
bool only_decls_so_far = true;
- while (token.type != '}' && token.type != T_EOF) {
+ while (token.type != '}') {
+ if (token.type == T_EOF) {
+ errorf(&statement->base.source_position,
+ "EOF while parsing compound statement");
+ break;
+ }
statement_t *sub_statement = intern_parse_statement();
if (is_invalid_statement(sub_statement)) {
/* an error occurred. if we are at an anchor, return */
anchor = &sub_statement->base.next;
}
-
- if (token.type == '}') {
- next_token();
- } else {
- errorf(&statement->base.source_position,
- "end of file while looking for closing '}'");
- }
+ next_token();
/* look over all statements again to produce no effect warnings */
if (warning.unused_value) {
end_error:
rem_anchor_token('}');
assert(scope == &statement->compound.scope);
- set_scope(last_scope);
+ scope_pop();
environment_pop_to(top);
local_label_pop_to(top_local);
if (!warning.unused_function && !warning.unused_variable)
return;
- for (const declaration_t *decl = global_scope->declarations; decl != NULL; decl = decl->next) {
+ for (const declaration_t *decl = file_scope->declarations; decl != NULL; decl = decl->next) {
if (decl->used ||
decl->modifiers & DM_UNUSED ||
decl->modifiers & DM_USED ||
*/
static void parse_translation_unit(void)
{
- for (;;) switch (token.type) {
- DECLARATION_START
- case T_IDENTIFIER:
- case T___extension__:
- parse_external_declaration();
- break;
+ add_anchor_token(T_EOF);
- case T_asm:
- parse_global_asm();
- break;
+#ifndef NDEBUG
+ unsigned char token_anchor_copy[T_LAST_TOKEN];
+ memcpy(token_anchor_copy, token_anchor_set, sizeof(token_anchor_copy));
+#endif
+ for (;;) {
+#ifndef NDEBUG
+ bool anchor_leak = false;
+ for (int i = 0; i != T_LAST_TOKEN; ++i) {
+ unsigned char count = token_anchor_set[i] - token_anchor_copy[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;
+ }
- case T_EOF:
- return;
+ if (anchor_leak)
+ abort();
+#endif
- case ';':
- /* TODO error in strict mode */
- warningf(HERE, "stray ';' outside of function");
- next_token();
- break;
+ switch (token.type) {
+ DECLARATION_START
+ case T_IDENTIFIER:
+ case T___extension__:
+ parse_external_declaration();
+ 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;
+ case T_asm:
+ parse_global_asm();
+ break;
+
+ case T_EOF:
+ rem_anchor_token(T_EOF);
+ return;
+
+ 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;
+ }
}
}
assert(unit == NULL);
unit = allocate_ast_zero(sizeof(unit[0]));
- assert(global_scope == NULL);
- global_scope = &unit->scope;
+ assert(file_scope == NULL);
+ file_scope = &unit->scope;
assert(scope == NULL);
- set_scope(&unit->scope);
+ scope_push(&unit->scope);
initialize_builtin_types();
}
translation_unit_t *finish_parsing(void)
{
+ /* do NOT use scope_pop() here, this will crash, will it by hand */
assert(scope == &unit->scope);
- scope = NULL;
+ scope = NULL;
last_declaration = NULL;
- assert(global_scope == &unit->scope);
+ assert(file_scope == &unit->scope);
check_unused_globals();
- global_scope = NULL;
+ file_scope = NULL;
DEL_ARR_F(environment_stack);
DEL_ARR_F(label_stack);
*/
void init_parser(void)
{
+ sym_anonymous = symbol_table_insert("<anonymous>");
+
if (c_mode & _MS) {
/* add predefined symbols for extended-decl-modifier */
sym_align = symbol_table_insert("align");
projects / cparser / blobdiff