#include "adt/error.h"
#include "adt/array.h"
+/** if wchar_t is equal to unsigned short. */
+bool opt_short_wchar_t =
+#ifdef _WIN32
+ true;
+#else
+ false;
+#endif
+
//#define PRINT_TOKENS
#define MAX_LOOKAHEAD 2
bool must_be_constant;
} parse_initializer_env_t;
-typedef declaration_t* (*parsed_declaration_func) (declaration_t *declaration);
+typedef declaration_t* (*parsed_declaration_func) (declaration_t *declaration, bool is_definition);
static token_t token;
static token_t lookahead_buffer[MAX_LOOKAHEAD];
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;
static scope_t *scope = NULL;
static declaration_t *last_declaration = NULL;
static declaration_t *current_function = NULL;
+static declaration_t *current_init_decl = NULL;
static switch_statement_t *current_switch = NULL;
static statement_t *current_loop = NULL;
static statement_t *current_parent = NULL;
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;
static void parse_compound_type_entries(declaration_t *compound_declaration);
static declaration_t *parse_declarator(
const declaration_specifiers_t *specifiers, bool may_be_abstract);
-static declaration_t *record_declaration(declaration_t *declaration);
+static declaration_t *record_declaration(declaration_t *declaration, bool is_definition);
static void semantic_comparison(binary_expression_t *expression);
[EXPR_VA_START] = sizeof(va_start_expression_t),
[EXPR_VA_ARG] = sizeof(va_arg_expression_t),
[EXPR_STATEMENT] = sizeof(statement_expression_t),
+ [EXPR_LABEL_ADDRESS] = sizeof(label_address_expression_t),
};
if (kind >= EXPR_UNARY_FIRST && kind <= EXPR_UNARY_LAST) {
return sizes[EXPR_UNARY_FIRST];
}
/**
- * Returns the index of the top element of the label stack.
+ * Returns the index of the top element of the global label stack.
*/
static size_t label_top(void)
{
return ARR_LEN(label_stack);
}
+/**
+ * Returns the index of the top element of the local label stack.
+ */
+static size_t local_label_top(void)
+{
+ return ARR_LEN(local_label_stack);
+}
+
/**
* Return the next token.
*/
ARR_APP1(stack_entry_t, *stack_ptr, entry);
}
+/**
+ * Push a declaration on the environment stack.
+ *
+ * @param declaration the declaration
+ */
static void environment_push(declaration_t *declaration)
{
assert(declaration->source_position.input_name != NULL);
}
/**
- * Push a declaration of the label stack.
+ * Push a declaration on the global label stack.
*
* @param declaration the declaration
*/
stack_push(&label_stack, declaration);
}
+/**
+ * Push a declaration of the local label stack.
+ *
+ * @param declaration the declaration
+ */
+static void local_label_push(declaration_t *declaration)
+{
+ assert(declaration->parent_scope != NULL);
+ stack_push(&local_label_stack, declaration);
+}
+
/**
* pops symbols from the environment stack until @p new_top is the top element
*/
ARR_SHRINKLEN(*stack_ptr, (int) new_top);
}
+/**
+ * Pop all entries from the environment stack until the new_top
+ * is reached.
+ *
+ * @param new_top the new stack top
+ */
static void environment_pop_to(size_t new_top)
{
stack_pop_to(&environment_stack, new_top);
}
/**
- * Pop all entries on the label stack until the new_top
+ * Pop all entries from the global label stack until the new_top
* is reached.
*
* @param new_top the new stack top
stack_pop_to(&label_stack, new_top);
}
+/**
+ * Pop all entries from the local label stack until the new_top
+ * is reached.
+ *
+ * @param new_top the new stack top
+ */
+static void local_label_pop_to(size_t new_top)
+{
+ stack_pop_to(&local_label_stack, new_top);
+}
+
+
+static int get_akind_rank(atomic_type_kind_t akind)
+{
+ return (int) akind;
+}
static int get_rank(const type_t *type)
{
* (unsigned int would be preferable when possible... for stuff like
* struct { enum { ... } bla : 4; } ) */
if (type->kind == TYPE_ENUM)
- return ATOMIC_TYPE_INT;
+ return get_akind_rank(ATOMIC_TYPE_INT);
assert(type->kind == TYPE_ATOMIC);
- return type->atomic.akind;
+ return get_akind_rank(type->atomic.akind);
}
static type_t *promote_integer(type_t *type)
if (type->kind == TYPE_BITFIELD)
type = type->bitfield.base_type;
- if (get_rank(type) < ATOMIC_TYPE_INT)
+ if (get_rank(type) < get_akind_rank(ATOMIC_TYPE_INT))
type = type_int;
return type;
/* the left type has all qualifiers from the right type */
unsigned missing_qualifiers
= points_to_right->base.qualifiers & ~points_to_left->base.qualifiers;
- errorf(source_position,
- "destination type '%T' in %s from type '%T' lacks qualifiers '%Q' in pointed-to type",
- orig_type_left, context, orig_type_right, missing_qualifiers);
+ warningf(source_position,
+ "destination type '%T' in %s from type '%T' lacks qualifiers '%Q' in pointer target type",
+ orig_type_left, context, orig_type_right, missing_qualifiers);
return;
}
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;
= skip_typeref(type_left->pointer.points_to);
type_t *points_to_right
= skip_typeref(type_right->pointer.points_to);
+ assign_error_t res = ASSIGN_SUCCESS;
/* the left type has all qualifiers from the right type */
unsigned missing_qualifiers
= points_to_right->base.qualifiers & ~points_to_left->base.qualifiers;
if (missing_qualifiers != 0) {
- return ASSIGN_ERROR_POINTER_QUALIFIER_MISSING;
+ res = ASSIGN_ERROR_POINTER_QUALIFIER_MISSING;
}
points_to_left = get_unqualified_type(points_to_left);
if (is_type_atomic(points_to_left, ATOMIC_TYPE_VOID) ||
is_type_atomic(points_to_right, ATOMIC_TYPE_VOID)) {
- return ASSIGN_SUCCESS;
+ return res;
}
if (!types_compatible(points_to_left, points_to_right)) {
return ASSIGN_WARNING_POINTER_INCOMPATIBLE;
}
- return ASSIGN_SUCCESS;
+ return res;
} else if (is_type_integer(type_right)) {
return ASSIGN_WARNING_POINTER_FROM_INT;
}
declaration->type = type;
declaration->symbol = symbol;
declaration->source_position = builtin_source_position;
+ declaration->implicit = true;
- record_declaration(declaration);
+ record_declaration(declaration, false);
type_t *typedef_type = allocate_type_zero(TYPE_TYPEDEF, &builtin_source_position);
typedef_type->typedeft.declaration = declaration;
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));
}
}
errorf(HERE, "multiple definitions of '%s %Y' (previous definition at %P)",
is_struct ? "struct" : "union", symbol,
&declaration->source_position);
- declaration->scope.declarations = NULL;
}
}
} else if (token.type != '{') {
return NULL;
}
- if (declaration == NULL) {
- declaration = allocate_declaration_zero();
- declaration->namespc =
- (is_struct ? NAMESPACE_STRUCT : NAMESPACE_UNION);
- declaration->source_position = token.source_position;
- declaration->symbol = symbol;
- declaration->parent_scope = scope;
- if (symbol != NULL) {
- environment_push(declaration);
- }
- append_declaration(declaration);
+ /* always create a new declaration, do NOT modify old one */
+ declaration = allocate_declaration_zero();
+ declaration->namespc =
+ (is_struct ? NAMESPACE_STRUCT : NAMESPACE_UNION);
+ declaration->source_position = token.source_position;
+ declaration->symbol = symbol;
+ declaration->parent_scope = scope;
+ if (symbol != NULL) {
+ environment_push(declaration);
}
+ append_declaration(declaration);
if (token.type == '{') {
declaration->init.complete = true;
/* TODO semantic */
}
- record_declaration(entry);
+ record_declaration(entry, false);
if (token.type != ',')
break;
;
}
+/**
+ * Parse enum specifier and return the enum type or NULL on error.
+ */
static type_t *parse_enum_specifier(void)
{
- gnu_attribute_t *attributes = NULL;
- declaration_t *declaration;
- symbol_t *symbol;
+ gnu_attribute_t *attributes = NULL;
+ declaration_t *declaration = NULL;
+ symbol_t *symbol = NULL;
eat(T_enum);
if (token.type == T_IDENTIFIER) {
parse_error_expected("while parsing enum type specifier",
T_IDENTIFIER, '{', NULL);
return NULL;
- } else {
- declaration = NULL;
- symbol = NULL;
}
- if (declaration == NULL) {
- declaration = allocate_declaration_zero();
- declaration->namespc = NAMESPACE_ENUM;
- declaration->source_position = token.source_position;
- declaration->symbol = symbol;
- declaration->parent_scope = scope;
+ if (token.type == '{' && declaration != NULL && declaration->init.complete) {
+ errorf(HERE, "multiple definitions of enum '%Y' (previous definition at %P)",
+ symbol, &declaration->source_position);
+ }
+
+ declaration = allocate_declaration_zero();
+ declaration->namespc = NAMESPACE_ENUM;
+ declaration->source_position = token.source_position;
+ declaration->symbol = symbol;
+ declaration->parent_scope = scope;
+ if (symbol != NULL) {
+ environment_push(declaration);
}
+ append_declaration(declaration);
type_t *const type = allocate_type_zero(TYPE_ENUM, &declaration->source_position);
type->enumt.declaration = declaration;
if (token.type == '{') {
if (declaration->init.complete) {
- errorf(HERE, "multiple definitions of enum %Y", symbol);
- }
- if (symbol != NULL) {
- environment_push(declaration);
+ errorf(HERE, "multiple definitions of enum '%Y' (previous definition at %P)",
+ symbol, &declaration->source_position);
}
- append_declaration(declaration);
declaration->init.complete = true;
parse_enum_entries(type);
return;
}
+static declaration_t *create_error_declaration(symbol_t *symbol, storage_class_tag_t storage_class)
+{
+ declaration_t *const decl = allocate_declaration_zero();
+ 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_AUTO;
+ decl->symbol = symbol;
+ decl->implicit = true;
+ record_declaration(decl, false);
+ return decl;
+}
+
+/**
+ * Finish the construction of a struct type by calculating
+ * its size, offsets, alignment.
+ */
+static void finish_struct_type(compound_type_t *type) {
+ if (type->declaration == NULL)
+ return;
+ declaration_t *struct_decl = type->declaration;
+ if (! struct_decl->init.complete)
+ return;
+
+ 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);
+ 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;
+
+ offset = (size + m_alignment - 1) & -m_alignment;
+
+ if (offset > size)
+ need_pad = true;
+ entry->offset = offset;
+ size = offset + m_type->base.size;
+ }
+ if (type->base.alignment != 0) {
+ alignment = type->base.alignment;
+ }
+
+ offset = (size + alignment - 1) & -alignment;
+ if (offset > size)
+ need_pad = true;
+
+ if (warning.padded && need_pad) {
+ warningf(&struct_decl->source_position,
+ "'%#T' needs padding", type, struct_decl->symbol);
+ }
+ if (warning.packed && !need_pad) {
+ warningf(&struct_decl->source_position,
+ "superfluous packed attribute on '%#T'",
+ type, struct_decl->symbol);
+ }
+
+ type->base.size = offset;
+ type->base.alignment = alignment;
+}
+
+/**
+ * Finish the construction of an union type by calculating
+ * its size and alignment.
+ */
+static void finish_union_type(compound_type_t *type) {
+ if (type->declaration == NULL)
+ return;
+ declaration_t *union_decl = type->declaration;
+ if (! union_decl->init.complete)
+ return;
+
+ il_size_t size = 0;
+ il_alignment_t alignment = 1;
+
+ declaration_t *entry = union_decl->scope.declarations;
+ for (; entry != NULL; entry = entry->next) {
+ if (entry->namespc != NAMESPACE_NORMAL)
+ 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)
+ size = m_type->base.size;
+ if (m_type->base.alignment > alignment)
+ alignment = m_type->base.alignment;
+ }
+ if (type->base.alignment != 0) {
+ alignment = type->base.alignment;
+ }
+ size = (size + alignment - 1) & -alignment;
+ type->base.size = size;
+ type->base.alignment = alignment;
+}
+
static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
{
type_t *type = NULL;
type_modifiers_t modifiers = TYPE_MODIFIER_NONE;
unsigned type_specifiers = 0;
bool newtype = false;
+ bool saw_error = false;
specifiers->source_position = token.source_position;
type = allocate_type_zero(TYPE_COMPOUND_STRUCT, HERE);
type->compound.declaration = parse_compound_type_specifier(true);
+ finish_struct_type(&type->compound);
break;
}
case T_union: {
if (type->compound.declaration->modifiers & DM_TRANSPARENT_UNION)
modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION;
break;
+ finish_union_type(&type->compound);
}
case T_enum:
type = parse_enum_specifier();
case T_IDENTIFIER: {
/* only parse identifier if we haven't found a type yet */
- if (type != NULL || type_specifiers != 0)
- goto finish_specifiers;
+ if (type != NULL || type_specifiers != 0) {
+ /* Be somewhat resilient to typos like 'unsigned lng* f()' in a
+ * declaration, so it doesn't generate errors about expecting '(' or
+ * '{' later on. */
+ switch (look_ahead(1)->type) {
+ STORAGE_CLASSES
+ TYPE_SPECIFIERS
+ case T_const:
+ case T_restrict:
+ case T_volatile:
+ case T_inline:
+ case T__forceinline: /* ^ DECLARATION_START except for __attribute__ */
+ case T_IDENTIFIER:
+ case '*':
+ errorf(HERE, "discarding stray %K in declaration specifier", &token);
+ next_token();
+ continue;
+
+ default:
+ goto finish_specifiers;
+ }
+ }
- type_t *typedef_type = get_typedef_type(token.v.symbol);
+ type_t *const typedef_type = get_typedef_type(token.v.symbol);
+ if (typedef_type == NULL) {
+ /* Be somewhat resilient to typos like 'vodi f()' at the beginning of a
+ * declaration, so it doesn't generate 'implicit int' followed by more
+ * errors later on. */
+ token_type_t const la1_type = (token_type_t)look_ahead(1)->type;
+ switch (la1_type) {
+ DECLARATION_START
+ case T_IDENTIFIER:
+ case '*': {
+ errorf(HERE, "%K does not name a type", &token);
+
+ declaration_t *const decl =
+ create_error_declaration(token.v.symbol, STORAGE_CLASS_TYPEDEF);
+
+ type = allocate_type_zero(TYPE_TYPEDEF, HERE);
+ type->typedeft.declaration = decl;
+
+ next_token();
+ saw_error = true;
+ if (la1_type == '*')
+ goto finish_specifiers;
+ continue;
+ }
- if (typedef_type == NULL)
- goto finish_specifiers;
+ default:
+ goto finish_specifiers;
+ }
+ }
next_token();
type = typedef_type;
}
finish_specifiers:
-
- if (type == NULL) {
+ if (type == NULL || (saw_error && type_specifiers != 0)) {
atomic_type_kind_t atomic_type;
/* match valid basic types */
default:
/* invalid specifier combination, give an error message */
if (type_specifiers == 0) {
- if (! strict_mode) {
+ if (saw_error) {
+ specifiers->type = type_error_type;
+ return;
+ }
+
+ if (!strict_mode) {
if (warning.implicit_int) {
warningf(HERE, "no type specifiers in declaration, using 'int'");
}
declaration->type = type;
if (is_type_incomplete(skip_typeref(type))) {
- errorf(pos, "incomplete type '%T' not allowed for parameter '%Y'",
+ errorf(pos, "parameter '%#T' is of incomplete type",
orig_type, declaration->symbol);
}
}
add_anchor_token(')');
int saved_comma_state = save_and_reset_anchor_state(',');
- if (token.type == T_IDENTIFIER) {
- symbol_t *symbol = token.v.symbol;
- if (!is_typedef_symbol(symbol)) {
+ if (token.type == T_IDENTIFIER &&
+ !is_typedef_symbol(token.v.symbol)) {
+ 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();
goto parameters_finished;
next_token();
add_anchor_token(')');
inner_types = parse_inner_declarator(declaration, may_be_abstract);
- /* All later declarators only modify the return type, not declaration */
- declaration = NULL;
+ if (inner_types != NULL) {
+ /* All later declarators only modify the return type, not declaration */
+ declaration = NULL;
+ }
rem_anchor_token(')');
expect(')');
break;
return strcmp(sym->string, "main") == 0;
}
-static declaration_t *internal_record_declaration(
+static declaration_t *record_declaration(
declaration_t *const declaration,
const bool is_definition)
{
if (old_storage_class == STORAGE_CLASS_EXTERN &&
new_storage_class == STORAGE_CLASS_EXTERN) {
warn_redundant_declaration:
- if (!is_definition &&
- warning.redundant_decls &&
+ if (!is_definition &&
+ warning.redundant_decls &&
+ is_type_valid(prev_type) &&
strcmp(previous_declaration->source_position.input_name, "<builtin>") != 0) {
warningf(&declaration->source_position,
"redundant declaration for '%Y' (declared %P)",
} else {
goto warn_redundant_declaration;
}
- } else if (old_storage_class == new_storage_class) {
- errorf(&declaration->source_position,
- "redeclaration of '%Y' (declared %P)",
- symbol, &previous_declaration->source_position);
- } else {
- errorf(&declaration->source_position,
- "redeclaration of '%Y' with different linkage (declared %P)",
- symbol, &previous_declaration->source_position);
+ } else if (is_type_valid(prev_type)) {
+ if (old_storage_class == new_storage_class) {
+ errorf(&declaration->source_position,
+ "redeclaration of '%Y' (declared %P)",
+ symbol, &previous_declaration->source_position);
+ } else {
+ errorf(&declaration->source_position,
+ "redeclaration of '%Y' with different linkage (declared %P)",
+ symbol, &previous_declaration->source_position);
+ }
}
}
return append_declaration(declaration);
}
-static declaration_t *record_declaration(declaration_t *declaration)
-{
- return internal_record_declaration(declaration, false);
-}
-
-static declaration_t *record_definition(declaration_t *declaration)
-{
- return internal_record_declaration(declaration, true);
-}
-
static void parser_error_multiple_definition(declaration_t *declaration,
const source_position_t *source_position)
{
must_be_constant = true;
}
+ if (is_type_function(type)) {
+ errorf(&declaration->source_position,
+ "function '%#T' is initialized like a variable",
+ orig_type, declaration->symbol);
+ orig_type = type_error_type;
+ }
+
parse_initializer_env_t env;
env.type = orig_type;
env.must_be_constant = must_be_constant;
- env.declaration = declaration;
+ env.declaration = current_init_decl = declaration;
initializer_t *initializer = parse_initializer(&env);
+ current_init_decl = NULL;
- if (env.type != orig_type) {
- orig_type = env.type;
- type = skip_typeref(orig_type);
- declaration->type = env.type;
- }
-
- if (is_type_function(type)) {
- errorf(&declaration->source_position,
- "initializers not allowed for function types at declator '%Y' (type '%T')",
- declaration->symbol, orig_type);
- } else {
+ if (!is_type_function(type)) {
+ /* § 6.7.5 (22) array initializers for arrays with unknown size determine
+ * the array type size */
+ declaration->type = env.type;
declaration->init.initializer = initializer;
}
}
/* parse rest of a declaration without any declarator */
static void parse_anonymous_declaration_rest(
- const declaration_specifiers_t *specifiers,
- parsed_declaration_func finished_declaration)
+ const declaration_specifiers_t *specifiers)
{
eat(';');
+ if (specifiers->declared_storage_class != STORAGE_CLASS_NONE) {
+ warningf(&specifiers->source_position,
+ "useless storage class in empty declaration");
+ }
+
+#ifdef RECORD_EMPTY_DECLARARTIONS
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;
+#endif
- if (declaration->declared_storage_class != STORAGE_CLASS_NONE) {
- warningf(&declaration->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;
}
- finished_declaration(declaration);
+#ifdef RECORD_EMPTY_DECLARARTIONS
+ append_declaration(declaration);
+#endif
}
static void parse_declaration_rest(declaration_t *ndeclaration,
add_anchor_token('=');
add_anchor_token(',');
while(true) {
- declaration_t *declaration = finished_declaration(ndeclaration);
+ declaration_t *declaration =
+ finished_declaration(ndeclaration, token.type == '=');
type_t *orig_type = declaration->type;
type_t *type = skip_typeref(orig_type);
rem_anchor_token(',');
}
-static declaration_t *finished_kr_declaration(declaration_t *declaration)
+static declaration_t *finished_kr_declaration(declaration_t *declaration, bool is_definition)
{
symbol_t *symbol = declaration->symbol;
if (symbol == NULL) {
}
namespace_t namespc = (namespace_t) declaration->namespc;
if (namespc != NAMESPACE_NORMAL) {
- return record_declaration(declaration);
+ return record_declaration(declaration, false);
}
declaration_t *previous_declaration = get_declaration(symbol, namespc);
return declaration;
}
+ if (is_definition) {
+ errorf(HERE, "parameter %Y is initialised", declaration->symbol);
+ }
+
if (previous_declaration->type == NULL) {
previous_declaration->type = declaration->type;
previous_declaration->declared_storage_class = declaration->declared_storage_class;
previous_declaration->parent_scope = scope;
return previous_declaration;
} else {
- return record_declaration(declaration);
+ return record_declaration(declaration, false);
}
}
parse_declaration_specifiers(&specifiers);
if (token.type == ';') {
- parse_anonymous_declaration_rest(&specifiers, append_declaration);
+ parse_anonymous_declaration_rest(&specifiers);
} else {
declaration_t *declaration = parse_declarator(&specifiers, /*may_be_abstract=*/false);
parse_declaration_rest(declaration, &specifiers, finished_declaration);
for (const goto_statement_t *goto_statement = goto_first;
goto_statement != NULL;
goto_statement = goto_statement->next) {
+ /* skip computed gotos */
+ if (goto_statement->expression != NULL)
+ continue;
+
declaration_t *label = goto_statement->label;
label->used = true;
if (warning.unused_parameter) {
const scope_t *scope = ¤t_function->scope;
+ if (is_sym_main(current_function->symbol)) {
+ /* do not issue unused warnings for main */
+ return;
+ }
const declaration_t *parameter = scope->declarations;
for (; parameter != NULL; parameter = parameter->next) {
if (! parameter->used) {
continue;
}
- expression_t *const case_expr = i->expression;
- if (is_constant_expression(case_expr) &&
- fold_constant(case_expr) == val) {
+ if (i->first_case <= val && val <= i->last_case) {
check_reachable((statement_t*)i);
return;
}
}
case STATEMENT_GOTO:
- next = stmt->gotos.label->init.statement;
- if (next == NULL) /* missing label */
- return;
+ if (stmt->gotos.expression) {
+ statement_t *parent = stmt->base.parent;
+ if (parent == NULL) /* top level goto */
+ return;
+ next = parent;
+ } else {
+ next = stmt->gotos.label->init.statement;
+ if (next == NULL) /* missing label */
+ return;
+ }
break;
case STATEMENT_LABEL:
break;
}
- case STATEMENT_MS_TRY:
- case STATEMENT_LEAVE:
- panic("unimplemented");
+ case STATEMENT_MS_TRY: {
+ ms_try_statement_t const *const ms_try = &stmt->ms_try;
+ check_reachable(ms_try->try_statement);
+ next = ms_try->final_statement;
+ break;
+ }
+
+ case STATEMENT_LEAVE: {
+ statement_t *parent = stmt;
+ for (;;) {
+ parent = parent->base.parent;
+ if (parent == NULL) /* __leave not within __try */
+ return;
+
+ if (parent->kind == STATEMENT_MS_TRY) {
+ last = parent;
+ next = parent->ms_try.final_statement;
+ break;
+ }
+ }
+ break;
+ }
}
while (next == NULL) {
}
case STATEMENT_MS_TRY:
- panic("unimplemented");
+ last = next;
+ next = next->ms_try.final_statement;
+ break;
}
}
static void check_unreachable(statement_t const* const stmt)
{
if (!stmt->base.reachable &&
- stmt->kind != STATEMENT_COMPOUND &&
stmt->kind != STATEMENT_DO_WHILE &&
- stmt->kind != STATEMENT_FOR) {
+ stmt->kind != STATEMENT_FOR &&
+ (stmt->kind != STATEMENT_COMPOUND || stmt->compound.statements == NULL)) {
warningf(&stmt->base.source_position, "statement is unreachable");
}
}
}
- check_unreachable(stmt->fors.body);
+ check_unreachable(fors->body);
break;
}
- case STATEMENT_MS_TRY:
- panic("unimplemented");
+ case STATEMENT_MS_TRY: {
+ ms_try_statement_t const *const ms_try = &stmt->ms_try;
+ check_unreachable(ms_try->try_statement);
+ check_unreachable(ms_try->final_statement);
+ }
}
if (stmt->base.next)
/* must be a declaration */
if (token.type == ';') {
- parse_anonymous_declaration_rest(&specifiers, append_declaration);
+ parse_anonymous_declaration_rest(&specifiers);
return;
}
switch (token.type) {
case ',':
case ';':
- parse_declaration_rest(ndeclaration, &specifiers, record_declaration);
- return;
-
case '=':
- parse_declaration_rest(ndeclaration, &specifiers, record_definition);
+ parse_declaration_rest(ndeclaration, &specifiers, record_declaration);
return;
}
return;
}
+ if (warning.aggregate_return &&
+ is_type_compound(skip_typeref(type->function.return_type))) {
+ warningf(HERE, "function '%Y' returns an aggregate",
+ ndeclaration->symbol);
+ }
+ if (warning.traditional && !type->function.unspecified_parameters) {
+ warningf(HERE, "traditional C rejects ISO C style function definition of function '%Y'",
+ ndeclaration->symbol);
+ }
+ if (warning.old_style_definition && type->function.unspecified_parameters) {
+ warningf(HERE, "old-style function definition '%Y'",
+ ndeclaration->symbol);
+ }
+
/* § 6.7.5.3 (14) a function definition with () means no
* parameters (and not unspecified parameters) */
if (type->function.unspecified_parameters
ndeclaration->type = type;
}
- declaration_t *const declaration = record_definition(ndeclaration);
+ declaration_t *const declaration = record_declaration(ndeclaration, true);
if (ndeclaration != declaration) {
declaration->scope = ndeclaration->scope;
}
}
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;
}
{
declaration_t *last_declaration = struct_declaration->scope.declarations;
if (last_declaration != NULL) {
- while(last_declaration->next != NULL) {
+ while (last_declaration->next != NULL) {
last_declaration = last_declaration->next;
}
}
- while(1) {
+ while (true) {
declaration_t *declaration;
if (token.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
"compound member '%Y' has incomplete type '%T'",
declaration->symbol, orig_type);
} else if (is_type_function(type)) {
- errorf(HERE, "compound member '%Y' must not have function "
- "type '%T'", declaration->symbol, orig_type);
+ errorf(HERE, "compound member '%Y' must not have function type '%T'",
+ declaration->symbol, orig_type);
}
}
}
eat('{');
add_anchor_token('}');
- while(token.type != '}' && token.type != T_EOF) {
+ while (token.type != '}' && token.type != T_EOF) {
declaration_specifiers_t specifiers;
memset(&specifiers, 0, sizeof(specifiers));
parse_declaration_specifiers(&specifiers);
/* note: that we use type_char_ptr here, which is already the
* automatic converted type. revert_automatic_type_conversion
* will construct the array type */
- cnst->base.type = type_char_ptr;
+ cnst->base.type = warning.write_strings ? type_const_char_ptr : type_char_ptr;
cnst->string.value = res;
return cnst;
}
default: {
expression_t *const cnst = allocate_expression_zero(EXPR_WIDE_STRING_LITERAL);
- cnst->base.type = type_wchar_t_ptr;
+ cnst->base.type = warning.write_strings ? type_const_wchar_t_ptr : type_wchar_t_ptr;
cnst->wide_string.value = wres;
return cnst;
}
declaration->type = type;
declaration->symbol = symbol;
declaration->source_position = *source_position;
+ declaration->implicit = true;
bool strict_prototypes_old = warning.strict_prototypes;
warning.strict_prototypes = false;
- record_declaration(declaration);
+ record_declaration(declaration, false);
warning.strict_prototypes = strict_prototypes_old;
return declaration;
{
switch (expression->kind) {
case EXPR_REFERENCE: return expression->reference.declaration->type;
- case EXPR_SELECT: return expression->select.compound_entry->type;
+
+ case EXPR_SELECT:
+ return get_qualified_type(expression->select.compound_entry->type,
+ expression->base.type->base.qualifiers);
case EXPR_UNARY_DEREFERENCE: {
const expression_t *const value = expression->unary.value;
declaration_t *declaration = get_declaration(symbol, NAMESPACE_NORMAL);
- source_position_t source_position = token.source_position;
- next_token();
-
if (declaration == NULL) {
- if (! strict_mode && token.type == '(') {
- /* an implicitly defined function */
+ if (!strict_mode && look_ahead(1)->type == '(') {
+ /* an implicitly declared function */
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);
- return create_invalid_expression();
+ declaration = create_error_declaration(symbol, STORAGE_CLASS_NONE);
}
}
- type_t *type = declaration->type;
+ type_t *type = declaration->type;
/* we always do the auto-type conversions; the & and sizeof parser contains
* code to revert this! */
"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) {
+ current_init_decl = NULL;
+ warningf(HERE, "variable '%#T' is initialized by itself",
+ declaration->type, declaration->symbol);
+ }
+ next_token();
return expression;
}
-static void check_cast_allowed(expression_t *expression, type_t *dest_type)
+static bool semantic_cast(expression_t *cast)
{
- (void) expression;
- (void) dest_type;
- /* TODO check if explicit cast is allowed and issue warnings/errors */
+ expression_t *expression = cast->unary.value;
+ type_t *orig_dest_type = cast->base.type;
+ type_t *orig_type_right = expression->base.type;
+ type_t const *dst_type = skip_typeref(orig_dest_type);
+ type_t const *src_type = skip_typeref(orig_type_right);
+ source_position_t const *pos = &cast->base.source_position;
+
+ /* §6.5.4 A (void) cast is explicitly permitted, more for documentation than for utility. */
+ if (dst_type == type_void)
+ return true;
+
+ /* only integer and pointer can be casted to pointer */
+ if (is_type_pointer(dst_type) &&
+ !is_type_pointer(src_type) &&
+ !is_type_integer(src_type) &&
+ is_type_valid(src_type)) {
+ errorf(pos, "cannot convert type '%T' to a pointer type", orig_type_right);
+ return false;
+ }
+
+ if (!is_type_scalar(dst_type) && is_type_valid(dst_type)) {
+ errorf(pos, "conversion to non-scalar type '%T' requested", orig_dest_type);
+ return false;
+ }
+
+ if (!is_type_scalar(src_type) && is_type_valid(src_type)) {
+ errorf(pos, "conversion from non-scalar type '%T' requested", orig_type_right);
+ return false;
+ }
+
+ if (warning.cast_qual &&
+ is_type_pointer(src_type) &&
+ is_type_pointer(dst_type)) {
+ type_t *src = skip_typeref(src_type->pointer.points_to);
+ type_t *dst = skip_typeref(dst_type->pointer.points_to);
+ unsigned missing_qualifiers =
+ src->base.qualifiers & ~dst->base.qualifiers;
+ if (missing_qualifiers != 0) {
+ warningf(pos,
+ "cast discards qualifiers '%Q' in pointer target type of '%T'",
+ missing_qualifiers, orig_type_right);
+ }
+ }
+ return true;
}
static expression_t *parse_compound_literal(type_t *type)
cast->base.source_position = source_position;
expression_t *value = parse_sub_expression(20);
-
- check_cast_allowed(value, type);
-
cast->base.type = type;
cast->unary.value = value;
+ if (! semantic_cast(cast)) {
+ /* TODO: record the error in the AST. else it is impossible to detect it */
+ }
+
return cast;
end_error:
return create_invalid_expression();
}
/**
- * Parse a braced expression.
+ * Parse a parenthesized expression.
*/
-static expression_t *parse_brace_expression(void)
+static expression_t *parse_parenthesized_expression(void)
{
eat('(');
add_anchor_token(')');
}
/**
- * Parse a microsoft __noop expression.
+ * Return the declaration for a given label symbol or create a new one.
+ *
+ * @param symbol the symbol of the label
*/
-static expression_t *parse_noop_expression(void)
+static declaration_t *get_label(symbol_t *symbol)
{
- source_position_t source_position = *HERE;
- eat(T___noop);
-
- if (token.type == '(') {
- /* parse arguments */
- eat('(');
- add_anchor_token(')');
- add_anchor_token(',');
+ declaration_t *candidate;
+ assert(current_function != NULL);
- if (token.type != ')') {
- while(true) {
- (void)parse_assignment_expression();
- if (token.type != ',')
- break;
- 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);
+ return candidate;
+ }
+
+ candidate = get_declaration(symbol, NAMESPACE_LABEL);
+ /* if we found a label in the same function, then we already created the
+ * declaration */
+ if (candidate != NULL
+ && candidate->parent_scope == ¤t_function->scope) {
+ return candidate;
+ }
+
+ /* otherwise we need to create a new one */
+ declaration_t *const declaration = allocate_declaration_zero();
+ declaration->namespc = NAMESPACE_LABEL;
+ declaration->symbol = symbol;
+
+ label_push(declaration);
+
+ return declaration;
+}
+
+/**
+ * Parses a GNU && label address expression.
+ */
+static expression_t *parse_label_address(void)
+{
+ source_position_t source_position = token.source_position;
+ eat(T_ANDAND);
+ if (token.type != T_IDENTIFIER) {
+ parse_error_expected("while parsing label address", T_IDENTIFIER, NULL);
+ goto end_error;
+ }
+ symbol_t *symbol = token.v.symbol;
+ next_token();
+
+ declaration_t *label = get_label(symbol);
+
+ label->used = true;
+ label->address_taken = true;
+
+ expression_t *expression = allocate_expression_zero(EXPR_LABEL_ADDRESS);
+ expression->base.source_position = source_position;
+
+ /* label address is threaten as a void pointer */
+ expression->base.type = type_void_ptr;
+ expression->label_address.declaration = label;
+ return expression;
+end_error:
+ return create_invalid_expression();
+}
+
+/**
+ * Parse a microsoft __noop expression.
+ */
+static expression_t *parse_noop_expression(void)
+{
+ source_position_t source_position = *HERE;
+ eat(T___noop);
+
+ if (token.type == '(') {
+ /* parse arguments */
+ eat('(');
+ add_anchor_token(')');
+ add_anchor_token(',');
+
+ if (token.type != ')') {
+ while(true) {
+ (void)parse_assignment_expression();
+ if (token.type != ',')
+ break;
+ next_token();
+ }
+ }
}
rem_anchor_token(',');
rem_anchor_token(')');
case T___builtin_constant_p: return parse_builtin_constant();
case T___builtin_prefetch: return parse_builtin_prefetch();
case T__assume: return parse_assume();
+ case T_ANDAND:
+ if (c_mode & _GNUC)
+ return parse_label_address();
+ break;
- case '(': return parse_brace_expression();
+ case '(': return parse_parenthesized_expression();
case T___noop: return parse_noop_expression();
}
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;
}
parse_error_expected("while parsing select", T_IDENTIFIER, NULL);
return select;
}
- symbol_t *symbol = token.v.symbol;
- select->select.symbol = symbol;
+ symbol_t *symbol = token.v.symbol;
next_token();
type_t *const orig_type = compound->base.type;
type_t *const type = skip_typeref(orig_type);
- type_t *type_left = type;
- if (is_pointer) {
- if (!is_type_pointer(type)) {
- if (is_type_valid(type)) {
- errorf(HERE, "left hand side of '->' is not a pointer, but '%T'", orig_type);
- }
- return create_invalid_expression();
+ type_t *type_left;
+ bool saw_error = false;
+ if (is_type_pointer(type)) {
+ if (!is_pointer) {
+ errorf(HERE,
+ "request for member '%Y' in something not a struct or union, but '%T'",
+ symbol, orig_type);
+ saw_error = true;
}
- type_left = type->pointer.points_to;
- }
- type_left = skip_typeref(type_left);
-
- if (type_left->kind != TYPE_COMPOUND_STRUCT &&
- type_left->kind != TYPE_COMPOUND_UNION) {
- if (is_type_valid(type_left)) {
- errorf(HERE, "request for member '%Y' in something not a struct or "
- "union, but '%T'", symbol, type_left);
+ type_left = skip_typeref(type->pointer.points_to);
+ } else {
+ if (is_pointer && is_type_valid(type)) {
+ errorf(HERE, "left hand side of '->' is not a pointer, but '%T'", orig_type);
+ saw_error = true;
}
- return create_invalid_expression();
+ type_left = type;
}
- declaration_t *const declaration = type_left->compound.declaration;
+ declaration_t *entry;
+ if (type_left->kind == TYPE_COMPOUND_STRUCT ||
+ type_left->kind == TYPE_COMPOUND_UNION) {
+ declaration_t *const declaration = type_left->compound.declaration;
- if (!declaration->init.complete) {
- errorf(HERE, "request for member '%Y' of incomplete type '%T'",
- symbol, type_left);
- return create_invalid_expression();
- }
+ if (!declaration->init.complete) {
+ errorf(HERE, "request for member '%Y' of incomplete type '%T'",
+ symbol, type_left);
+ goto create_error_entry;
+ }
- declaration_t *iter = find_compound_entry(declaration, symbol);
- if (iter == NULL) {
- errorf(HERE, "'%T' has no member named '%Y'", orig_type, symbol);
- return create_invalid_expression();
+ entry = find_compound_entry(declaration, symbol);
+ if (entry == NULL) {
+ errorf(HERE, "'%T' has no member named '%Y'", orig_type, symbol);
+ goto create_error_entry;
+ }
+ } else {
+ if (is_type_valid(type_left) && !saw_error) {
+ errorf(HERE,
+ "request for member '%Y' in something not a struct or union, but '%T'",
+ symbol, type_left);
+ }
+create_error_entry:
+ entry = allocate_declaration_zero();
+ entry->symbol = symbol;
}
+ select->select.compound_entry = entry;
+
+ type_t *const res_type =
+ get_qualified_type(entry->type, type_left->base.qualifiers);
+
/* we always do the auto-type conversions; the & and sizeof parser contains
* code to revert this! */
- type_t *expression_type = automatic_type_conversion(iter->type);
+ select->base.type = automatic_type_conversion(res_type);
- select->select.compound_entry = iter;
- select->base.type = expression_type;
-
- type_t *skipped = skip_typeref(iter->type);
+ type_t *skipped = skip_typeref(res_type);
if (skipped->kind == TYPE_BITFIELD) {
select->base.type = skipped->bitfield.base_type;
}
}
static void check_call_argument(const function_parameter_t *parameter,
- call_argument_t *argument)
+ call_argument_t *argument, unsigned pos)
{
type_t *expected_type = parameter->type;
type_t *expected_type_skip = skip_typeref(expected_type);
assign_error_t error = ASSIGN_ERROR_INCOMPATIBLE;
expression_t *arg_expr = argument->expression;
+ type_t *arg_type = skip_typeref(arg_expr->base.type);
/* handle transparent union gnu extension */
if (is_type_union(expected_type_skip)
argument->expression = create_implicit_cast(argument->expression,
expected_type);
- /* TODO report exact scope in error messages (like "in 3rd parameter") */
- report_assign_error(error, expected_type, arg_expr, "function call",
- &arg_expr->base.source_position);
+ if (error != ASSIGN_SUCCESS) {
+ /* report exact scope in error messages (like "in argument 3") */
+ char buf[64];
+ 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) {
+ 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_skip, promoted_type);
+ }
+ }
}
/**
if (token.type != ')') {
call_argument_t *last_argument = NULL;
- while(true) {
+ while (true) {
call_argument_t *argument = allocate_ast_zero(sizeof(argument[0]));
argument->expression = parse_assignment_expression();
function_parameter_t *parameter = function_type->parameters;
call_argument_t *argument = call->arguments;
if (!function_type->unspecified_parameters) {
- for( ; parameter != NULL && argument != NULL;
+ for (unsigned pos = 0; parameter != NULL && argument != NULL;
parameter = parameter->next, argument = argument->next) {
- check_call_argument(parameter, argument);
+ check_call_argument(parameter, argument, ++pos);
}
if (parameter != NULL) {
check_format(&result->call);
+ if (warning.aggregate_return &&
+ is_type_compound(skip_typeref(function_type->return_type))) {
+ warningf(&result->base.source_position,
+ "function call has aggregate value");
+ }
+
return result;
end_error:
return create_invalid_expression();
&expression->base.source_position, condition_type_orig);
}
- expression_t *true_expression = parse_expression();
+ expression_t *true_expression = expression;
+ bool gnu_cond = false;
+ if ((c_mode & _GNUC) && token.type == ':') {
+ gnu_cond = true;
+ } else
+ true_expression = parse_expression();
rem_anchor_token(':');
expect(':');
expression_t *false_expression = parse_sub_expression(precedence);
to = type_void;
}
- type_t *const copy = duplicate_type(to);
- copy->base.qualifiers = to1->base.qualifiers | to2->base.qualifiers;
-
- type_t *const type = typehash_insert(copy);
- if (type != copy)
- free_type(copy);
-
+ type_t *const type =
+ get_qualified_type(to, to1->base.qualifiers | to2->base.qualifiers);
result_type = make_pointer_type(type, TYPE_QUALIFIER_NONE);
} else if (is_type_integer(other_type)) {
warningf(&conditional->base.source_position,
}
conditional->true_expression
- = create_implicit_cast(true_expression, result_type);
+ = gnu_cond ? NULL : create_implicit_cast(true_expression, result_type);
conditional->false_expression
= create_implicit_cast(false_expression, result_type);
conditional->base.type = result_type;
type_t *points_to = pointer_type->pointer.points_to;
points_to = skip_typeref(points_to);
- if (is_type_incomplete(points_to) &&
- (! (c_mode & _GNUC)
- || !is_type_atomic(points_to, ATOMIC_TYPE_VOID))) {
- errorf(source_position,
- "arithmetic with pointer to incomplete type '%T' not allowed",
- orig_pointer_type);
- return false;
+ if (is_type_incomplete(points_to)) {
+ if (!(c_mode & _GNUC) || !is_type_atomic(points_to, ATOMIC_TYPE_VOID)) {
+ errorf(source_position,
+ "arithmetic with pointer to incomplete type '%T' not allowed",
+ orig_pointer_type);
+ return false;
+ } else if (warning.pointer_arith) {
+ warningf(source_position,
+ "pointer of type '%T' used in arithmetic",
+ orig_pointer_type);
+ }
} else if (is_type_function(points_to)) {
- errorf(source_position,
- "arithmetic with pointer to function type '%T' not allowed",
- orig_pointer_type);
- return false;
+ if (!(c_mode && _GNUC)) {
+ errorf(source_position,
+ "arithmetic with pointer to function type '%T' not allowed",
+ orig_pointer_type);
+ return false;
+ } else if (warning.pointer_arith) {
+ warningf(source_position,
+ "pointer to a function '%T' used in arithmetic",
+ orig_pointer_type);
+ }
}
return true;
}
+static bool is_lvalue(const expression_t *expression)
+{
+ switch (expression->kind) {
+ case EXPR_REFERENCE:
+ case EXPR_ARRAY_ACCESS:
+ case EXPR_SELECT:
+ case EXPR_UNARY_DEREFERENCE:
+ return true;
+
+ default:
+ return false;
+ }
+}
+
static void semantic_incdec(unary_expression_t *expression)
{
type_t *const orig_type = expression->value->base.type;
"operation needs an arithmetic or pointer type");
return;
}
+ if (!is_lvalue(expression->value)) {
+ /* TODO: improve error message */
+ errorf(&expression->base.source_position, "lvalue required as operand");
+ }
expression->base.type = orig_type;
}
if (is_type_valid(type)) {
/* TODO: improve error message */
errorf(&expression->base.source_position,
- "operation needs an arithmetic type");
+ "operation needs an arithmetic type");
}
return;
}
expression->base.type = orig_type;
}
+static void semantic_unexpr_plus(unary_expression_t *expression)
+{
+ semantic_unexpr_arithmetic(expression);
+ if (warning.traditional)
+ warningf(&expression->base.source_position,
+ "traditional C rejects the unary plus operator");
+}
+
static void semantic_not(unary_expression_t *expression)
{
type_t *const orig_type = expression->value->base.type;
if (!is_type_pointer(type)) {
if (is_type_valid(type)) {
errorf(&expression->base.source_position,
- "Unary '*' needs pointer or arrray type, but type '%T' given", orig_type);
+ "Unary '*' needs pointer or array type, but type '%T' given", orig_type);
}
return;
}
expression->base.type = result_type;
}
+/**
+ * Record that an address is taken (expression represents an lvalue).
+ *
+ * @param expression the expression
+ * @param may_be_register if true, the expression might be an register
+ */
static void set_address_taken(expression_t *expression, bool may_be_register)
{
if (expression->kind != EXPR_REFERENCE)
CREATE_UNARY_EXPRESSION_PARSER('-', EXPR_UNARY_NEGATE,
semantic_unexpr_arithmetic)
CREATE_UNARY_EXPRESSION_PARSER('+', EXPR_UNARY_PLUS,
- semantic_unexpr_arithmetic)
+ semantic_unexpr_plus)
CREATE_UNARY_EXPRESSION_PARSER('!', EXPR_UNARY_NOT,
semantic_not)
CREATE_UNARY_EXPRESSION_PARSER('*', EXPR_UNARY_DEREFERENCE,
{
/* 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;
bool const signed_left = is_type_signed(type_left);
bool const signed_right = is_type_signed(type_right);
- int const rank_left = get_rank(type_left);
- int const rank_right = get_rank(type_right);
+ int const rank_left = get_rank(type_left);
+ int const rank_right = get_rank(type_right);
if (signed_left == signed_right)
return rank_left >= rank_right ? type_left : type_right;
if (u_rank >= s_rank)
return u_type;
- if (get_atomic_type_size(s_rank) > get_atomic_type_size(u_rank))
+ /* casting rank to atomic_type_kind is a bit hacky, but makes things
+ * easier here... */
+ if (get_atomic_type_size((atomic_type_kind_t) s_rank)
+ > get_atomic_type_size((atomic_type_kind_t) u_rank))
return s_type;
switch (s_rank) {
- case ATOMIC_TYPE_INT: return type_int;
- case ATOMIC_TYPE_LONG: return type_long;
- case ATOMIC_TYPE_LONGLONG: return type_long_long;
+ case ATOMIC_TYPE_INT: return type_unsigned_int;
+ case ATOMIC_TYPE_LONG: return type_unsigned_long;
+ case ATOMIC_TYPE_LONGLONG: return type_unsigned_long_long;
default: panic("invalid atomic type");
}
expression->base.type = arithmetic_type;
}
+static void warn_div_by_zero(binary_expression_t const *const expression)
+{
+ 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");
+ }
+}
+
+/**
+ * Check the semantic restrictions for a div/mod expression.
+ */
+static void semantic_divmod_arithmetic(binary_expression_t *expression) {
+ semantic_binexpr_arithmetic(expression);
+ warn_div_by_zero(expression);
+}
+
static void semantic_shift_op(binary_expression_t *expression)
{
expression_t *const left = expression->left;
return false;
}
-static bool is_lvalue(const expression_t *expression)
-{
- switch (expression->kind) {
- case EXPR_REFERENCE:
- case EXPR_ARRAY_ACCESS:
- case EXPR_SELECT:
- case EXPR_UNARY_DEREFERENCE:
- return true;
-
- default:
- return false;
- }
-}
-
static bool is_valid_assignment_lhs(expression_t const* const left)
{
type_t *const orig_type_left = revert_automatic_type_conversion(left);
expression->base.type = type_left;
}
+static void semantic_divmod_assign(binary_expression_t *expression)
+{
+ semantic_arithmetic_assign(expression);
+ warn_div_by_zero(expression);
+}
+
static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression)
{
expression_t *const left = expression->left;
expression_t *left = expression->left;
type_t *orig_type_left = left->base.type;
- type_t *type_left = revert_automatic_type_conversion(left);
- type_left = skip_typeref(orig_type_left);
-
if (!is_valid_assignment_lhs(left))
return;
case EXPR_WIDE_CHARACTER_CONSTANT: return false;
case EXPR_STRING_LITERAL: return false;
case EXPR_WIDE_STRING_LITERAL: return false;
+ case EXPR_LABEL_ADDRESS: return false;
case EXPR_CALL: {
const call_expression_t *const call = &expr->call;
CREATE_BINEXPR_PARSER(',', EXPR_BINARY_COMMA, semantic_comma, 1)
CREATE_BINEXPR_PARSER('*', EXPR_BINARY_MUL, semantic_binexpr_arithmetic, 1)
-CREATE_BINEXPR_PARSER('/', EXPR_BINARY_DIV, semantic_binexpr_arithmetic, 1)
-CREATE_BINEXPR_PARSER('%', EXPR_BINARY_MOD, semantic_binexpr_arithmetic, 1)
+CREATE_BINEXPR_PARSER('/', EXPR_BINARY_DIV, semantic_divmod_arithmetic, 1)
+CREATE_BINEXPR_PARSER('%', EXPR_BINARY_MOD, semantic_divmod_arithmetic, 1)
CREATE_BINEXPR_PARSER('+', EXPR_BINARY_ADD, semantic_add, 1)
CREATE_BINEXPR_PARSER('-', EXPR_BINARY_SUB, semantic_sub, 1)
CREATE_BINEXPR_PARSER('<', EXPR_BINARY_LESS, semantic_comparison, 1)
CREATE_BINEXPR_PARSER(T_ASTERISKEQUAL, EXPR_BINARY_MUL_ASSIGN,
semantic_arithmetic_assign, 0)
CREATE_BINEXPR_PARSER(T_SLASHEQUAL, EXPR_BINARY_DIV_ASSIGN,
- semantic_arithmetic_assign, 0)
+ semantic_divmod_assign, 0)
CREATE_BINEXPR_PARSER(T_PERCENTEQUAL, EXPR_BINARY_MOD_ASSIGN,
- semantic_arithmetic_assign, 0)
+ semantic_divmod_assign, 0)
CREATE_BINEXPR_PARSER(T_LESSLESSEQUAL, EXPR_BINARY_SHIFTLEFT_ASSIGN,
semantic_arithmetic_assign, 0)
CREATE_BINEXPR_PARSER(T_GREATERGREATEREQUAL, EXPR_BINARY_SHIFTRIGHT_ASSIGN,
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 (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)
+ 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)
return create_invalid_statement();
}
-/**
- * Finds an existing default label of a switch statement.
- */
-static case_label_statement_t *
-find_default_label(const switch_statement_t *statement)
-{
- case_label_statement_t *label = statement->first_case;
- for ( ; label != NULL; label = label->next) {
- if (label->expression == NULL)
- return label;
- }
- return NULL;
-}
-
/**
* Parse a default statement.
*/
expect(':');
if (current_switch != NULL) {
- const case_label_statement_t *def_label = find_default_label(current_switch);
+ const case_label_statement_t *def_label = current_switch->default_label;
if (def_label != NULL) {
errorf(HERE, "multiple default labels in one switch (previous declared %P)",
&def_label->base.source_position);
} else {
+ current_switch->default_label = &statement->case_label;
+
/* link all cases into the switch statement */
if (current_switch->last_case == NULL) {
current_switch->first_case = &statement->case_label;
return create_invalid_statement();
}
-/**
- * Return the declaration for a given label symbol or create a new one.
- *
- * @param symbol the symbol of the label
- */
-static declaration_t *get_label(symbol_t *symbol)
-{
- declaration_t *candidate = get_declaration(symbol, NAMESPACE_LABEL);
- assert(current_function != NULL);
- /* if we found a label in the same function, then we already created the
- * declaration */
- if (candidate != NULL
- && candidate->parent_scope == ¤t_function->scope) {
- return candidate;
- }
-
- /* otherwise we need to create a new one */
- declaration_t *const declaration = allocate_declaration_zero();
- declaration->namespc = NAMESPACE_LABEL;
- declaration->symbol = symbol;
-
- label_push(declaration);
-
- return declaration;
-}
-
/**
* Parse a label statement.
*/
PUSH_PARENT(statement);
- /* if source position is already set then the label is defined twice,
- * otherwise it was just mentioned in a goto so far */
- if (label->source_position.input_name != NULL) {
+ /* if statement is already set then the label is defined twice,
+ * otherwise it was just mentioned in a goto/local label declaration so far */
+ if (label->init.statement != NULL) {
errorf(HERE, "duplicate label '%Y' (declared %P)",
symbol, &label->source_position);
} else {
return create_invalid_statement();
}
+/**
+ * Check that all enums are handled in a switch.
+ *
+ * @param statement the switch statement to check
+ */
+static void check_enum_cases(const switch_statement_t *statement) {
+ const type_t *type = skip_typeref(statement->expression->base.type);
+ if (! is_type_enum(type))
+ return;
+ const enum_type_t *enumt = &type->enumt;
+
+ /* if we have a default, no warnings */
+ if (statement->default_label != NULL)
+ return;
+
+ /* FIXME: calculation of value should be done while parsing */
+ const declaration_t *declaration;
+ long last_value = -1;
+ for (declaration = enumt->declaration->next;
+ declaration != NULL && declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY;
+ declaration = declaration->next) {
+ const expression_t *expression = declaration->init.enum_value;
+ long value = expression != NULL ? fold_constant(expression) : last_value + 1;
+ bool found = false;
+ for (const case_label_statement_t *l = statement->first_case; l != NULL; l = l->next) {
+ if (l->expression == NULL)
+ continue;
+ if (l->first_case <= value && value <= l->last_case) {
+ found = true;
+ break;
+ }
+ }
+ if (! found) {
+ warningf(&statement->base.source_position,
+ "enumeration value '%Y' not handled in switch", declaration->symbol);
+ }
+ last_value = value;
+ }
+}
+
/**
* Parse a switch statement.
*/
PUSH_PARENT(statement);
expect('(');
+ add_anchor_token(')');
expression_t *const expr = parse_expression();
type_t * type = skip_typeref(expr->base.type);
if (is_type_integer(type)) {
type = promote_integer(type);
+ if (warning.traditional) {
+ if (get_rank(type) >= get_akind_rank(ATOMIC_TYPE_LONG)) {
+ warningf(&expr->base.source_position,
+ "'%T' switch expression not converted to '%T' in ISO C",
+ type, type_int);
+ }
+ }
} else if (is_type_valid(type)) {
errorf(&expr->base.source_position,
"switch quantity is not an integer, but '%T'", type);
}
statement->switchs.expression = create_implicit_cast(expr, type);
expect(')');
+ rem_anchor_token(')');
switch_statement_t *rem = current_switch;
current_switch = &statement->switchs;
current_switch = rem;
if (warning.switch_default &&
- find_default_label(&statement->switchs) == NULL) {
+ statement->switchs.default_label == NULL) {
warningf(&statement->base.source_position, "switch has no default case");
}
+ if (warning.switch_enum)
+ check_enum_cases(&statement->switchs);
POP_PARENT;
return statement;
*/
static statement_t *parse_goto(void)
{
+ source_position_t source_position = token.source_position;
eat(T_goto);
- if (token.type != T_IDENTIFIER) {
- parse_error_expected("while parsing goto", T_IDENTIFIER, NULL);
- eat_statement();
- goto end_error;
- }
- symbol_t *symbol = token.v.symbol;
- next_token();
+ statement_t *statement;
+ if (c_mode & _GNUC && token.type == '*') {
+ next_token();
+ expression_t *expression = parse_expression();
- declaration_t *label = get_label(symbol);
+ /* Argh: although documentation say the expression must be of type void *,
+ * gcc excepts anything that can be casted into void * without error */
+ type_t *type = expression->base.type;
- statement_t *statement = allocate_statement_zero(STATEMENT_GOTO);
- statement->base.source_position = token.source_position;
+ if (type != type_error_type) {
+ if (!is_type_pointer(type) && !is_type_integer(type)) {
+ errorf(&source_position, "cannot convert to a pointer type");
+ } else if (type != type_void_ptr) {
+ warningf(&source_position,
+ "type of computed goto expression should be 'void*' not '%T'", type);
+ }
+ expression = create_implicit_cast(expression, type_void_ptr);
+ }
- statement->gotos.label = label;
+ statement = allocate_statement_zero(STATEMENT_GOTO);
+ statement->base.source_position = source_position;
+ statement->gotos.expression = expression;
+ } else {
+ if (token.type != T_IDENTIFIER) {
+ if (c_mode & _GNUC)
+ parse_error_expected("while parsing goto", T_IDENTIFIER, '*', NULL);
+ else
+ parse_error_expected("while parsing goto", T_IDENTIFIER, NULL);
+ eat_statement();
+ goto end_error;
+ }
+ symbol_t *symbol = token.v.symbol;
+ next_token();
+
+ statement = allocate_statement_zero(STATEMENT_GOTO);
+ statement->base.source_position = source_position;
+ statement->gotos.label = get_label(symbol);
+ }
/* remember the goto's in a list for later checking */
if (goto_last == NULL) {
*/
static statement_t *parse_continue(void)
{
- statement_t *statement;
if (current_loop == NULL) {
errorf(HERE, "continue statement not within loop");
- statement = create_invalid_statement();
- } else {
- statement = allocate_statement_zero(STATEMENT_CONTINUE);
-
- statement->base.source_position = token.source_position;
}
+ statement_t *statement = allocate_statement_zero(STATEMENT_CONTINUE);
+ statement->base.source_position = token.source_position;
+
eat(T_continue);
expect(';');
- return statement;
end_error:
- return create_invalid_statement();
+ return statement;
}
/**
*/
static statement_t *parse_break(void)
{
- statement_t *statement;
if (current_switch == NULL && current_loop == NULL) {
errorf(HERE, "break statement not within loop or switch");
- statement = create_invalid_statement();
- } else {
- statement = allocate_statement_zero(STATEMENT_BREAK);
-
- statement->base.source_position = token.source_position;
}
+ statement_t *statement = allocate_statement_zero(STATEMENT_BREAK);
+ statement->base.source_position = token.source_position;
+
eat(T_break);
expect(';');
- return statement;
end_error:
- return create_invalid_statement();
+ return statement;
}
/**
* Parse a __leave statement.
*/
-static statement_t *parse_leave(void)
+static statement_t *parse_leave_statement(void)
{
- statement_t *statement;
if (current_try == NULL) {
errorf(HERE, "__leave statement not within __try");
- statement = create_invalid_statement();
- } else {
- statement = allocate_statement_zero(STATEMENT_LEAVE);
-
- statement->base.source_position = token.source_position;
}
+ statement_t *statement = allocate_statement_zero(STATEMENT_LEAVE);
+ statement->base.source_position = token.source_position;
+
eat(T___leave);
expect(';');
- return statement;
end_error:
- return create_invalid_statement();
+ return statement;
}
/**
if (token.type != ';') {
return_value = parse_expression();
}
- expect(';');
const type_t *const func_type = current_function->type;
assert(is_type_function(func_type));
}
statement->returns.value = return_value;
- return statement;
+ expect(';');
+
end_error:
- return create_invalid_statement();
+ return statement;
}
/**
expect(';');
- return statement;
end_error:
- return create_invalid_statement();
+ return statement;
}
/**
static statement_t *parse_ms_try_statment(void)
{
statement_t *statement = allocate_statement_zero(STATEMENT_MS_TRY);
-
statement->base.source_position = token.source_position;
eat(T___try);
+ PUSH_PARENT(statement);
+
ms_try_statement_t *rem = current_try;
current_try = &statement->ms_try;
statement->ms_try.try_statement = parse_compound_statement(false);
current_try = rem;
+ POP_PARENT;
+
if (token.type == T___except) {
eat(T___except);
expect('(');
if (warning.empty_statement) {
warningf(HERE, "statement is empty");
}
+ statement_t *const statement = create_empty_statement();
eat(';');
- return create_empty_statement();
+ return statement;
+}
+
+static statement_t *parse_local_label_declaration(void) {
+ statement_t *statement = allocate_statement_zero(STATEMENT_DECLARATION);
+ statement->base.source_position = token.source_position;
+
+ eat(T___label__);
+
+ declaration_t *begin = NULL, *end = NULL;
+
+ while (true) {
+ if (token.type != T_IDENTIFIER) {
+ parse_error_expected("while parsing local label declaration",
+ T_IDENTIFIER, NULL);
+ goto end_error;
+ }
+ symbol_t *symbol = token.v.symbol;
+ declaration_t *declaration = get_declaration(symbol, NAMESPACE_LOCAL_LABEL);
+ if (declaration != NULL) {
+ errorf(HERE, "multiple definitions of '__label__ %Y' (previous definition at %P)",
+ symbol, &declaration->source_position);
+ } else {
+ declaration = allocate_declaration_zero();
+ declaration->namespc = NAMESPACE_LOCAL_LABEL;
+ declaration->source_position = token.source_position;
+ declaration->symbol = symbol;
+ declaration->parent_scope = scope;
+ declaration->init.statement = NULL;
+
+ if (end != NULL)
+ end->next = declaration;
+ end = declaration;
+ if (begin == NULL)
+ begin = declaration;
+
+ local_label_push(declaration);
+ }
+ next_token();
+
+ if (token.type != ',')
+ break;
+ next_token();
+ }
+ eat(';');
+end_error:
+ statement->declaration.declarations_begin = begin;
+ statement->declaration.declarations_end = end;
+ return statement;
}
/**
/* declaration or statement */
add_anchor_token(';');
switch (token.type) {
- case T_IDENTIFIER:
- if (look_ahead(1)->type == ':') {
+ case T_IDENTIFIER: {
+ token_type_t la1_type = (token_type_t)look_ahead(1)->type;
+ if (la1_type == ':') {
statement = parse_label_statement();
} else if (is_typedef_symbol(token.v.symbol)) {
statement = parse_declaration_statement();
- } else {
- statement = parse_expression_statement();
+ } else switch (la1_type) {
+ case '*':
+ if (get_declaration(token.v.symbol, NAMESPACE_NORMAL) != NULL)
+ goto expression_statment;
+ /* FALLTHROUGH */
+
+ DECLARATION_START
+ case T_IDENTIFIER:
+ statement = parse_declaration_statement();
+ break;
+
+ default:
+expression_statment:
+ statement = parse_expression_statement();
+ break;
}
break;
+ }
case T___extension__:
/* This can be a prefix to a declaration or an expression statement.
statement = parse_declaration_statement();
break;
+ case T___label__:
+ statement = parse_local_label_declaration();
+ break;
+
case ';': statement = parse_empty_statement(); break;
case '{': statement = parse_compound_statement(false); break;
- case T___leave: statement = parse_leave(); 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;
add_anchor_token('}');
int top = environment_top();
+ int top_local = local_label_top();
scope_t *last_scope = scope;
set_scope(&statement->compound.scope);
- statement_t *last_statement = NULL;
-
- bool only_decls_so_far = true;
+ statement_t **anchor = &statement->compound.statements;
+ bool only_decls_so_far = true;
while (token.type != '}' && token.type != T_EOF) {
statement_t *sub_statement = intern_parse_statement();
if (is_invalid_statement(sub_statement)) {
}
}
- if (last_statement != NULL) {
- last_statement->base.next = sub_statement;
- } else {
- statement->compound.statements = sub_statement;
- }
+ *anchor = sub_statement;
while (sub_statement->base.next != NULL)
sub_statement = sub_statement->base.next;
- last_statement = sub_statement;
+ anchor = &sub_statement->base.next;
}
if (token.type == '}') {
assert(scope == &statement->compound.scope);
set_scope(last_scope);
environment_pop_to(top);
+ local_label_pop_to(top_local);
POP_PARENT;
return statement;
type_ptrdiff_t = make_global_typedef("__PTRDIFF_TYPE__", type_long);
type_uintmax_t = make_global_typedef("__uintmax_t__", type_unsigned_long_long);
type_uptrdiff_t = make_global_typedef("__UPTRDIFF_TYPE__", type_unsigned_long);
- type_wchar_t = make_global_typedef("__WCHAR_TYPE__", type_int);
+ type_wchar_t = make_global_typedef("__WCHAR_TYPE__", opt_short_wchar_t ? type_unsigned_short : type_int);
type_wint_t = make_global_typedef("__WINT_TYPE__", type_int);
type_intmax_t_ptr = make_pointer_type(type_intmax_t, TYPE_QUALIFIER_NONE);
type_ptrdiff_t_ptr = make_pointer_type(type_ptrdiff_t, TYPE_QUALIFIER_NONE);
type_ssize_t_ptr = make_pointer_type(type_ssize_t, TYPE_QUALIFIER_NONE);
type_wchar_t_ptr = make_pointer_type(type_wchar_t, TYPE_QUALIFIER_NONE);
+
+ /* const version of wchar_t */
+ type_const_wchar_t = allocate_type_zero(TYPE_TYPEDEF, &builtin_source_position);
+ type_const_wchar_t->typedeft.declaration = type_wchar_t->typedeft.declaration;
+ type_const_wchar_t->base.qualifiers |= TYPE_QUALIFIER_CONST;
+
+ type_const_wchar_t_ptr = make_pointer_type(type_const_wchar_t, TYPE_QUALIFIER_NONE);
}
/**
{
environment_stack = NEW_ARR_F(stack_entry_t, 0);
label_stack = NEW_ARR_F(stack_entry_t, 0);
+ local_label_stack = NEW_ARR_F(stack_entry_t, 0);
diagnostic_count = 0;
error_count = 0;
warning_count = 0;
DEL_ARR_F(environment_stack);
DEL_ARR_F(label_stack);
+ DEL_ARR_F(local_label_stack);
translation_unit_t *result = unit;
unit = NULL;
void parse(void)
{
lookahead_bufpos = 0;
- for(int i = 0; i < MAX_LOOKAHEAD + 2; ++i) {
+ for (int i = 0; i < MAX_LOOKAHEAD + 2; ++i) {
next_token();
}
parse_translation_unit();
*/
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