typedef struct {
declaration_t *old_declaration;
symbol_t *symbol;
- unsigned short namespace;
+ unsigned short namespc;
} stack_entry_t;
static token_t token;
static bool found_error;
static type_t *type_int = NULL;
-static type_t *type_uint = NULL;
static type_t *type_long_double = NULL;
static type_t *type_double = NULL;
static type_t *type_float = NULL;
-static type_t *type_const_char = NULL;
+static type_t *type_char = NULL;
static type_t *type_string = NULL;
static type_t *type_void = NULL;
+static type_t *type_void_ptr = NULL;
static type_t *type_size_t = NULL;
static type_t *type_ptrdiff_t = NULL;
#ifdef PROVIDE_COMPLEX
#define COMPLEX_SPECIFIERS \
case T__Complex:
-#else
-#define COMPLEX_SPECIFIERS
-#endif
-
-#ifdef PROVIDE_IMAGINARY
#define IMAGINARY_SPECIFIERS \
case T__Imaginary:
#else
+#define COMPLEX_SPECIFIERS
#define IMAGINARY_SPECIFIERS
#endif
TYPE_QUALIFIERS \
TYPE_SPECIFIERS
-static inline void *allocate_ast_zero(size_t size)
+static void *allocate_ast_zero(size_t size)
{
void *res = allocate_ast(size);
memset(res, 0, size);
return res;
}
-static inline void *allocate_type_zero(size_t size)
+static size_t get_expression_struct_size(expression_type_t type)
+{
+ static const size_t sizes[] = {
+ [EXPR_INVALID] = sizeof(expression_base_t),
+ [EXPR_REFERENCE] = sizeof(reference_expression_t),
+ [EXPR_CONST] = sizeof(const_expression_t),
+ [EXPR_STRING_LITERAL] = sizeof(string_literal_expression_t),
+ [EXPR_CALL] = sizeof(call_expression_t),
+ [EXPR_UNARY] = sizeof(unary_expression_t),
+ [EXPR_BINARY] = sizeof(binary_expression_t),
+ [EXPR_CONDITIONAL] = sizeof(conditional_expression_t),
+ [EXPR_SELECT] = sizeof(select_expression_t),
+ [EXPR_ARRAY_ACCESS] = sizeof(array_access_expression_t),
+ [EXPR_SIZEOF] = sizeof(sizeof_expression_t),
+ [EXPR_CLASSIFY_TYPE] = sizeof(classify_type_expression_t),
+ [EXPR_FUNCTION] = sizeof(string_literal_expression_t),
+ [EXPR_PRETTY_FUNCTION] = sizeof(string_literal_expression_t),
+ [EXPR_BUILTIN_SYMBOL] = sizeof(builtin_symbol_expression_t),
+ [EXPR_OFFSETOF] = sizeof(offsetof_expression_t),
+ [EXPR_VA_ARG] = sizeof(va_arg_expression_t),
+ [EXPR_STATEMENT] = sizeof(statement_expression_t)
+ };
+ assert(sizeof(sizes) / sizeof(sizes[0]) == EXPR_STATEMENT + 1);
+ assert(type <= EXPR_STATEMENT);
+ assert(sizes[type] != 0);
+ return sizes[type];
+}
+
+static expression_t *allocate_expression_zero(expression_type_t type)
+{
+ size_t size = get_expression_struct_size(type);
+ expression_t *res = allocate_ast_zero(size);
+
+ res->base.type = type;
+ return res;
+}
+
+static size_t get_type_struct_size(type_type_t type)
{
- void *res = obstack_alloc(type_obst, size);
+ static const size_t sizes[] = {
+ [TYPE_ATOMIC] = sizeof(atomic_type_t),
+ [TYPE_COMPOUND_STRUCT] = sizeof(compound_type_t),
+ [TYPE_COMPOUND_UNION] = sizeof(compound_type_t),
+ [TYPE_ENUM] = sizeof(enum_type_t),
+ [TYPE_FUNCTION] = sizeof(function_type_t),
+ [TYPE_POINTER] = sizeof(pointer_type_t),
+ [TYPE_ARRAY] = sizeof(array_type_t),
+ [TYPE_BUILTIN] = sizeof(builtin_type_t),
+ [TYPE_TYPEDEF] = sizeof(typedef_type_t),
+ [TYPE_TYPEOF] = sizeof(typeof_type_t),
+ };
+ assert(sizeof(sizes) / sizeof(sizes[0]) == (int) TYPE_TYPEOF + 1);
+ assert(type <= TYPE_TYPEOF);
+ assert(sizes[type] != 0);
+ return sizes[type];
+}
+
+static type_t *allocate_type_zero(type_type_t type)
+{
+ size_t size = get_type_struct_size(type);
+ type_t *res = obstack_alloc(type_obst, size);
memset(res, 0, size);
+
+ res->base.type = type;
return res;
}
-static inline void free_type(void *type)
+static size_t get_initializer_size(initializer_type_t type)
+{
+ static const size_t sizes[] = {
+ [INITIALIZER_VALUE] = sizeof(initializer_value_t),
+ [INITIALIZER_STRING] = sizeof(initializer_string_t),
+ [INITIALIZER_LIST] = sizeof(initializer_list_t)
+ };
+ assert(type < INITIALIZER_COUNT);
+ assert(sizes[type] != 0);
+ return sizes[type];
+}
+
+static initializer_t *allocate_initializer(initializer_type_t type)
+{
+ initializer_t *result = allocate_ast_zero(get_initializer_size(type));
+ result->type = type;
+
+ return result;
+}
+
+static void free_type(void *type)
{
obstack_free(type_obst, type);
}
/**
* returns the top element of the environment stack
*/
-static inline size_t environment_top(void)
+static size_t environment_top(void)
{
return ARR_LEN(environment_stack);
}
-static inline size_t label_top(void)
+static size_t label_top(void)
{
return ARR_LEN(label_stack);
}
{
fputs(source_position.input_name, stderr);
fputc(':', stderr);
- fprintf(stderr, "%d", source_position.linenr);
+ fprintf(stderr, "%u", source_position.linenr);
fputs(": ", stderr);
}
fputs("warning: ", stderr);
}
-static void parse_warning(const char *message)
+static void parse_warning_pos(const source_position_t source_position,
+ const char *const message)
{
- parser_print_prefix_pos(token.source_position);
+ parser_print_prefix_pos(source_position);
fprintf(stderr, "warning: %s\n", message);
}
+static void parse_warning(const char *message)
+{
+ parse_warning_pos(token.source_position, message);
+}
+
static void parse_error_expected(const char *message, ...)
{
va_list args;
fprintf(stderr, "%s, but found type ", msg);
print_type_quoted(type);
fputc('\n', stderr);
- error();
}
static void type_error_incompatible(const char *msg,
fprintf(stderr, " - ");
print_type_quoted(type2);
fprintf(stderr, ")\n");
- error();
}
static void eat_block(void)
} \
next_token();
+#define expect_block(expected) \
+ if(UNLIKELY(token.type != (expected))) { \
+ parse_error_expected(NULL, (expected), 0); \
+ eat_block(); \
+ return NULL; \
+ } \
+ next_token();
+
#define expect_void(expected) \
if(UNLIKELY(token.type != (expected))) { \
parse_error_expected(NULL, (expected), 0); \
static bool is_compatible_declaration (declaration_t *declaration,
declaration_t *previous)
{
+ if (declaration->type->type == TYPE_FUNCTION &&
+ previous->type->type == TYPE_FUNCTION &&
+ previous->type->function.unspecified_parameters) {
+ function_type_t* const prev_func = &previous->type->function;
+ function_type_t* const decl_func = &declaration->type->function;
+ if (prev_func->unspecified_parameters &&
+ prev_func->result_type == decl_func->result_type) {
+ declaration->type = previous->type;
+ return true;
+ }
+ }
/* TODO: not correct yet */
return declaration->type == previous->type;
}
-static declaration_t *get_declaration(symbol_t *symbol, namespace_t namespace)
+static declaration_t *get_declaration(symbol_t *symbol, namespace_t namespc)
{
declaration_t *declaration = symbol->declaration;
for( ; declaration != NULL; declaration = declaration->symbol_next) {
- if(declaration->namespace == namespace)
+ if(declaration->namespc == namespc)
return declaration;
}
return NULL;
}
-static const char *get_namespace_prefix(namespace_t namespace)
+static const char *get_namespace_prefix(namespace_t namespc)
{
- switch(namespace) {
+ switch(namespc) {
case NAMESPACE_NORMAL:
return "";
case NAMESPACE_UNION:
context_t *parent_context)
{
symbol_t *symbol = declaration->symbol;
- namespace_t namespace = declaration->namespace;
+ namespace_t namespc = (namespace_t)declaration->namespc;
/* a declaration should be only pushed once */
assert(declaration->parent_context == NULL);
declaration->parent_context = parent_context;
- declaration_t *previous_declaration = get_declaration(symbol, namespace);
+ declaration_t *previous_declaration = get_declaration(symbol, namespc);
assert(declaration != previous_declaration);
if(previous_declaration != NULL
&& previous_declaration->parent_context == context) {
if(!is_compatible_declaration(declaration, previous_declaration)) {
parser_print_error_prefix_pos(declaration->source_position);
fprintf(stderr, "definition of symbol %s%s with type ",
- get_namespace_prefix(namespace), symbol->string);
- error();
+ get_namespace_prefix(namespc), symbol->string);
print_type_quoted(declaration->type);
fputc('\n', stderr);
parser_print_error_prefix_pos(
"of type ");
print_type_quoted(previous_declaration->type);
fputc('\n', stderr);
+ } else {
+ unsigned old_storage_class = previous_declaration->storage_class;
+ unsigned new_storage_class = declaration->storage_class;
+ if (current_function == NULL) {
+ if (old_storage_class != STORAGE_CLASS_STATIC &&
+ new_storage_class == STORAGE_CLASS_STATIC) {
+ parser_print_error_prefix_pos(declaration->source_position);
+ fprintf(stderr,
+ "static declaration of '%s' follows non-static declaration\n",
+ symbol->string);
+ parser_print_error_prefix_pos(previous_declaration->source_position);
+ fprintf(stderr, "previous declaration of '%s' was here\n",
+ symbol->string);
+ } else {
+ if (old_storage_class == STORAGE_CLASS_EXTERN) {
+ if (new_storage_class == STORAGE_CLASS_NONE) {
+ previous_declaration->storage_class = STORAGE_CLASS_NONE;
+ }
+ } else {
+ parser_print_warning_prefix_pos(declaration->source_position);
+ fprintf(stderr, "redundant declaration for '%s'\n",
+ symbol->string);
+ parser_print_warning_prefix_pos(previous_declaration->source_position);
+ fprintf(stderr, "previous declaration of '%s' was here\n",
+ symbol->string);
+ }
+ }
+ } else {
+ if (old_storage_class == STORAGE_CLASS_EXTERN &&
+ new_storage_class == STORAGE_CLASS_EXTERN) {
+ parser_print_warning_prefix_pos(declaration->source_position);
+ fprintf(stderr, "redundant extern declaration for '%s'\n",
+ symbol->string);
+ parser_print_warning_prefix_pos(previous_declaration->source_position);
+ fprintf(stderr, "previous declaration of '%s' was here\n",
+ symbol->string);
+ } else {
+ parser_print_error_prefix_pos(declaration->source_position);
+ if (old_storage_class == new_storage_class) {
+ fprintf(stderr, "redeclaration of '%s'\n", symbol->string);
+ } else {
+ fprintf(stderr, "redeclaration of '%s' with different linkage\n", symbol->string);
+ }
+ parser_print_error_prefix_pos(previous_declaration->source_position);
+ fprintf(stderr, "previous declaration of '%s' was here\n",
+ symbol->string);
+ }
+ }
}
return previous_declaration;
}
stack_entry_t entry;
entry.symbol = symbol;
entry.old_declaration = symbol->declaration;
- entry.namespace = namespace;
- ARR_APP1(*stack_ptr, entry);
+ entry.namespc = (unsigned short) namespc;
+ ARR_APP1(stack_entry_t, *stack_ptr, entry);
/* replace/add declaration into declaration list of the symbol */
if(symbol->declaration == NULL) {
declaration_t *iter = symbol->declaration;
for( ; iter != NULL; iter_last = iter, iter = iter->symbol_next) {
/* replace an entry? */
- if(iter->namespace == namespace) {
+ if(iter->namespc == namespc) {
if(iter_last == NULL) {
symbol->declaration = declaration;
} else {
declaration_t *old_declaration = entry->old_declaration;
symbol_t *symbol = entry->symbol;
- namespace_t namespace = entry->namespace;
+ namespace_t namespc = (namespace_t)entry->namespc;
/* replace/remove declaration */
declaration_t *declaration = symbol->declaration;
assert(declaration != NULL);
- if(declaration->namespace == namespace) {
+ if(declaration->namespc == namespc) {
if(old_declaration == NULL) {
symbol->declaration = declaration->symbol_next;
} else {
symbol->declaration = old_declaration;
- assert(old_declaration->symbol_next ==
- declaration->symbol_next);
}
} else {
declaration_t *iter_last = declaration;
- declaration_t *iter = declaration->next;
+ declaration_t *iter = declaration->symbol_next;
for( ; iter != NULL; iter_last = iter, iter = iter->symbol_next) {
/* replace an entry? */
- if(iter->namespace == namespace) {
+ if(iter->namespc == namespc) {
assert(iter_last != NULL);
iter_last->symbol_next = old_declaration;
- assert(old_declaration->symbol_next ==
- declaration->symbol_next);
+ old_declaration->symbol_next = iter->symbol_next;
break;
}
}
return ATOMIC_TYPE_INT;
assert(type->type == TYPE_ATOMIC);
- atomic_type_t *atomic_type = (atomic_type_t*) type;
- atomic_type_type_t atype = atomic_type->atype;
+ const atomic_type_t *atomic_type = &type->atomic;
+ atomic_type_type_t atype = atomic_type->atype;
return atype;
}
static expression_t *create_cast_expression(expression_t *expression,
type_t *dest_type)
{
- unary_expression_t *cast = allocate_ast_zero(sizeof(cast[0]));
+ expression_t *cast = allocate_expression_zero(EXPR_UNARY);
+
+ cast->unary.type = UNEXPR_CAST;
+ cast->unary.value = expression;
+ cast->base.datatype = dest_type;
+
+ return cast;
+}
+
+static bool is_null_expression(const expression_t *const expression)
+{
+ if (expression->type != EXPR_CONST)
+ return false;
- cast->expression.type = EXPR_UNARY;
- cast->type = UNEXPR_CAST;
- cast->value = expression;
- cast->expression.datatype = dest_type;
+ type_t *const type = skip_typeref(expression->base.datatype);
+ if (!is_type_integer(type))
+ return false;
- return (expression_t*) cast;
+ return expression->conste.v.int_value == 0;
}
static expression_t *create_implicit_cast(expression_t *expression,
type_t *dest_type)
{
- type_t *source_type = expression->datatype;
+ type_t *source_type = expression->base.datatype;
if(source_type == NULL)
return expression;
if(source_type == dest_type)
return expression;
- if(dest_type->type == TYPE_ATOMIC) {
- if(source_type->type != TYPE_ATOMIC)
- panic("casting of non-atomic types not implemented yet");
-
- if(is_type_floating(dest_type) && !is_type_scalar(source_type)) {
- type_error_incompatible("can't cast types",
- expression->source_position,
- source_type, dest_type);
- return expression;
- }
-
- return create_cast_expression(expression, dest_type);
- }
- if(dest_type->type == TYPE_POINTER) {
- pointer_type_t *pointer_type
- = (pointer_type_t*) dest_type;
- if(source_type->type == TYPE_POINTER) {
- if(!pointers_compatible(source_type, dest_type)) {
- type_error_incompatible("can't implicitely cast types",
- expression->source_position,
- source_type, dest_type);
- return expression;
- } else {
- return create_cast_expression(expression, dest_type);
+ switch (dest_type->type) {
+ case TYPE_ENUM:
+ /* TODO warning for implicitly converting to enum */
+ case TYPE_ATOMIC:
+ if (source_type->type != TYPE_ATOMIC &&
+ source_type->type != TYPE_ENUM) {
+ panic("casting of non-atomic types not implemented yet");
}
- } else if(source_type->type == TYPE_ARRAY) {
- array_type_t *array_type = (array_type_t*) source_type;
- if(!types_compatible(array_type->element_type,
- pointer_type->points_to)) {
- type_error_incompatible("can't implicitely cast types",
- expression->source_position,
- source_type, dest_type);
- return expression;
+
+ if(is_type_floating(dest_type) && !is_type_scalar(source_type)) {
+ type_error_incompatible("can't cast types",
+ expression->base.source_position, source_type,
+ dest_type);
+ return expression;
}
+
return create_cast_expression(expression, dest_type);
- }
- }
- panic("casting of non-atomic types not implemented yet");
+ case TYPE_POINTER:
+ switch (source_type->type) {
+ case TYPE_ATOMIC:
+ if (is_null_expression(expression)) {
+ return create_cast_expression(expression, dest_type);
+ }
+ break;
+
+ case TYPE_POINTER:
+ if (pointers_compatible(source_type, dest_type)) {
+ return create_cast_expression(expression, dest_type);
+ }
+ break;
+
+ case TYPE_ARRAY: {
+ array_type_t *array_type = &source_type->array;
+ pointer_type_t *pointer_type = &dest_type->pointer;
+ if (types_compatible(array_type->element_type,
+ pointer_type->points_to)) {
+ return create_cast_expression(expression, dest_type);
+ }
+ break;
+ }
+
+ default:
+ panic("casting of non-atomic types not implemented yet");
+ }
+
+ type_error_incompatible("can't implicitly cast types",
+ expression->base.source_position, source_type, dest_type);
+ return expression;
+
+ default:
+ panic("casting of non-atomic types not implemented yet");
+ }
}
+/** Implements the rules from § 6.5.16.1 */
static void semantic_assign(type_t *orig_type_left, expression_t **right,
const char *context)
{
- type_t *orig_type_right = (*right)->datatype;
+ type_t *orig_type_right = (*right)->base.datatype;
if(orig_type_right == NULL)
return;
- type_t *type_left = skip_typeref(orig_type_left);
- type_t *type_right = skip_typeref(orig_type_right);
+ type_t *const type_left = skip_typeref(orig_type_left);
+ type_t *const type_right = skip_typeref(orig_type_right);
- if(type_left == type_right) {
- /* fine */
- } else if(is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) {
+ if ((is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) ||
+ (is_type_pointer(type_left) && is_null_expression(*right)) ||
+ (is_type_atomic(type_left, ATOMIC_TYPE_BOOL)
+ && is_type_pointer(type_right))) {
*right = create_implicit_cast(*right, type_left);
- } else if(type_left->type == TYPE_POINTER
- && type_right->type == TYPE_POINTER) {
- /* TODO */
- } else {
- /* TODO: improve error message */
- parser_print_error_prefix();
- fprintf(stderr, "incompatible types in %s\n", context);
- parser_print_error_prefix();
- print_type_quoted(type_left);
- fputs(" <- ", stderr);
- print_type_quoted(type_right);
- fputs("\n", stderr);
+ return;
}
+ if (is_type_pointer(type_left) && is_type_pointer(type_right)) {
+ pointer_type_t *pointer_type_left = &type_left->pointer;
+ pointer_type_t *pointer_type_right = &type_right->pointer;
+ type_t *points_to_left = pointer_type_left->points_to;
+ type_t *points_to_right = pointer_type_right->points_to;
+
+ points_to_left = skip_typeref(points_to_left);
+ points_to_right = skip_typeref(points_to_right);
+
+ if(!is_type_atomic(points_to_left, ATOMIC_TYPE_VOID)
+ && !is_type_atomic(points_to_right, ATOMIC_TYPE_VOID)
+ && !types_compatible(points_to_left, points_to_right)) {
+ goto incompatible_assign_types;
+ }
+
+ /* 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) {
+ parser_print_error_prefix();
+ fprintf(stderr, "destination type ");
+ print_type_quoted(type_left);
+ fprintf(stderr, " in %s from type ", context);
+ print_type_quoted(type_right);
+ fprintf(stderr, " lacks qualifiers '");
+ print_type_qualifiers(missing_qualifiers);
+ fprintf(stderr, "' in pointed-to type\n");
+ return;
+ }
+
+ *right = create_implicit_cast(*right, type_left);
+ return;
+ }
+
+ if (is_type_compound(type_left)
+ && types_compatible(type_left, type_right)) {
+ *right = create_implicit_cast(*right, type_left);
+ return;
+ }
+
+incompatible_assign_types:
+ /* TODO: improve error message */
+ parser_print_error_prefix();
+ fprintf(stderr, "incompatible types in %s\n", context);
+ parser_print_error_prefix();
+ print_type_quoted(type_left);
+ fputs(" <- ", stderr);
+ print_type_quoted(type_right);
+ fputs("\n", stderr);
}
static expression_t *parse_constant_expression(void)
typedef struct declaration_specifiers_t declaration_specifiers_t;
struct declaration_specifiers_t {
- storage_class_t storage_class;
- bool is_inline;
- type_t *type;
+ unsigned char storage_class;
+ bool is_inline;
+ type_t *type;
};
static void parse_compound_type_entries(void);
{
while(true) {
switch(token.type) {
- case T___attribute__:
+ case T___attribute__: {
next_token();
expect_void('(');
}
}
break;
+ }
case T_asm:
next_token();
expect_void('(');
;
}
+#if 0
static designator_t *parse_designation(void)
{
if(token.type != '[' && token.type != '.')
last = designator;
}
}
+#endif
-static initializer_t *parse_initializer_list(type_t *type);
+static initializer_t *initializer_from_string(array_type_t *type,
+ const char *string)
+{
+ /* TODO: check len vs. size of array type */
+ (void) type;
-static initializer_t *parse_initializer(type_t *type)
+ initializer_t *initializer = allocate_initializer(INITIALIZER_STRING);
+ initializer->string.string = string;
+
+ return initializer;
+}
+
+static initializer_t *initializer_from_expression(type_t *type,
+ expression_t *expression)
{
- designator_t *designator = parse_designation();
+ /* TODO check that expression is a constant expression */
- initializer_t *result;
- if(token.type == '{') {
- result = parse_initializer_list(type);
- } else {
- result = allocate_ast_zero(sizeof(result[0]));
- result->type = INITIALIZER_VALUE;
- result->v.value = parse_assignment_expression();
+ /* § 6.7.8.14/15 char array may be initialized by string literals */
+ if(type->type == TYPE_ARRAY && expression->type == EXPR_STRING_LITERAL) {
+ array_type_t *array_type = &type->array;
+ type_t *element_type = array_type->element_type;
- if(type != NULL) {
- semantic_assign(type, &result->v.value, "initializer");
+ if(element_type->type == TYPE_ATOMIC) {
+ atomic_type_t *atomic_type = &element_type->atomic;
+ atomic_type_type_t atype = atomic_type->atype;
+
+ /* TODO handle wide strings */
+ if(atype == ATOMIC_TYPE_CHAR
+ || atype == ATOMIC_TYPE_SCHAR
+ || atype == ATOMIC_TYPE_UCHAR) {
+
+ string_literal_expression_t *literal = &expression->string;
+ return initializer_from_string(array_type, literal->value);
+ }
}
}
- result->designator = designator;
+
+ semantic_assign(type, &expression, "initializer");
+
+ initializer_t *result = allocate_initializer(INITIALIZER_VALUE);
+ result->value.value = expression;
return result;
}
-static initializer_t *parse_initializer_list(type_t *type)
+static initializer_t *parse_sub_initializer(type_t *type,
+ expression_t *expression,
+ type_t *expression_type);
+
+static initializer_t *parse_sub_initializer_elem(type_t *type)
{
- eat('{');
+ if(token.type == '{') {
+ return parse_sub_initializer(type, NULL, NULL);
+ }
- /* TODO: semantic */
- (void) type;
+ expression_t *expression = parse_assignment_expression();
+ type_t *expression_type = skip_typeref(expression->base.datatype);
+
+ return parse_sub_initializer(type, expression, expression_type);
+}
- initializer_t *result = allocate_ast_zero(sizeof(result[0]));
- result->type = INITIALIZER_LIST;
+static bool had_initializer_brace_warning;
- initializer_t *last = NULL;
- while(1) {
- initializer_t *initializer = parse_initializer(NULL);
- if(last != NULL) {
- last->next = initializer;
+static initializer_t *parse_sub_initializer(type_t *type,
+ expression_t *expression,
+ type_t *expression_type)
+{
+ if(is_type_scalar(type)) {
+ /* there might be extra {} hierarchies */
+ if(token.type == '{') {
+ next_token();
+ if(!had_initializer_brace_warning) {
+ parse_warning("braces around scalar initializer");
+ had_initializer_brace_warning = true;
+ }
+ initializer_t *result = parse_sub_initializer(type, NULL, NULL);
+ if(token.type == ',') {
+ next_token();
+ /* TODO: warn about excessive elements */
+ }
+ expect_block('}');
+ return result;
+ }
+
+ if(expression == NULL) {
+ expression = parse_assignment_expression();
+ }
+ return initializer_from_expression(type, expression);
+ }
+
+ /* TODO: ignore qualifiers, comparing pointers is probably
+ * not correct */
+ if(expression != NULL && expression_type == type) {
+ initializer_t *result = allocate_initializer(INITIALIZER_VALUE);
+
+ if(type != NULL) {
+ semantic_assign(type, &expression, "initializer");
+ }
+ result->value.value = expression;
+
+ return result;
+ }
+
+ bool read_paren = false;
+ if(token.type == '{') {
+ next_token();
+ read_paren = true;
+ }
+
+ /* descend into subtype */
+ initializer_t *result = NULL;
+ initializer_t **elems;
+ if(type->type == TYPE_ARRAY) {
+ array_type_t *array_type = &type->array;
+ type_t *element_type = array_type->element_type;
+ element_type = skip_typeref(element_type);
+
+ initializer_t *sub;
+ had_initializer_brace_warning = false;
+ if(expression == NULL) {
+ sub = parse_sub_initializer_elem(element_type);
} else {
- result->v.list = initializer;
+ sub = parse_sub_initializer(element_type, expression,
+ expression_type);
}
- last = initializer;
- if(token.type == '}')
- break;
+ /* didn't match the subtypes -> try the parent type */
+ if(sub == NULL) {
+ assert(!read_paren);
+ return NULL;
+ }
- if(token.type != ',') {
- parse_error_expected("while parsing initializer list", ',', '}', 0);
- eat_block();
- return result;
+ elems = NEW_ARR_F(initializer_t*, 0);
+ ARR_APP1(initializer_t*, elems, sub);
+
+ while(true) {
+ if(token.type == '}')
+ break;
+ expect_block(',');
+ if(token.type == '}')
+ break;
+
+ sub = parse_sub_initializer(element_type, NULL, NULL);
+ if(sub == NULL) {
+ /* TODO error, do nicer cleanup */
+ parse_error("member initializer didn't match");
+ DEL_ARR_F(elems);
+ return NULL;
+ }
+ ARR_APP1(initializer_t*, elems, sub);
}
- eat(',');
+ } else {
+ assert(type->type == TYPE_COMPOUND_STRUCT
+ || type->type == TYPE_COMPOUND_UNION);
+ compound_type_t *compound_type = &type->compound;
+ context_t *context = & compound_type->declaration->context;
- if(token.type == '}')
- break;
+ declaration_t *first = context->declarations;
+ if(first == NULL)
+ return NULL;
+ type_t *first_type = first->type;
+ first_type = skip_typeref(first_type);
+
+ initializer_t *sub;
+ had_initializer_brace_warning = false;
+ if(expression == NULL) {
+ sub = parse_sub_initializer_elem(first_type);
+ } else {
+ sub = parse_sub_initializer(first_type, expression,expression_type);
+ }
+
+ /* didn't match the subtypes -> try our parent type */
+ if(sub == NULL) {
+ assert(!read_paren);
+ return NULL;
+ }
+
+ elems = NEW_ARR_F(initializer_t*, 0);
+ ARR_APP1(initializer_t*, elems, sub);
+
+ declaration_t *iter = first->next;
+ for( ; iter != NULL; iter = iter->next) {
+ if(iter->symbol == NULL)
+ continue;
+ if(iter->namespc != NAMESPACE_NORMAL)
+ continue;
+
+ if(token.type == '}')
+ break;
+ expect_block(',');
+ if(token.type == '}')
+ break;
+
+ type_t *iter_type = iter->type;
+ iter_type = skip_typeref(iter_type);
+
+ sub = parse_sub_initializer(iter_type, NULL, NULL);
+ if(sub == NULL) {
+ /* TODO error, do nicer cleanup*/
+ parse_error("member initializer didn't match");
+ DEL_ARR_F(elems);
+ return NULL;
+ }
+ ARR_APP1(initializer_t*, elems, sub);
+ }
}
- expect('}');
+ int len = ARR_LEN(elems);
+ size_t elems_size = sizeof(initializer_t*) * len;
+
+ initializer_list_t *init = allocate_ast_zero(sizeof(init[0]) + elems_size);
+
+ init->initializer.type = INITIALIZER_LIST;
+ init->len = len;
+ memcpy(init->initializers, elems, elems_size);
+ DEL_ARR_F(elems);
+
+ result = (initializer_t*) init;
+
+ if(read_paren) {
+ if(token.type == ',')
+ next_token();
+ expect('}');
+ }
+ return result;
+}
+
+static initializer_t *parse_initializer(type_t *type)
+{
+ initializer_t *result;
+
+ type = skip_typeref(type);
+
+ if(token.type != '{') {
+ expression_t *expression = parse_assignment_expression();
+ return initializer_from_expression(type, expression);
+ }
+
+ if(is_type_scalar(type)) {
+ /* § 6.7.8.11 */
+ eat('{');
+
+ expression_t *expression = parse_assignment_expression();
+ result = initializer_from_expression(type, expression);
+
+ if(token.type == ',')
+ next_token();
+
+ expect('}');
+ return result;
+ } else {
+ result = parse_sub_initializer(type, NULL, NULL);
+ }
return result;
}
+
+
static declaration_t *parse_compound_type_specifier(bool is_struct)
{
if(is_struct) {
symbol_t *symbol = NULL;
declaration_t *declaration = NULL;
+ if (token.type == T___attribute__) {
+ /* TODO */
+ parse_attributes();
+ }
+
if(token.type == T_IDENTIFIER) {
symbol = token.v.symbol;
next_token();
}
if(declaration == NULL) {
- declaration = allocate_type_zero(sizeof(declaration[0]));
+ declaration = allocate_ast_zero(sizeof(declaration[0]));
if(is_struct) {
- declaration->namespace = NAMESPACE_STRUCT;
+ declaration->namespc = NAMESPACE_STRUCT;
} else {
- declaration->namespace = NAMESPACE_UNION;
+ declaration->namespc = NAMESPACE_UNION;
}
declaration->source_position = token.source_position;
declaration->symbol = symbol;
return declaration;
}
-static void parse_enum_entries(void)
+static void parse_enum_entries(enum_type_t *const enum_type)
{
eat('{');
return;
}
entry->storage_class = STORAGE_CLASS_ENUM_ENTRY;
+ entry->type = (type_t*) enum_type;
entry->symbol = token.v.symbol;
entry->source_position = token.source_position;
next_token();
if(token.type == '=') {
next_token();
- entry->init.initializer = parse_initializer(type_int);
+ entry->init.enum_value = parse_constant_expression();
+
+ /* TODO semantic */
}
record_declaration(entry);
expect_void('}');
}
-static declaration_t *parse_enum_specifier(void)
+static type_t *parse_enum_specifier(void)
{
eat(T_enum);
}
if(declaration == NULL) {
- declaration = allocate_type_zero(sizeof(declaration[0]));
+ declaration = allocate_ast_zero(sizeof(declaration[0]));
- declaration->namespace = NAMESPACE_ENUM;
+ declaration->namespc = NAMESPACE_ENUM;
declaration->source_position = token.source_position;
declaration->symbol = symbol;
}
+ type_t *const type = allocate_type_zero(TYPE_ENUM);
+ type->enumt.declaration = declaration;
+
if(token.type == '{') {
if(declaration->init.is_defined) {
parser_print_error_prefix();
record_declaration(declaration);
declaration->init.is_defined = 1;
- parse_enum_entries();
+ parse_enum_entries(&type->enumt);
parse_attributes();
}
- return declaration;
+ return type;
}
/**
*/
static bool is_typedef_symbol(symbol_t *symbol)
{
- declaration_t *declaration = get_declaration(symbol, NAMESPACE_NORMAL);
- if(declaration == NULL
- || declaration->storage_class != STORAGE_CLASS_TYPEDEF)
- return false;
-
- return true;
+ const declaration_t *const declaration =
+ get_declaration(symbol, NAMESPACE_NORMAL);
+ return
+ declaration != NULL &&
+ declaration->storage_class == STORAGE_CLASS_TYPEDEF;
}
static type_t *parse_typeof(void)
type = parse_typename();
} else {
expression = parse_expression();
- type = expression->datatype;
+ type = expression->base.datatype;
}
break;
default:
expression = parse_expression();
- type = expression->datatype;
+ type = expression->base.datatype;
break;
}
expect(')');
- typeof_type_t *typeof = allocate_type_zero(sizeof(typeof[0]));
- typeof->type.type = TYPE_TYPEOF;
- typeof->expression = expression;
- typeof->typeof_type = type;
+ type_t *typeof_type = allocate_type_zero(TYPE_TYPEOF);
+ typeof_type->typeoft.expression = expression;
+ typeof_type->typeoft.typeof_type = type;
- return (type_t*) typeof;
+ return typeof_type;
}
typedef enum {
SPECIFIER_VOID = 1 << 10,
#ifdef PROVIDE_COMPLEX
SPECIFIER_COMPLEX = 1 << 11,
-#endif
-#ifdef PROVIDE_IMAGINARY
SPECIFIER_IMAGINARY = 1 << 12,
#endif
} specifiers_t;
static type_t *create_builtin_type(symbol_t *symbol)
{
- builtin_type_t *type = allocate_type_zero(sizeof(type[0]));
- type->type.type = TYPE_BUILTIN;
- type->symbol = symbol;
+ type_t *type = allocate_type_zero(TYPE_BUILTIN);
+ type->builtin.symbol = symbol;
/* TODO... */
- type->real_type = type_int;
+ type->builtin.real_type = type_int;
- return (type_t*) type;
+ return type;
}
static type_t *get_typedef_type(symbol_t *symbol)
|| declaration->storage_class != STORAGE_CLASS_TYPEDEF)
return NULL;
- typedef_type_t *typedef_type = allocate_type_zero(sizeof(typedef_type[0]));
- typedef_type->type.type = TYPE_TYPEDEF;
- typedef_type->declaration = declaration;
+ type_t *type = allocate_type_zero(TYPE_TYPEDEF);
+ type->typedeft.declaration = declaration;
- return (type_t*) typedef_type;
+ return type;
}
static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
{
- type_t *type = NULL;
- unsigned type_qualifiers = 0;
- unsigned type_specifiers = 0;
- int newtype = 0;
+ type_t *type = NULL;
+ unsigned type_qualifiers = 0;
+ unsigned type_specifiers = 0;
+ int newtype = 0;
while(true) {
switch(token.type) {
MATCH_STORAGE_CLASS(T_auto, STORAGE_CLASS_AUTO)
MATCH_STORAGE_CLASS(T_register, STORAGE_CLASS_REGISTER)
+ case T___thread:
+ switch (specifiers->storage_class) {
+ case STORAGE_CLASS_NONE:
+ specifiers->storage_class = STORAGE_CLASS_THREAD;
+ break;
+
+ case STORAGE_CLASS_EXTERN:
+ specifiers->storage_class = STORAGE_CLASS_THREAD_EXTERN;
+ break;
+
+ case STORAGE_CLASS_STATIC:
+ specifiers->storage_class = STORAGE_CLASS_THREAD_STATIC;
+ break;
+
+ default:
+ parse_error("multiple storage classes in declaration specifiers");
+ break;
+ }
+ next_token();
+ break;
+
/* type qualifiers */
#define MATCH_TYPE_QUALIFIER(token, qualifier) \
case token: \
MATCH_SPECIFIER(T__Bool, SPECIFIER_BOOL, "_Bool")
#ifdef PROVIDE_COMPLEX
MATCH_SPECIFIER(T__Complex, SPECIFIER_COMPLEX, "_Complex")
-#endif
-#ifdef PROVIDE_IMAGINARY
MATCH_SPECIFIER(T__Imaginary, SPECIFIER_IMAGINARY, "_Imaginary")
#endif
case T_inline:
/* TODO: if type != NULL for the following rules should issue
* an error */
case T_struct: {
- compound_type_t *compound_type
- = allocate_type_zero(sizeof(compound_type[0]));
- compound_type->type.type = TYPE_COMPOUND_STRUCT;
- compound_type->declaration = parse_compound_type_specifier(true);
+ type = allocate_type_zero(TYPE_COMPOUND_STRUCT);
- type = (type_t*) compound_type;
+ type->compound.declaration = parse_compound_type_specifier(true);
break;
}
case T_union: {
- compound_type_t *compound_type
- = allocate_type_zero(sizeof(compound_type[0]));
- compound_type->type.type = TYPE_COMPOUND_UNION;
- compound_type->declaration = parse_compound_type_specifier(false);
+ type = allocate_type_zero(TYPE_COMPOUND_STRUCT);
- type = (type_t*) compound_type;
+ type->compound.declaration = parse_compound_type_specifier(false);
break;
}
- case T_enum: {
- enum_type_t *enum_type = allocate_type_zero(sizeof(enum_type[0]));
- enum_type->type.type = TYPE_ENUM;
- enum_type->declaration = parse_enum_specifier();
-
- type = (type_t*) enum_type;
+ case T_enum:
+ type = parse_enum_specifier();
break;
- }
case T___typeof__:
type = parse_typeof();
break;
case SPECIFIER_LONG | SPECIFIER_DOUBLE | SPECIFIER_COMPLEX:
atomic_type = ATOMIC_TYPE_LONG_DOUBLE_COMPLEX;
break;
-#endif
-#ifdef PROVIDE_IMAGINARY
case SPECIFIER_FLOAT | SPECIFIER_IMAGINARY:
atomic_type = ATOMIC_TYPE_FLOAT_IMAGINARY;
break;
atomic_type = ATOMIC_TYPE_INVALID;
}
- atomic_type_t *atype = allocate_type_zero(sizeof(atype[0]));
- atype->type.type = TYPE_ATOMIC;
- atype->atype = atomic_type;
- newtype = 1;
-
- type = (type_t*) atype;
+ type = allocate_type_zero(TYPE_ATOMIC);
+ type->atomic.atype = atomic_type;
+ newtype = 1;
} else {
if(type_specifiers != 0) {
parse_error("multiple datatypes in declaration");
}
}
- type->qualifiers = type_qualifiers;
+ type->base.qualifiers = type_qualifiers;
type_t *result = typehash_insert(type);
- if(newtype && result != (type_t*) type) {
+ if(newtype && result != type) {
free_type(type);
}
specifiers->type = result;
}
-static type_qualifier_t parse_type_qualifiers(void)
+static type_qualifiers_t parse_type_qualifiers(void)
{
- type_qualifier_t type_qualifiers = 0;
+ type_qualifiers_t type_qualifiers = TYPE_QUALIFIER_NONE;
while(true) {
switch(token.type) {
T_IDENTIFIER, 0);
return;
}
+ declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0]));
+ declaration->symbol = token.v.symbol;
+
next_token();
+
if(token.type != ',')
break;
next_token();
parse_error("typedef not allowed in parameter list");
}
+ /* Array as last part of a paramter type is just syntactic sugar. Turn it
+ * into a pointer */
+ if (declaration->type->type == TYPE_ARRAY) {
+ const array_type_t *const arr_type = &declaration->type->array;
+ type_t *element_type = arr_type->element_type;
+ declaration->type = make_pointer_type(element_type, TYPE_QUALIFIER_NONE);
+ }
+
return declaration;
}
if(token.type == T_IDENTIFIER) {
symbol_t *symbol = token.v.symbol;
if(!is_typedef_symbol(symbol)) {
- /* TODO */
+ /* TODO: K&R style C parameters */
parse_identifier_list();
return NULL;
}
DECLARATION_START
declaration = parse_parameter();
- parameter = allocate_type_zero(sizeof(parameter[0]));
+ parameter = obstack_alloc(type_obst, sizeof(parameter[0]));
+ memset(parameter, 0, sizeof(parameter[0]));
parameter->type = declaration->type;
if(last_parameter != NULL) {
typedef struct parsed_pointer_t parsed_pointer_t;
struct parsed_pointer_t {
construct_type_t construct_type;
- type_qualifier_t type_qualifiers;
+ type_qualifiers_t type_qualifiers;
};
typedef struct construct_function_type_t construct_function_type_t;
struct construct_function_type_t {
- construct_type_t construct_type;
- function_type_t *function_type;
+ construct_type_t construct_type;
+ type_t *function_type;
};
typedef struct parsed_array_t parsed_array_t;
struct parsed_array_t {
construct_type_t construct_type;
- type_qualifier_t type_qualifiers;
+ type_qualifiers_t type_qualifiers;
bool is_static;
bool is_variable;
expression_t *size;
next_token();
}
- type_qualifier_t type_qualifiers = parse_type_qualifiers();
+ type_qualifiers_t type_qualifiers = parse_type_qualifiers();
if(type_qualifiers != 0) {
if(token.type == T_static) {
array->is_static = true;
{
eat('(');
- function_type_t *type = allocate_type_zero(sizeof(type[0]));
- type->type.type = TYPE_FUNCTION;
+ type_t *type = allocate_type_zero(TYPE_FUNCTION);
- declaration_t *parameters = parse_parameters(type);
+ declaration_t *parameters = parse_parameters(&type->function);
if(declaration != NULL) {
declaration->context.declarations = parameters;
}
}
static construct_type_t *parse_inner_declarator(declaration_t *declaration,
- int may_be_abstract)
+ bool may_be_abstract)
{
- construct_type_t *result = NULL;
- construct_type_t *last = NULL;
+ /* construct a single linked list of construct_type_t's which describe
+ * how to construct the final declarator type */
+ construct_type_t *first = NULL;
+ construct_type_t *last = NULL;
+ /* pointers */
while(token.type == '*') {
construct_type_t *type = parse_pointer_declarator();
- if(last != NULL) {
- last->next = type;
+
+ if(last == NULL) {
+ first = type;
+ last = type;
} else {
- result = type;
+ last->next = type;
+ last = type;
}
- last = type;
}
/* TODO: find out if this is correct */
if(may_be_abstract)
break;
parse_error_expected("while parsing declarator", T_IDENTIFIER, '(', 0);
+ /* avoid a loop in the outermost scope, because eat_statement doesn't
+ * eat '}' */
+ if(token.type == '}' && current_function == NULL) {
+ next_token();
+ } else {
+ eat_statement();
+ }
+ return NULL;
}
+ construct_type_t *p = last;
+
while(true) {
construct_type_t *type;
switch(token.type) {
goto declarator_finished;
}
- if(last != NULL) {
- last->next = type;
+ /* insert in the middle of the list (behind p) */
+ if(p != NULL) {
+ type->next = p->next;
+ p->next = type;
} else {
- result = type;
+ type->next = first;
+ first = type;
+ }
+ if(last == p) {
+ last = type;
}
- last = type;
}
declarator_finished:
parse_attributes();
- if(inner_types != NULL) {
- if(last != NULL) {
- last->next = inner_types;
- } else {
- result = inner_types;
- }
- last = inner_types;
+ /* append inner_types at the end of the list, we don't to set last anymore
+ * as it's not needed anymore */
+ if(last == NULL) {
+ assert(first == NULL);
+ first = inner_types;
+ } else {
+ last->next = inner_types;
}
- return result;
+ return first;
}
static type_t *construct_declarator_type(construct_type_t *construct_list,
{
construct_type_t *iter = construct_list;
for( ; iter != NULL; iter = iter->next) {
- parsed_pointer_t *parsed_pointer;
- parsed_array_t *parsed_array;
- construct_function_type_t *construct_function_type;
- function_type_t *function_type;
- pointer_type_t *pointer_type;
- array_type_t *array_type;
-
switch(iter->type) {
case CONSTRUCT_INVALID:
panic("invalid type construction found");
- case CONSTRUCT_FUNCTION:
- construct_function_type = (construct_function_type_t*) iter;
- function_type = construct_function_type->function_type;
+ case CONSTRUCT_FUNCTION: {
+ construct_function_type_t *construct_function_type
+ = (construct_function_type_t*) iter;
+
+ type_t *function_type = construct_function_type->function_type;
- function_type->result_type = type;
- type = (type_t*) function_type;
+ function_type->function.result_type = type;
+
+ type = function_type;
break;
+ }
- case CONSTRUCT_POINTER:
- parsed_pointer = (parsed_pointer_t*) iter;
- pointer_type = allocate_type_zero(sizeof(pointer_type[0]));
+ case CONSTRUCT_POINTER: {
+ parsed_pointer_t *parsed_pointer = (parsed_pointer_t*) iter;
+ type_t *pointer_type = allocate_type_zero(TYPE_POINTER);
+ pointer_type->pointer.points_to = type;
+ pointer_type->base.qualifiers = parsed_pointer->type_qualifiers;
- pointer_type->type.type = TYPE_POINTER;
- pointer_type->points_to = type;
- pointer_type->type.qualifiers = parsed_pointer->type_qualifiers;
- type = (type_t*) pointer_type;
+ type = pointer_type;
break;
+ }
+
+ case CONSTRUCT_ARRAY: {
+ parsed_array_t *parsed_array = (parsed_array_t*) iter;
+ type_t *array_type = allocate_type_zero(TYPE_ARRAY);
- case CONSTRUCT_ARRAY:
- parsed_array = (parsed_array_t*) iter;
- array_type = allocate_type_zero(sizeof(array_type[0]));
-
- array_type->type.type = TYPE_ARRAY;
- array_type->element_type = type;
- array_type->type.qualifiers = parsed_array->type_qualifiers;
- array_type->is_static = parsed_array->is_static;
- array_type->is_variable = parsed_array->is_variable;
- array_type->size = parsed_array->size;
- type = (type_t*) array_type;
+ array_type->base.qualifiers = parsed_array->type_qualifiers;
+ array_type->array.element_type = type;
+ array_type->array.is_static = parsed_array->is_static;
+ array_type->array.is_variable = parsed_array->is_variable;
+ array_type->array.size = parsed_array->size;
+
+ type = array_type;
break;
}
+ }
- type_t *hashed_type = typehash_insert((type_t*) type);
+ type_t *hashed_type = typehash_insert(type);
if(hashed_type != type) {
- free_type(type);
+ /* the function type was constructed earlier freeing it here will
+ * destroy other types... */
+ if(iter->type != CONSTRUCT_FUNCTION) {
+ free_type(type);
+ }
type = hashed_type;
}
}
fprintf(stderr, "multiple definition of symbol '%s'\n",
declaration->symbol->string);
parser_print_error_prefix_pos(previous->source_position);
- fprintf(stderr, "this is the location of the previous "
- "definition.\n");
- error();
+ fprintf(stderr, "this is the location of the previous definition.\n");
}
static void parse_init_declarators(const declaration_specifiers_t *specifiers)
declaration_t *declaration = record_declaration(ndeclaration);
- type_t *type = declaration->type;
+ type_t *orig_type = declaration->type;
+ type_t *type = skip_typeref(orig_type);
if(type->type != TYPE_FUNCTION && declaration->is_inline) {
parser_print_warning_prefix_pos(declaration->source_position);
- fprintf(stderr, "variable ‘%s’ declared ‘inline’\n",
+ fprintf(stderr, "variable '%s' declared 'inline'\n",
declaration->symbol->string);
}
parser_error_multiple_definition(declaration, ndeclaration);
}
- ndeclaration->init.initializer = parse_initializer(declaration->type);
+ initializer_t *initializer = parse_initializer(type);
+
+ if(type->type == TYPE_ARRAY && initializer != NULL) {
+ array_type_t *array_type = &type->array;
+
+ if(array_type->size == NULL) {
+ expression_t *cnst = allocate_expression_zero(EXPR_CONST);
+
+ cnst->base.datatype = type_size_t;
+
+ if(initializer->type == INITIALIZER_LIST) {
+ initializer_list_t *list = &initializer->list;
+ cnst->conste.v.int_value = list->len;
+ } else {
+ assert(initializer->type == INITIALIZER_STRING);
+ initializer_string_t *string = &initializer->string;
+ cnst->conste.v.int_value = strlen(string->string) + 1;
+ }
+
+ array_type->size = cnst;
+ }
+ }
+
+
+ ndeclaration->init.initializer = initializer;
} else if(token.type == '{') {
- if(declaration->type->type != TYPE_FUNCTION) {
+ if(type->type != TYPE_FUNCTION) {
parser_print_error_prefix();
- fprintf(stderr, "Declarator ");
- print_type_ext(declaration->type, declaration->symbol, NULL);
- fprintf(stderr, " has a body but is not a function type.\n");
+ fprintf(stderr, "declarator '");
+ print_type_ext(orig_type, declaration->symbol, NULL);
+ fprintf(stderr, "' has a body but is not a function type.\n");
eat_block();
continue;
}
+ function_type_t *function_type = &type->function;
+ /* § 6.7.5.3 (14) a function definition with () means no
+ * parameters */
+ if(function_type->unspecified_parameters) {
+ type_t *duplicate = duplicate_type(type);
+ duplicate->function.unspecified_parameters = false;
+
+ type = typehash_insert(duplicate);
+ if(type != duplicate) {
+ //obstack_free(type_obst, duplicate);
+ }
+ function_type = &type->function;
+ }
if(declaration->init.statement != NULL) {
parser_error_multiple_definition(declaration, ndeclaration);
parse_declaration_specifiers(&specifiers);
if(token.type == ';') {
+ if (specifiers.storage_class != STORAGE_CLASS_NONE) {
+ parse_warning_pos(source_position,
+ "useless keyword in empty declaration");
+ }
+ switch (specifiers.type->type) {
+ case TYPE_COMPOUND_STRUCT:
+ case TYPE_COMPOUND_UNION: {
+ const compound_type_t *const comp_type
+ = &specifiers.type->compound;
+ if (comp_type->declaration->symbol == NULL) {
+ parse_warning_pos(source_position,
+ "unnamed struct/union that defines no instances");
+ }
+ break;
+ }
+
+ case TYPE_ENUM: break;
+
+ default:
+ parse_warning_pos(source_position, "empty declaration");
+ break;
+ }
+
next_token();
declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0]));
static expression_t *make_invalid_expression(void)
{
- expression_t *expression = allocate_ast_zero(sizeof(expression[0]));
- expression->type = EXPR_INVALID;
- expression->source_position = token.source_position;
+ expression_t *expression = allocate_expression_zero(EXPR_INVALID);
+ expression->base.source_position = token.source_position;
return expression;
}
static expression_t *parse_string_const(void)
{
- string_literal_t *cnst = allocate_ast_zero(sizeof(cnst[0]));
-
- cnst->expression.type = EXPR_STRING_LITERAL;
- cnst->expression.datatype = type_string;
- cnst->value = parse_string_literals();
+ expression_t *cnst = allocate_expression_zero(EXPR_STRING_LITERAL);
+ cnst->base.datatype = type_string;
+ cnst->string.value = parse_string_literals();
- return (expression_t*) cnst;
+ return cnst;
}
static expression_t *parse_int_const(void)
{
- const_t *cnst = allocate_ast_zero(sizeof(cnst[0]));
-
- cnst->expression.type = EXPR_CONST;
- cnst->expression.datatype = type_int;
- cnst->v.int_value = token.v.intvalue;
+ expression_t *cnst = allocate_expression_zero(EXPR_CONST);
+ cnst->base.datatype = token.datatype;
+ cnst->conste.v.int_value = token.v.intvalue;
next_token();
- return (expression_t*) cnst;
+ return cnst;
}
static expression_t *parse_float_const(void)
{
- const_t *cnst = allocate_ast_zero(sizeof(cnst[0]));
-
- cnst->expression.type = EXPR_CONST;
- cnst->expression.datatype = type_double;
- cnst->v.float_value = token.v.floatvalue;
+ expression_t *cnst = allocate_expression_zero(EXPR_CONST);
+ cnst->base.datatype = token.datatype;
+ cnst->conste.v.float_value = token.v.floatvalue;
next_token();
- return (expression_t*) cnst;
+ return cnst;
}
static declaration_t *create_implicit_function(symbol_t *symbol,
const source_position_t source_position)
{
- function_type_t *function_type
- = allocate_type_zero(sizeof(function_type[0]));
+ type_t *ntype = allocate_type_zero(TYPE_FUNCTION);
+ ntype->function.result_type = type_int;
+ ntype->function.unspecified_parameters = true;
- function_type->type.type = TYPE_FUNCTION;
- function_type->result_type = type_int;
- function_type->unspecified_parameters = true;
-
- type_t *type = typehash_insert((type_t*) function_type);
- if(type != (type_t*) function_type) {
- free_type(function_type);
+ type_t *type = typehash_insert(ntype);
+ if(type != ntype) {
+ free_type(ntype);
}
declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0]));
return declaration;
}
+static type_t *make_function_1_type(type_t *result_type, type_t *argument_type)
+{
+ function_parameter_t *parameter
+ = obstack_alloc(type_obst, sizeof(parameter[0]));
+ memset(parameter, 0, sizeof(parameter[0]));
+ parameter->type = argument_type;
+
+ type_t *type = allocate_type_zero(TYPE_FUNCTION);
+ type->function.result_type = result_type;
+ type->function.parameters = parameter;
+
+ type_t *result = typehash_insert(type);
+ if(result != type) {
+ free_type(type);
+ }
+
+ return result;
+}
+
+static type_t *get_builtin_symbol_type(symbol_t *symbol)
+{
+ switch(symbol->ID) {
+ case T___builtin_alloca:
+ return make_function_1_type(type_void_ptr, type_size_t);
+ default:
+ panic("not implemented builtin symbol found");
+ }
+}
+
+/**
+ * performs automatic type cast as described in § 6.3.2.1
+ */
+static type_t *automatic_type_conversion(type_t *type)
+{
+ if(type == NULL)
+ return NULL;
+
+ if(type->type == TYPE_ARRAY) {
+ array_type_t *array_type = &type->array;
+ type_t *element_type = array_type->element_type;
+ unsigned qualifiers = array_type->type.qualifiers;
+
+ return make_pointer_type(element_type, qualifiers);
+ }
+
+ if(type->type == TYPE_FUNCTION) {
+ return make_pointer_type(type, TYPE_QUALIFIER_NONE);
+ }
+
+ return type;
+}
+
+/**
+ * reverts the automatic casts of array to pointer types and function
+ * to function-pointer types as defined § 6.3.2.1
+ */
+type_t *revert_automatic_type_conversion(const expression_t *expression)
+{
+ if(expression->base.datatype == NULL)
+ return NULL;
+
+ switch(expression->type) {
+ case EXPR_REFERENCE: {
+ const reference_expression_t *ref = &expression->reference;
+ return ref->declaration->type;
+ }
+ case EXPR_SELECT: {
+ const select_expression_t *select = &expression->select;
+ return select->compound_entry->type;
+ }
+ case EXPR_UNARY: {
+ const unary_expression_t *unary = &expression->unary;
+ if(unary->type == UNEXPR_DEREFERENCE) {
+ expression_t *value = unary->value;
+ type_t *type = skip_typeref(value->base.datatype);
+ pointer_type_t *pointer_type = &type->pointer;
+
+ return pointer_type->points_to;
+ }
+ break;
+ }
+ case EXPR_BUILTIN_SYMBOL: {
+ const builtin_symbol_expression_t *builtin
+ = &expression->builtin_symbol;
+ return get_builtin_symbol_type(builtin->symbol);
+ }
+ case EXPR_ARRAY_ACCESS: {
+ const array_access_expression_t *array_access
+ = &expression->array_access;
+ const expression_t *array_ref = array_access->array_ref;
+ type_t *type_left = skip_typeref(array_ref->base.datatype);
+ assert(is_type_pointer(type_left));
+ pointer_type_t *pointer_type = &type_left->pointer;
+ return pointer_type->points_to;
+ }
+
+ default:
+ break;
+ }
+
+ return expression->base.datatype;
+}
+
static expression_t *parse_reference(void)
{
- reference_expression_t *ref = allocate_ast_zero(sizeof(ref[0]));
+ expression_t *expression = allocate_expression_zero(EXPR_REFERENCE);
- ref->expression.type = EXPR_REFERENCE;
- ref->symbol = token.v.symbol;
+ reference_expression_t *ref = &expression->reference;
+ ref->symbol = token.v.symbol;
declaration_t *declaration = get_declaration(ref->symbol, NAMESPACE_NORMAL);
if(declaration == NULL) {
#ifndef STRICT_C99
- /* an implicitely defined function */
+ /* an implicitly defined function */
if(token.type == '(') {
parser_print_prefix_pos(token.source_position);
fprintf(stderr, "warning: implicit declaration of function '%s'\n",
{
parser_print_error_prefix();
fprintf(stderr, "unknown symbol '%s' found.\n", ref->symbol->string);
- return (expression_t*) ref;
+ return expression;
}
}
+ type_t *type = declaration->type;
+ /* we always do the auto-type conversions; the & and sizeof parser contains
+ * code to revert this! */
+ type = automatic_type_conversion(type);
+
ref->declaration = declaration;
- ref->expression.datatype = declaration->type;
+ ref->expression.datatype = type;
- return (expression_t*) ref;
+ return expression;
}
static void check_cast_allowed(expression_t *expression, type_t *dest_type)
static expression_t *parse_cast(void)
{
- unary_expression_t *cast = allocate_ast_zero(sizeof(cast[0]));
+ expression_t *cast = allocate_expression_zero(EXPR_UNARY);
- cast->expression.type = EXPR_UNARY;
- cast->type = UNEXPR_CAST;
- cast->expression.source_position = token.source_position;
+ cast->unary.type = UNEXPR_CAST;
+ cast->base.source_position = token.source_position;
type_t *type = parse_typename();
check_cast_allowed(value, type);
- cast->expression.datatype = type;
- cast->value = value;
+ cast->base.datatype = type;
+ cast->unary.value = value;
- return (expression_t*) cast;
+ return cast;
}
static expression_t *parse_statement_expression(void)
{
- statement_expression_t *expression
- = allocate_ast_zero(sizeof(expression[0]));
- expression->expression.type = EXPR_STATEMENT;
+ expression_t *expression = allocate_expression_zero(EXPR_STATEMENT);
- statement_t *statement = parse_compound_statement();
- expression->statement = statement;
+ statement_t *statement = parse_compound_statement();
+ expression->statement.statement = statement;
if(statement == NULL) {
expect(')');
return NULL;
}
assert(statement->type == STATEMENT_COMPOUND);
- compound_statement_t *compound_statement
- = (compound_statement_t*) statement;
+ compound_statement_t *compound_statement = &statement->compound;
/* find last statement and use it's type */
const statement_t *last_statement = NULL;
const statement_t *iter = compound_statement->statements;
- for( ; iter != NULL; iter = iter->next) {
+ for( ; iter != NULL; iter = iter->base.next) {
last_statement = iter;
}
if(last_statement->type == STATEMENT_EXPRESSION) {
- const expression_statement_t *expression_statement =
- (const expression_statement_t*) last_statement;
- expression->expression.datatype
- = expression_statement->expression->datatype;
+ const expression_statement_t *expression_statement
+ = &last_statement->expression;
+ expression->base.datatype
+ = expression_statement->expression->base.datatype;
} else {
- expression->expression.datatype = type_void;
+ expression->base.datatype = type_void;
}
expect(')');
- return (expression_t*) expression;
+ return expression;
}
static expression_t *parse_brace_expression(void)
static expression_t *parse_function_keyword(void)
{
- eat(T___FUNCTION__);
+ next_token();
/* TODO */
- string_literal_t *expression = allocate_ast_zero(sizeof(expression[0]));
+ if (current_function == NULL) {
+ parse_error("'__func__' used outside of a function");
+ }
+
+ string_literal_expression_t *expression
+ = allocate_ast_zero(sizeof(expression[0]));
+
expression->expression.type = EXPR_FUNCTION;
expression->expression.datatype = type_string;
expression->value = "TODO: FUNCTION";
eat(T___PRETTY_FUNCTION__);
/* TODO */
- string_literal_t *expression = allocate_ast_zero(sizeof(expression[0]));
+ string_literal_expression_t *expression
+ = allocate_ast_zero(sizeof(expression[0]));
+
expression->expression.type = EXPR_PRETTY_FUNCTION;
expression->expression.datatype = type_string;
expression->value = "TODO: PRETTY FUNCTION";
{
eat(T___builtin_offsetof);
- offsetof_expression_t *expression
- = allocate_ast_zero(sizeof(expression[0]));
- expression->expression.type = EXPR_OFFSETOF;
- expression->expression.datatype = type_size_t;
+ expression_t *expression = allocate_expression_zero(EXPR_OFFSETOF);
+ expression->base.datatype = type_size_t;
expect('(');
- expression->type = parse_typename();
+ expression->offsetofe.type = parse_typename();
expect(',');
- expression->designator = parse_designator();
+ expression->offsetofe.designator = parse_designator();
expect(')');
- return (expression_t*) expression;
+ return expression;
}
static expression_t *parse_va_arg(void)
{
eat(T___builtin_va_arg);
- va_arg_expression_t *expression = allocate_ast_zero(sizeof(expression[0]));
- expression->expression.type = EXPR_VA_ARG;
+ expression_t *expression = allocate_expression_zero(EXPR_VA_ARG);
expect('(');
- expression->arg = parse_assignment_expression();
+ expression->va_arge.arg = parse_assignment_expression();
expect(',');
- expression->expression.datatype = parse_typename();
+ expression->base.datatype = parse_typename();
expect(')');
- return (expression_t*) expression;
+ return expression;
}
static expression_t *parse_builtin_symbol(void)
{
- builtin_symbol_expression_t *expression
- = allocate_ast_zero(sizeof(expression[0]));
- expression->expression.type = EXPR_BUILTIN_SYMBOL;
+ expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_SYMBOL);
- /* TODO: set datatype */
-
- expression->symbol = token.v.symbol;
+ symbol_t *symbol = token.v.symbol;
+ expression->builtin_symbol.symbol = symbol;
next_token();
- return (expression_t*) expression;
+ type_t *type = get_builtin_symbol_type(symbol);
+ type = automatic_type_conversion(type);
+
+ expression->base.datatype = type;
+ return expression;
}
static expression_t *parse_primary_expression(void)
case T_IDENTIFIER:
return parse_reference();
case T___FUNCTION__:
+ case T___func__:
return parse_function_keyword();
case T___PRETTY_FUNCTION__:
return parse_pretty_function_keyword();
return parse_offsetof();
case T___builtin_va_arg:
return parse_va_arg();
+ case T___builtin_alloca:
case T___builtin_expect:
case T___builtin_va_start:
case T___builtin_va_end:
}
static expression_t *parse_array_expression(unsigned precedence,
- expression_t *array_ref)
+ expression_t *left)
{
(void) precedence;
eat('[');
+ expression_t *inside = parse_expression();
+
array_access_expression_t *array_access
= allocate_ast_zero(sizeof(array_access[0]));
- array_access->expression.type = EXPR_ARRAY_ACCESS;
- array_access->array_ref = array_ref;
- array_access->index = parse_expression();
-
- type_t *type = array_ref->datatype;
- if(type != NULL) {
- if(type->type == TYPE_POINTER) {
- pointer_type_t *pointer = (pointer_type_t*) type;
- array_access->expression.datatype = pointer->points_to;
- } else if(type->type == TYPE_ARRAY) {
- array_type_t *array_type = (array_type_t*) type;
- array_access->expression.datatype = array_type->element_type;
+ array_access->expression.type = EXPR_ARRAY_ACCESS;
+
+ type_t *type_left = left->base.datatype;
+ type_t *type_inside = inside->base.datatype;
+ type_t *result_type = NULL;
+
+ if(type_left != NULL && type_inside != NULL) {
+ type_left = skip_typeref(type_left);
+ type_inside = skip_typeref(type_inside);
+
+ if(is_type_pointer(type_left)) {
+ pointer_type_t *pointer = &type_left->pointer;
+ result_type = pointer->points_to;
+ array_access->array_ref = left;
+ array_access->index = inside;
+ } else if(is_type_pointer(type_inside)) {
+ pointer_type_t *pointer = &type_inside->pointer;
+ result_type = pointer->points_to;
+ array_access->array_ref = inside;
+ array_access->index = left;
+ array_access->flipped = true;
} else {
parser_print_error_prefix();
- fprintf(stderr, "array access on object with non-pointer type ");
- print_type_quoted(type);
+ fprintf(stderr, "array access on object with non-pointer types ");
+ print_type_quoted(type_left);
+ fprintf(stderr, ", ");
+ print_type_quoted(type_inside);
fprintf(stderr, "\n");
}
+ } else {
+ array_access->array_ref = left;
+ array_access->index = inside;
}
if(token.type != ']') {
}
next_token();
+ result_type = automatic_type_conversion(result_type);
+ array_access->expression.datatype = result_type;
+
return (expression_t*) array_access;
}
sizeof_expression->type = parse_typename();
expect(')');
} else {
- expression_t *expression = parse_sub_expression(precedence);
- sizeof_expression->type = expression->datatype;
+ expression_t *expression = parse_sub_expression(precedence);
+ expression->base.datatype = revert_automatic_type_conversion(expression);
+
+ sizeof_expression->type = expression->base.datatype;
sizeof_expression->size_expression = expression;
}
bool is_pointer = (token.type == T_MINUSGREATER);
next_token();
- select_expression_t *select = allocate_ast_zero(sizeof(select[0]));
-
- select->expression.type = EXPR_SELECT;
- select->compound = compound;
+ expression_t *select = allocate_expression_zero(EXPR_SELECT);
+ select->select.compound = compound;
if(token.type != T_IDENTIFIER) {
parse_error_expected("while parsing select", T_IDENTIFIER, 0);
- return (expression_t*) select;
+ return select;
}
- symbol_t *symbol = token.v.symbol;
- select->symbol = symbol;
+ symbol_t *symbol = token.v.symbol;
+ select->select.symbol = symbol;
next_token();
- type_t *type = compound->datatype;
- if(type == NULL)
+ type_t *orig_type = compound->base.datatype;
+ if(orig_type == NULL)
return make_invalid_expression();
+ type_t *type = skip_typeref(orig_type);
+
type_t *type_left = type;
if(is_pointer) {
if(type->type != TYPE_POINTER) {
parser_print_error_prefix();
fprintf(stderr, "left hand side of '->' is not a pointer, but ");
- print_type_quoted(type);
+ print_type_quoted(orig_type);
fputc('\n', stderr);
return make_invalid_expression();
}
- pointer_type_t *pointer_type = (pointer_type_t*) type;
+ pointer_type_t *pointer_type = &type->pointer;
type_left = pointer_type->points_to;
}
type_left = skip_typeref(type_left);
return make_invalid_expression();
}
- compound_type_t *compound_type = (compound_type_t*) type_left;
+ compound_type_t *compound_type = &type_left->compound;
declaration_t *declaration = compound_type->declaration;
if(!declaration->init.is_defined) {
if(iter == NULL) {
parser_print_error_prefix();
print_type_quoted(type_left);
- fprintf(stderr, " has no memeber named '%s'\n", symbol->string);
+ fprintf(stderr, " has no member named '%s'\n", symbol->string);
return make_invalid_expression();
}
- select->compound_entry = iter;
- select->expression.datatype = iter->type;
- return (expression_t*) select;
+ /* 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->select.compound_entry = iter;
+ select->base.datatype = expression_type;
+ return select;
}
static expression_t *parse_call_expression(unsigned precedence,
expression_t *expression)
{
(void) precedence;
- call_expression_t *call = allocate_ast_zero(sizeof(call[0]));
- call->expression.type = EXPR_CALL;
- call->function = expression;
-
- function_type_t *function_type;
- type_t *type = expression->datatype;
- if(type->type != TYPE_FUNCTION) {
- /* TODO calling pointers to functions is ok */
- parser_print_error_prefix();
- fputs("called object '", stderr);
- print_expression(expression);
- fputs("' (type ", stderr);
- print_type_quoted(type);
- fputs("is not a function\n", stderr);
-
- function_type = NULL;
- call->expression.datatype = NULL;
- } else {
- function_type = (function_type_t*) type;
- call->expression.datatype = function_type->result_type;
+ expression_t *result = allocate_expression_zero(EXPR_CALL);
+
+ call_expression_t *call = &result->call;
+ call->function = expression;
+
+ function_type_t *function_type = NULL;
+ type_t *orig_type = expression->base.datatype;
+ if(orig_type != NULL) {
+ type_t *type = skip_typeref(orig_type);
+
+ if(is_type_pointer(type)) {
+ pointer_type_t *pointer_type = &type->pointer;
+
+ type = skip_typeref(pointer_type->points_to);
+
+ if (type->type == TYPE_FUNCTION) {
+ function_type = &type->function;
+ call->expression.datatype = function_type->result_type;
+ }
+ }
+ if(function_type == NULL) {
+ parser_print_error_prefix();
+ fputs("called object '", stderr);
+ print_expression(expression);
+ fputs("' (type ", stderr);
+ print_type_quoted(orig_type);
+ fputs(") is not a pointer to a function\n", stderr);
+
+ function_type = NULL;
+ call->expression.datatype = NULL;
+ }
}
/* parse arguments */
} else {
/* do default promotion */
for( ; argument != NULL; argument = argument->next) {
- type_t *type = argument->expression->datatype;
+ type_t *type = argument->expression->base.datatype;
+ type = skip_typeref(type);
if(type == NULL)
continue;
} else if(type == type_float) {
type = type_double;
}
+
argument->expression
= create_implicit_cast(argument->expression, type);
}
}
}
- return (expression_t*) call;
+ return result;
}
-static type_t *get_type_after_conversion(const type_t *type1,
- const type_t *type2)
-{
- /* TODO... */
- (void) type2;
- return (type_t*) type1;
-}
+static type_t *semantic_arithmetic(type_t *type_left, type_t *type_right);
static expression_t *parse_conditional_expression(unsigned precedence,
expression_t *expression)
conditional_expression_t *conditional
= allocate_ast_zero(sizeof(conditional[0]));
conditional->expression.type = EXPR_CONDITIONAL;
- conditional->condition = expression;
+ conditional->condition = expression;
/* 6.5.15.2 */
- type_t *condition_type = conditional->condition->datatype;
- if(condition_type != NULL) {
- if(!is_type_scalar(condition_type)) {
- type_error("expected a scalar type", expression->source_position,
- condition_type);
+ type_t *condition_type_orig = conditional->condition->base.datatype;
+ if(condition_type_orig != NULL) {
+ type_t *condition_type = skip_typeref(condition_type_orig);
+ if(condition_type != NULL && !is_type_scalar(condition_type)) {
+ type_error("expected a scalar type",
+ expression->base.source_position, condition_type_orig);
}
}
- conditional->true_expression = parse_expression();
+ expression_t *const t_expr = parse_expression();
+ conditional->true_expression = t_expr;
expect(':');
- conditional->false_expression = parse_sub_expression(precedence);
+ expression_t *const f_expr = parse_sub_expression(precedence);
+ conditional->false_expression = f_expr;
- type_t *true_type = conditional->true_expression->datatype;
+ type_t *const true_type = t_expr->base.datatype;
if(true_type == NULL)
return (expression_t*) conditional;
- type_t *false_type = conditional->false_expression->datatype;
+ type_t *const false_type = f_expr->base.datatype;
if(false_type == NULL)
return (expression_t*) conditional;
+ type_t *const skipped_true_type = skip_typeref(true_type);
+ type_t *const skipped_false_type = skip_typeref(false_type);
+
/* 6.5.15.3 */
- if(true_type == false_type) {
- conditional->expression.datatype = true_type;
- } else if(is_type_arithmetic(true_type) && is_type_arithmetic(false_type)) {
- type_t *result = get_type_after_conversion(true_type, false_type);
- /* TODO: create implicit convs if necessary */
+ if (skipped_true_type == skipped_false_type) {
+ conditional->expression.datatype = skipped_true_type;
+ } else if (is_type_arithmetic(skipped_true_type) &&
+ is_type_arithmetic(skipped_false_type)) {
+ type_t *const result = semantic_arithmetic(skipped_true_type,
+ skipped_false_type);
+ conditional->true_expression = create_implicit_cast(t_expr, result);
+ conditional->false_expression = create_implicit_cast(f_expr, result);
conditional->expression.datatype = result;
- } else if(true_type->type == TYPE_POINTER &&
- false_type->type == TYPE_POINTER &&
+ } else if (skipped_true_type->type == TYPE_POINTER &&
+ skipped_false_type->type == TYPE_POINTER &&
true /* TODO compatible points_to types */) {
/* TODO */
- } else if(/* (is_null_ptr_const(true_type) && false_type->type == TYPE_POINTER)
- || (is_null_ptr_const(false_type) &&
- true_type->type == TYPE_POINTER) TODO*/ false) {
+ } else if(/* (is_null_ptr_const(skipped_true_type) &&
+ skipped_false_type->type == TYPE_POINTER)
+ || (is_null_ptr_const(skipped_false_type) &&
+ skipped_true_type->type == TYPE_POINTER) TODO*/ false) {
/* TODO */
} else if(/* 1 is pointer to object type, other is void* */ false) {
/* TODO */
} else {
type_error_incompatible("while parsing conditional",
- expression->source_position, true_type,
- false_type);
+ expression->base.source_position, true_type,
+ skipped_false_type);
}
return (expression_t*) conditional;
return parse_sub_expression(precedence);
}
+static expression_t *parse_builtin_classify_type(const unsigned precedence)
+{
+ eat(T___builtin_classify_type);
+
+ classify_type_expression_t *const classify_type_expr =
+ allocate_ast_zero(sizeof(classify_type_expr[0]));
+ classify_type_expr->expression.type = EXPR_CLASSIFY_TYPE;
+ classify_type_expr->expression.datatype = type_int;
+
+ expect('(');
+ expression_t *const expression = parse_sub_expression(precedence);
+ expect(')');
+ classify_type_expr->type_expression = expression;
+
+ return (expression_t*)classify_type_expr;
+}
+
static void semantic_incdec(unary_expression_t *expression)
{
- type_t *orig_type = expression->value->datatype;
+ type_t *orig_type = expression->value->base.datatype;
if(orig_type == NULL)
return;
static void semantic_unexpr_arithmetic(unary_expression_t *expression)
{
- type_t *orig_type = expression->value->datatype;
+ type_t *orig_type = expression->value->base.datatype;
if(orig_type == NULL)
return;
expression->expression.datatype = orig_type;
}
+static void semantic_unexpr_scalar(unary_expression_t *expression)
+{
+ type_t *orig_type = expression->value->base.datatype;
+ if(orig_type == NULL)
+ return;
+
+ type_t *type = skip_typeref(orig_type);
+ if (!is_type_scalar(type)) {
+ parse_error("operand of ! must be of scalar type\n");
+ return;
+ }
+
+ expression->expression.datatype = orig_type;
+}
+
+static void semantic_unexpr_integer(unary_expression_t *expression)
+{
+ type_t *orig_type = expression->value->base.datatype;
+ if(orig_type == NULL)
+ return;
+
+ type_t *type = skip_typeref(orig_type);
+ if (!is_type_integer(type)) {
+ parse_error("operand of ~ must be of integer type\n");
+ return;
+ }
+
+ expression->expression.datatype = orig_type;
+}
+
static void semantic_dereference(unary_expression_t *expression)
{
- type_t *orig_type = expression->value->datatype;
+ type_t *orig_type = expression->value->base.datatype;
if(orig_type == NULL)
return;
type_t *type = skip_typeref(orig_type);
- if(type->type != TYPE_POINTER) {
- /* TODO: improve error message */
+ if(!is_type_pointer(type)) {
parser_print_error_prefix();
- fprintf(stderr, "operation needs a pointer type\n");
+ fputs("Unary '*' needs pointer or arrray type, but type ", stderr);
+ print_type_quoted(orig_type);
+ fputs(" given.\n", stderr);
return;
}
- pointer_type_t *pointer_type = (pointer_type_t*) type;
- expression->expression.datatype = pointer_type->points_to;
+ pointer_type_t *pointer_type = &type->pointer;
+ type_t *result_type = pointer_type->points_to;
+
+ result_type = automatic_type_conversion(result_type);
+ expression->expression.datatype = result_type;
}
static void semantic_take_addr(unary_expression_t *expression)
{
- type_t *orig_type = expression->value->datatype;
+ expression_t *value = expression->value;
+ value->base.datatype = revert_automatic_type_conversion(value);
+
+ type_t *orig_type = value->base.datatype;
if(orig_type == NULL)
return;
- expression_t *value = expression->value;
if(value->type == EXPR_REFERENCE) {
reference_expression_t *reference = (reference_expression_t*) value;
declaration_t *declaration = reference->declaration;
}
}
- expression->expression.datatype = make_pointer_type(orig_type, 0);
+ expression->expression.datatype = make_pointer_type(orig_type, TYPE_QUALIFIER_NONE);
}
#define CREATE_UNARY_EXPRESSION_PARSER(token_type, unexpression_type, sfunc) \
CREATE_UNARY_EXPRESSION_PARSER('-', UNEXPR_NEGATE, semantic_unexpr_arithmetic)
CREATE_UNARY_EXPRESSION_PARSER('+', UNEXPR_PLUS, semantic_unexpr_arithmetic)
-CREATE_UNARY_EXPRESSION_PARSER('!', UNEXPR_NOT, semantic_unexpr_arithmetic)
+CREATE_UNARY_EXPRESSION_PARSER('!', UNEXPR_NOT, semantic_unexpr_scalar)
CREATE_UNARY_EXPRESSION_PARSER('*', UNEXPR_DEREFERENCE, semantic_dereference)
CREATE_UNARY_EXPRESSION_PARSER('&', UNEXPR_TAKE_ADDRESS, semantic_take_addr)
CREATE_UNARY_EXPRESSION_PARSER('~', UNEXPR_BITWISE_NEGATE,
- semantic_unexpr_arithmetic)
+ semantic_unexpr_integer)
CREATE_UNARY_EXPRESSION_PARSER(T_PLUSPLUS, UNEXPR_PREFIX_INCREMENT,
semantic_incdec)
CREATE_UNARY_EXPRESSION_PARSER(T_MINUSMINUS, UNEXPR_PREFIX_DECREMENT,
bool signed_left = is_type_signed(type_left);
bool signed_right = is_type_signed(type_right);
- if(get_rank(type_left) < get_rank(type_right)) {
+ int rank_left = get_rank(type_left);
+ int rank_right = get_rank(type_right);
+ if(rank_left < rank_right) {
if(signed_left == signed_right || !signed_right) {
return type_right;
} else {
{
expression_t *left = expression->left;
expression_t *right = expression->right;
- type_t *orig_type_left = left->datatype;
- type_t *orig_type_right = right->datatype;
+ type_t *orig_type_left = left->base.datatype;
+ type_t *orig_type_right = right->base.datatype;
if(orig_type_left == NULL || orig_type_right == NULL)
return;
{
expression_t *left = expression->left;
expression_t *right = expression->right;
- type_t *orig_type_left = left->datatype;
- type_t *orig_type_right = right->datatype;
+ type_t *orig_type_left = left->base.datatype;
+ type_t *orig_type_right = right->base.datatype;
if(orig_type_left == NULL || orig_type_right == NULL)
return;
{
expression_t *left = expression->left;
expression_t *right = expression->right;
- type_t *orig_type_left = left->datatype;
- type_t *orig_type_right = right->datatype;
+ type_t *orig_type_left = left->base.datatype;
+ type_t *orig_type_right = right->base.datatype;
if(orig_type_left == NULL || orig_type_right == NULL)
return;
expression->right = create_implicit_cast(right, arithmetic_type);
expression->expression.datatype = arithmetic_type;
return;
- } else if(type_left->type == TYPE_POINTER && is_type_integer(type_right)) {
+ } else if(is_type_pointer(type_left) && is_type_integer(type_right)) {
expression->expression.datatype = type_left;
- } else if(type_right->type == TYPE_POINTER && is_type_integer(type_left)) {
+ } else if(is_type_pointer(type_right) && is_type_integer(type_left)) {
expression->expression.datatype = type_right;
} else {
parser_print_error_prefix();
{
expression_t *left = expression->left;
expression_t *right = expression->right;
- type_t *orig_type_left = left->datatype;
- type_t *orig_type_right = right->datatype;
+ type_t *orig_type_left = left->base.datatype;
+ type_t *orig_type_right = right->base.datatype;
if(orig_type_left == NULL || orig_type_right == NULL)
return;
{
expression_t *left = expression->left;
expression_t *right = expression->right;
- type_t *orig_type_left = left->datatype;
- type_t *orig_type_right = right->datatype;
+ type_t *orig_type_left = left->base.datatype;
+ type_t *orig_type_right = right->base.datatype;
if(orig_type_left == NULL || orig_type_right == NULL)
return;
expression->left = create_implicit_cast(left, arithmetic_type);
expression->right = create_implicit_cast(right, arithmetic_type);
expression->expression.datatype = arithmetic_type;
+ } else if (type_left->type == TYPE_POINTER &&
+ type_right->type == TYPE_POINTER) {
+ /* TODO check compatibility */
+ } else if (type_left->type == TYPE_POINTER) {
+ expression->right = create_implicit_cast(right, type_left);
+ } else if (type_right->type == TYPE_POINTER) {
+ expression->left = create_implicit_cast(left, type_right);
+ } else {
+ type_error_incompatible("invalid operands in comparison",
+ token.source_position, type_left, type_right);
}
expression->expression.datatype = type_int;
}
{
expression_t *left = expression->left;
expression_t *right = expression->right;
- type_t *orig_type_left = left->datatype;
- type_t *orig_type_right = right->datatype;
+ type_t *orig_type_left = left->base.datatype;
+ type_t *orig_type_right = right->base.datatype;
if(orig_type_left == NULL || orig_type_right == NULL)
return;
expression->expression.datatype = type_left;
}
+static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression)
+{
+ expression_t *left = expression->left;
+ expression_t *right = expression->right;
+ type_t *orig_type_left = left->base.datatype;
+ type_t *orig_type_right = right->base.datatype;
+
+ if(orig_type_left == NULL || orig_type_right == NULL)
+ return;
+
+ type_t *type_left = skip_typeref(orig_type_left);
+ type_t *type_right = skip_typeref(orig_type_right);
+
+ if (is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) {
+ /* combined instructions are tricky. We can't create an implicit cast on
+ * the left side, because we need the uncasted form for the store.
+ * The ast2firm pass has to know that left_type must be right_type
+ * for the arithmeitc operation and create a cast by itself */
+ type_t *const arithmetic_type = semantic_arithmetic(type_left, type_right);
+ expression->right = create_implicit_cast(right, arithmetic_type);
+ expression->expression.datatype = type_left;
+ } else if (type_left->type == TYPE_POINTER && is_type_integer(type_right)) {
+ expression->expression.datatype = type_left;
+ } else {
+ parser_print_error_prefix();
+ fputs("Incompatible types ", stderr);
+ print_type_quoted(orig_type_left);
+ fputs(" and ", stderr);
+ print_type_quoted(orig_type_right);
+ fputs(" in assignment\n", stderr);
+ return;
+ }
+}
+
static void semantic_logical_op(binary_expression_t *expression)
{
expression_t *left = expression->left;
expression_t *right = expression->right;
- type_t *orig_type_left = left->datatype;
- type_t *orig_type_right = right->datatype;
+ type_t *orig_type_left = left->base.datatype;
+ type_t *orig_type_right = right->base.datatype;
if(orig_type_left == NULL || orig_type_right == NULL)
return;
type_t *type_left = skip_typeref(orig_type_left);
type_t *type_right = skip_typeref(orig_type_right);
- if(!is_type_arithmetic(type_left) || !is_type_arithmetic(type_right)) {
+ if (!is_type_scalar(type_left) || !is_type_scalar(type_right)) {
/* TODO: improve error message */
parser_print_error_prefix();
- fprintf(stderr, "operation needs arithmetic types\n");
+ fprintf(stderr, "operation needs scalar types\n");
return;
}
expression->expression.datatype = type_int;
}
+static bool has_const_fields(type_t *type)
+{
+ (void) type;
+ /* TODO */
+ return false;
+}
+
static void semantic_binexpr_assign(binary_expression_t *expression)
{
- expression_t *left = expression->left;
- type_t *type_left = left->datatype;
+ expression_t *left = expression->left;
+ type_t *orig_type_left = left->base.datatype;
- if(type_left != NULL) {
- semantic_assign(type_left, &expression->right, "assignment");
+ if(orig_type_left == NULL)
+ return;
+
+ type_t *type_left = revert_automatic_type_conversion(left);
+ type_left = skip_typeref(orig_type_left);
+
+ /* must be a modifiable lvalue */
+ if (type_left->type == TYPE_ARRAY) {
+ parser_print_error_prefix();
+ fprintf(stderr, "Cannot assign to arrays ('");
+ print_expression(left);
+ fprintf(stderr, "')\n");
+ return;
+ }
+ if(type_left->base.qualifiers & TYPE_QUALIFIER_CONST) {
+ parser_print_error_prefix();
+ fprintf(stderr, "assignment to readonly location '");
+ print_expression(left);
+ fprintf(stderr, "' (type ");
+ print_type_quoted(orig_type_left);
+ fprintf(stderr, ")\n");
+ return;
+ }
+ if(is_type_incomplete(type_left)) {
+ parser_print_error_prefix();
+ fprintf(stderr, "left-hand side of assignment '");
+ print_expression(left);
+ fprintf(stderr, "' has incomplete type ");
+ print_type_quoted(orig_type_left);
+ fprintf(stderr, "\n");
+ return;
+ }
+ if(is_type_compound(type_left) && has_const_fields(type_left)) {
+ parser_print_error_prefix();
+ fprintf(stderr, "can't assign to '");
+ print_expression(left);
+ fprintf(stderr, "' because compound type ");
+ print_type_quoted(orig_type_left);
+ fprintf(stderr, " has readonly fields\n");
+ return;
}
- expression->expression.datatype = type_left;
+ semantic_assign(orig_type_left, &expression->right, "assignment");
+
+ expression->expression.datatype = orig_type_left;
}
static void semantic_comma(binary_expression_t *expression)
{
- expression->expression.datatype = expression->right->datatype;
+ expression->expression.datatype = expression->right->base.datatype;
}
#define CREATE_BINEXPR_PARSER(token_type, binexpression_type, sfunc, lr) \
CREATE_BINEXPR_PARSER('^', BINEXPR_BITWISE_XOR, semantic_binexpr_arithmetic, 1)
CREATE_BINEXPR_PARSER(T_ANDAND, BINEXPR_LOGICAL_AND, semantic_logical_op, 1)
CREATE_BINEXPR_PARSER(T_PIPEPIPE, BINEXPR_LOGICAL_OR, semantic_logical_op, 1)
-/* TODO shift has a bit special semantic */
CREATE_BINEXPR_PARSER(T_LESSLESS, BINEXPR_SHIFTLEFT,
semantic_shift_op, 1)
CREATE_BINEXPR_PARSER(T_GREATERGREATER, BINEXPR_SHIFTRIGHT,
semantic_shift_op, 1)
CREATE_BINEXPR_PARSER(T_PLUSEQUAL, BINEXPR_ADD_ASSIGN,
- semantic_arithmetic_assign, 0)
+ semantic_arithmetic_addsubb_assign, 0)
CREATE_BINEXPR_PARSER(T_MINUSEQUAL, BINEXPR_SUB_ASSIGN,
- semantic_arithmetic_assign, 0)
+ semantic_arithmetic_addsubb_assign, 0)
CREATE_BINEXPR_PARSER(T_ASTERISKEQUAL, BINEXPR_MUL_ASSIGN,
semantic_arithmetic_assign, 0)
CREATE_BINEXPR_PARSER(T_SLASHEQUAL, BINEXPR_DIV_ASSIGN,
left = parse_primary_expression();
}
assert(left != NULL);
- left->source_position = source_position;
+ left->base.source_position = source_position;
while(true) {
if(token.type < 0) {
assert(left != NULL);
assert(left->type != EXPR_UNKNOWN);
- left->source_position = source_position;
+ left->base.source_position = source_position;
}
return left;
if(entry->parser != NULL) {
fprintf(stderr, "for token ");
- print_token_type(stderr, token_type);
+ print_token_type(stderr, (token_type_t) token_type);
fprintf(stderr, "\n");
panic("trying to register multiple expression parsers for a token");
}
if(entry->infix_parser != NULL) {
fprintf(stderr, "for token ");
- print_token_type(stderr, token_type);
+ print_token_type(stderr, (token_type_t) token_type);
fprintf(stderr, "\n");
panic("trying to register multiple infix expression parsers for a "
"token");
register_expression_parser(parse_UNEXPR_PREFIX_DECREMENT, T_MINUSMINUS, 25);
register_expression_parser(parse_sizeof, T_sizeof, 25);
register_expression_parser(parse_extension, T___extension__, 25);
+ register_expression_parser(parse_builtin_classify_type,
+ T___builtin_classify_type, 25);
}
label->expression = parse_expression();
expect(':');
- label->statement.next = parse_statement();
+ label->label_statement = parse_statement();
return (statement_t*) label;
}
label->statement.source_position = token.source_position;
expect(':');
- label->statement.next = parse_statement();
+ label->label_statement = parse_statement();
return (statement_t*) label;
}
/* otherwise we need to create a new one */
declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0]));
- declaration->namespace = NAMESPACE_LABEL;
+ declaration->namespc = NAMESPACE_LABEL;
declaration->symbol = symbol;
label_push(declaration);
eat(T_continue);
expect(';');
- statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->type = STATEMENT_CONTINUE;
- statement->source_position = token.source_position;
+ statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
+ statement->type = STATEMENT_CONTINUE;
+ statement->base.source_position = token.source_position;
return statement;
}
eat(T_break);
expect(';');
- statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->type = STATEMENT_BREAK;
- statement->source_position = token.source_position;
+ statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
+ statement->type = STATEMENT_BREAK;
+ statement->base.source_position = token.source_position;
return statement;
}
statement->statement.source_position = token.source_position;
assert(current_function->type->type == TYPE_FUNCTION);
- function_type_t *function_type = (function_type_t*) current_function->type;
+ function_type_t *function_type = ¤t_function->type->function;
type_t *return_type = function_type->result_type;
- expression_t *return_value;
+ expression_t *return_value = NULL;
if(token.type != ';') {
return_value = parse_expression();
+ }
+ expect(';');
+
+ if(return_type == NULL)
+ return (statement_t*) statement;
+
+ return_type = skip_typeref(return_type);
- if(return_type == type_void && return_value->datatype != type_void) {
+ if(return_value != NULL) {
+ type_t *return_value_type = skip_typeref(return_value->base.datatype);
+
+ if(is_type_atomic(return_type, ATOMIC_TYPE_VOID)
+ && !is_type_atomic(return_value_type, ATOMIC_TYPE_VOID)) {
parse_warning("'return' with a value, in function returning void");
return_value = NULL;
} else {
}
}
} else {
- return_value = NULL;
- if(return_type != type_void) {
+ if(!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) {
parse_warning("'return' without value, in function returning "
"non-void");
}
}
statement->return_value = return_value;
- expect(';');
-
return (statement_t*) statement;
}
break;
}
- assert(statement == NULL || statement->source_position.input_name != NULL);
+ assert(statement == NULL
+ || statement->base.source_position.input_name != NULL);
return statement;
}
continue;
if(last_statement != NULL) {
- last_statement->next = statement;
+ last_statement->base.next = statement;
} else {
compound_statement->statements = statement;
}
- while(statement->next != NULL)
- statement = statement->next;
+ while(statement->base.next != NULL)
+ statement = statement->base.next;
last_statement = statement;
}
init_expression_parsers();
obstack_init(&temp_obst);
- type_int = make_atomic_type(ATOMIC_TYPE_INT, 0);
- type_uint = make_atomic_type(ATOMIC_TYPE_UINT, 0);
- type_long_double = make_atomic_type(ATOMIC_TYPE_LONG_DOUBLE, 0);
- type_double = make_atomic_type(ATOMIC_TYPE_DOUBLE, 0);
- type_float = make_atomic_type(ATOMIC_TYPE_FLOAT, 0);
- type_size_t = make_atomic_type(ATOMIC_TYPE_ULONG, 0);
- type_ptrdiff_t = make_atomic_type(ATOMIC_TYPE_LONG, 0);
- type_const_char = make_atomic_type(ATOMIC_TYPE_CHAR, TYPE_QUALIFIER_CONST);
- type_void = make_atomic_type(ATOMIC_TYPE_VOID, 0);
- type_string = make_pointer_type(type_const_char, 0);
+ type_int = make_atomic_type(ATOMIC_TYPE_INT, TYPE_QUALIFIER_NONE);
+ type_long_double = make_atomic_type(ATOMIC_TYPE_LONG_DOUBLE, TYPE_QUALIFIER_NONE);
+ type_double = make_atomic_type(ATOMIC_TYPE_DOUBLE, TYPE_QUALIFIER_NONE);
+ type_float = make_atomic_type(ATOMIC_TYPE_FLOAT, TYPE_QUALIFIER_NONE);
+ type_size_t = make_atomic_type(ATOMIC_TYPE_ULONG, TYPE_QUALIFIER_NONE);
+ type_ptrdiff_t = make_atomic_type(ATOMIC_TYPE_LONG, TYPE_QUALIFIER_NONE);
+ type_char = make_atomic_type(ATOMIC_TYPE_CHAR, TYPE_QUALIFIER_NONE);
+ type_void = make_atomic_type(ATOMIC_TYPE_VOID, TYPE_QUALIFIER_NONE);
+ type_void_ptr = make_pointer_type(type_void, TYPE_QUALIFIER_NONE);
+ type_string = make_pointer_type(type_char, TYPE_QUALIFIER_NONE);
}
void exit_parser(void)