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;
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)
-{
- void *res = obstack_alloc(type_obst, size);
+static size_t get_expression_struct_size(expression_type_t type)
+{
+ static const size_t sizes[] = {
+ [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);
+ (void) get_expression_struct_size;
+ return sizes[type];
+}
+
+static size_t get_type_struct_size(type_type_t type)
+{
+ 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);
}
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;
}
print_type_quoted(previous_declaration->type);
fputc('\n', stderr);
} else {
- const storage_class_t old_storage = previous_declaration->storage_class;
- const storage_class_t new_storage = declaration->storage_class;
+ unsigned old_storage_class = previous_declaration->storage_class;
+ unsigned new_storage_class = declaration->storage_class;
if (current_function == NULL) {
- if (old_storage != STORAGE_CLASS_STATIC &&
- new_storage == STORAGE_CLASS_STATIC) {
+ 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",
fprintf(stderr, "previous declaration of '%s' was here\n",
symbol->string);
} else {
- if (old_storage == STORAGE_CLASS_EXTERN) {
- if (new_storage == STORAGE_CLASS_NONE) {
+ if (old_storage_class == STORAGE_CLASS_EXTERN) {
+ if (new_storage_class == STORAGE_CLASS_NONE) {
previous_declaration->storage_class = STORAGE_CLASS_NONE;
}
} else {
}
}
} else {
- if (old_storage == STORAGE_CLASS_EXTERN &&
- new_storage == STORAGE_CLASS_EXTERN) {
+ 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);
symbol->string);
} else {
parser_print_error_prefix_pos(declaration->source_position);
- if (old_storage == new_storage) {
+ 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);
stack_entry_t entry;
entry.symbol = symbol;
entry.old_declaration = symbol->declaration;
- entry.namespc = namespc;
+ entry.namespc = (unsigned short) namespc;
ARR_APP1(stack_entry_t, *stack_ptr, entry);
/* replace/add declaration into declaration list of the symbol */
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;
}
return (expression_t*) cast;
}
-static bool is_null_expression(const expression_t *const expr)
+static bool is_null_expression(const expression_t *const expression)
{
- if (expr->type != EXPR_CONST) return false;
+ if (expression->type != EXPR_CONST)
+ return false;
- type_t *const type = skip_typeref(expr->datatype);
- if (!is_type_integer(type)) return false;
+ type_t *const type = skip_typeref(expression->base.datatype);
+ if (!is_type_integer(type))
+ return false;
- const const_t *const const_expr = (const const_t*)expr;
- return const_expr->v.int_value == 0;
+ 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");
+ 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");
+ }
- 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;
- }
+ 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);
- }
- if(dest_type->type == TYPE_POINTER) {
- pointer_type_t *pointer_type
- = (pointer_type_t*) dest_type;
- switch (source_type->type) {
- case TYPE_ATOMIC:
- if (is_null_expression(expression)) {
- return create_cast_expression(expression, dest_type);
- }
- break;
+ return create_cast_expression(expression, dest_type);
- case TYPE_POINTER:
- if (pointers_compatible(source_type, dest_type)) {
- return create_cast_expression(expression, dest_type);
- }
- break;
+ 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_ARRAY: {
- array_type_t *const array_type = (array_type_t*) source_type;
- if (types_compatible(array_type->element_type,
- pointer_type->points_to)) {
- return create_cast_expression(expression, dest_type);
+ 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;
}
- break;
+
+ default:
+ panic("casting of non-atomic types not implemented yet");
}
- 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;
- type_error_incompatible("can't implicitly cast types",
- expression->source_position,
- source_type, dest_type);
- return expression;
+ default:
+ panic("casting of non-atomic types not implemented yet");
}
-
- 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 *const type_left = skip_typeref(orig_type_left);
type_t *const type_right = skip_typeref(orig_type_right);
- if (type_left == type_right) {
- return;
- }
-
if ((is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) ||
- (type_left->type == TYPE_POINTER && is_null_expression(*right)) ||
- (type_left->type == TYPE_POINTER && type_right->type == TYPE_POINTER)) {
+ (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);
return;
}
- if (type_left->type == TYPE_POINTER) {
- switch (type_right->type) {
- case TYPE_FUNCTION: {
- pointer_type_t *const ptr_type = (pointer_type_t*)type_left;
- if (ptr_type->points_to == type_right) {
- return;
- }
- break;
- }
+ 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;
- case TYPE_ARRAY: {
- pointer_type_t *const ptr_type = (pointer_type_t*)type_left;
- array_type_t *const arr_type = (array_type_t*)type_right;
- if (ptr_type->points_to == arr_type->element_type) {
- return;
- }
- break;
- }
+ points_to_left = skip_typeref(points_to_left);
+ points_to_right = skip_typeref(points_to_right);
- default: break;
+ 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);
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('(');
}
#endif
+static initializer_t *initializer_from_string(array_type_t *type,
+ const char *string)
+{
+ /* TODO: check len vs. size of array type */
+ (void) 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)
{
- initializer_value_t *result = allocate_ast_zero(sizeof(result[0]));
-
/* TODO check that expression is a constant 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 = (array_type_t*) type;
+ array_type_t *array_type = &type->array;
type_t *element_type = array_type->element_type;
if(element_type->type == TYPE_ATOMIC) {
- atomic_type_t *atomic_type = (atomic_type_t*) element_type;
+ 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) {
- /* it's fine TODO: check for length of string array... */
- goto initializer_from_expression_finished;
+
+ string_literal_expression_t *literal
+ = &expression->string_literal;
+ return initializer_from_string(array_type, literal->value);
}
}
}
semantic_assign(type, &expression, "initializer");
-initializer_from_expression_finished:
- result->initializer.type = INITIALIZER_VALUE;
- result->value = expression;
+ initializer_t *result = allocate_initializer(INITIALIZER_VALUE);
+ result->value.value = expression;
- return (initializer_t*) result;
+ return result;
}
static initializer_t *parse_sub_initializer(type_t *type,
}
expression_t *expression = parse_assignment_expression();
- type_t *expression_type = skip_typeref(expression->datatype);
+ type_t *expression_type = skip_typeref(expression->base.datatype);
return parse_sub_initializer(type, expression, expression_type);
}
/* TODO: ignore qualifiers, comparing pointers is probably
* not correct */
if(expression != NULL && expression_type == type) {
- initializer_value_t *result = allocate_ast_zero(sizeof(result[0]));
- result->initializer.type = INITIALIZER_VALUE;
+ initializer_t *result = allocate_initializer(INITIALIZER_VALUE);
if(type != NULL) {
semantic_assign(type, &expression, "initializer");
}
- result->value = expression;
+ result->value.value = expression;
- return (initializer_t*) result;
+ return result;
}
bool read_paren = false;
initializer_t *result = NULL;
initializer_t **elems;
if(type->type == TYPE_ARRAY) {
- array_type_t *array_type = (array_type_t*) type;
+ array_type_t *array_type = &type->array;
type_t *element_type = array_type->element_type;
element_type = skip_typeref(element_type);
if(token.type == '}')
break;
- initializer_t *sub
- = parse_sub_initializer(element_type, NULL, NULL);
+ sub = parse_sub_initializer(element_type, NULL, NULL);
if(sub == NULL) {
/* TODO error, do nicer cleanup */
parse_error("member initializer didn't match");
} else {
assert(type->type == TYPE_COMPOUND_STRUCT
|| type->type == TYPE_COMPOUND_UNION);
- compound_type_t *compound_type = (compound_type_t*) type;
+ compound_type_t *compound_type = &type->compound;
context_t *context = & compound_type->declaration->context;
declaration_t *first = context->declarations;
if(token.type == '}')
break;
expect_block(',');
+ if(token.type == '}')
+ break;
type_t *iter_type = iter->type;
iter_type = skip_typeref(iter_type);
- initializer_t *sub = parse_sub_initializer(iter_type, NULL, NULL);
+ sub = parse_sub_initializer(iter_type, NULL, NULL);
if(sub == NULL) {
/* TODO error, do nicer cleanup*/
parse_error("member initializer didn't match");
}
if(declaration == NULL) {
- declaration = allocate_type_zero(sizeof(declaration[0]));
+ declaration = allocate_ast_zero(sizeof(declaration[0]));
if(is_struct) {
declaration->namespc = NAMESPACE_STRUCT;
return declaration;
}
-static void parse_enum_entries(type_t *enum_type)
+static void parse_enum_entries(enum_type_t *const enum_type)
{
eat('{');
return;
}
entry->storage_class = STORAGE_CLASS_ENUM_ENTRY;
- entry->type = enum_type;
+ entry->type = (type_t*) enum_type;
entry->symbol = token.v.symbol;
entry->source_position = token.source_position;
next_token();
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->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(NULL);
+ parse_enum_entries(&type->enumt);
parse_attributes();
}
- return declaration;
+ return type;
}
/**
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 {
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) {
/* 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;
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_qualifier_t)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 unsigned parse_type_qualifiers(void)
+static type_qualifiers_t parse_type_qualifiers(void)
{
- unsigned type_qualifiers = TYPE_QUALIFIER_NONE;
+ type_qualifiers_t type_qualifiers = TYPE_QUALIFIER_NONE;
while(true) {
switch(token.type) {
/* 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 =
- (const array_type_t*)declaration->type;
- declaration->type =
- make_pointer_type(arr_type->element_type, TYPE_QUALIFIER_NONE);
+ 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;
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;
}
{
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 = (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;
+ case CONSTRUCT_ARRAY: {
+ parsed_array_t *parsed_array = (parsed_array_t*) iter;
+ type_t *array_type = allocate_type_zero(TYPE_ARRAY);
+
+ 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) {
/* the function type was constructed earlier freeing it here will
* destroy other types... */
initializer_t *initializer = parse_initializer(type);
if(type->type == TYPE_ARRAY && initializer != NULL) {
- assert(initializer->type == INITIALIZER_LIST);
-
- initializer_list_t *list = (initializer_list_t*) initializer;
- array_type_t *array_type = (array_type_t*) type;
+ array_type_t *array_type = &type->array;
if(array_type->size == NULL) {
- const_t *cnst = allocate_ast_zero(sizeof(cnst[0]));
+ const_expression_t
+ *cnst = allocate_ast_zero(sizeof(cnst[0]));
cnst->expression.type = EXPR_CONST;
cnst->expression.datatype = type_size_t;
- cnst->v.int_value = list->len;
+
+ if(initializer->type == INITIALIZER_LIST) {
+ initializer_list_t *list = &initializer->list;
+ cnst->v.int_value = list->len;
+ } else {
+ assert(initializer->type == INITIALIZER_STRING);
+ initializer_string_t *string = &initializer->string;
+ cnst->v.int_value = strlen(string->string) + 1;
+ }
array_type->size = (expression_t*) cnst;
}
switch (specifiers.type->type) {
case TYPE_COMPOUND_STRUCT:
case TYPE_COMPOUND_UNION: {
- const compound_type_t *const comp_type =
- (const compound_type_t*)specifiers.type;
+ 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");
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_ast_zero(sizeof(expression[0]));
+ expression->type = 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]));
+ string_literal_expression_t *cnst = allocate_ast_zero(sizeof(cnst[0]));
cnst->expression.type = EXPR_STRING_LITERAL;
cnst->expression.datatype = type_string;
static expression_t *parse_int_const(void)
{
- const_t *cnst = allocate_ast_zero(sizeof(cnst[0]));
+ const_expression_t *cnst = allocate_ast_zero(sizeof(cnst[0]));
cnst->expression.type = EXPR_CONST;
cnst->expression.datatype = token.datatype;
static expression_t *parse_float_const(void)
{
- const_t *cnst = allocate_ast_zero(sizeof(cnst[0]));
+ const_expression_t *cnst = allocate_ast_zero(sizeof(cnst[0]));
cnst->expression.type = EXPR_CONST;
cnst->expression.datatype = token.datatype;
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]));
-
- function_type->type.type = TYPE_FUNCTION;
- function_type->result_type = type_int;
- function_type->unspecified_parameters = true;
+ type_t *ntype = allocate_type_zero(TYPE_FUNCTION);
+ ntype->function.result_type = type_int;
+ ntype->function.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
+ = (const reference_expression_t*) expression;
+ return ref->declaration->type;
+ }
+ case EXPR_SELECT: {
+ const select_expression_t *select
+ = (const select_expression_t*) expression;
+ return select->compound_entry->type;
+ }
+ case EXPR_UNARY: {
+ const unary_expression_t *unary
+ = (const unary_expression_t*) expression;
+ 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
+ = (const builtin_symbol_expression_t*) expression;
+ 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]));
}
}
+ 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;
}
/* 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;
}
const expression_statement_t *expression_statement =
(const expression_statement_t*) last_statement;
expression->expression.datatype
- = expression_statement->expression->datatype;
+ = expression_statement->expression->base.datatype;
} else {
expression->expression.datatype = type_void;
}
parse_error("'__func__' used outside of a function");
}
- 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_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";
return (expression_t*) expression;
}
-static type_t *make_function_1_type(type_t *result_type, type_t *argument_type)
-{
- function_parameter_t *parameter = allocate_type_zero(sizeof(parameter[0]));
- parameter->type = argument_type;
-
- function_type_t *type = allocate_type_zero(sizeof(type[0]));
- type->type.type = TYPE_FUNCTION;
- type->result_type = result_type;
- type->parameters = parameter;
-
- type_t *result = typehash_insert((type_t*) type);
- if(result != (type_t*) type) {
- free_type(type);
- }
-
- return result;
-}
-
static expression_t *parse_builtin_symbol(void)
{
builtin_symbol_expression_t *expression
expression->expression.type = EXPR_BUILTIN_SYMBOL;
expression->symbol = token.v.symbol;
-
- type_t *type;
- switch(token.type) {
- case T___builtin_alloca:
- type = make_function_1_type(type_void_ptr, type_size_t);
- break;
- }
-
next_token();
+ type_t *type = get_builtin_symbol_type(expression->symbol);
+ type = automatic_type_conversion(type);
+
expression->expression.datatype = type;
return (expression_t*) expression;
}
}
static expression_t *parse_array_expression(unsigned precedence,
- expression_t *array_ref)
+ expression_t *left)
{
(void) precedence;
eat('[');
- expression_t *index = parse_expression();
+ 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 = index;
-
- type_t *type_left = skip_typeref(array_ref->datatype);
- type_t *type_right = skip_typeref(index->datatype);
-
- if(type_left != NULL && type_right != NULL) {
- if(type_left->type == TYPE_POINTER) {
- pointer_type_t *pointer = (pointer_type_t*) type_left;
- array_access->expression.datatype = pointer->points_to;
- } else if(type_left->type == TYPE_ARRAY) {
- array_type_t *array_type = (array_type_t*) type_left;
- array_access->expression.datatype = array_type->element_type;
- } else if(type_right->type == TYPE_POINTER) {
- pointer_type_t *pointer = (pointer_type_t*) type_right;
- array_access->expression.datatype = pointer->points_to;
- } else if(type_right->type == TYPE_ARRAY) {
- array_type_t *array_type = (array_type_t*) type_right;
- array_access->expression.datatype = array_type->element_type;
+
+ 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 types ");
print_type_quoted(type_left);
fprintf(stderr, ", ");
- print_type_quoted(type_right);
+ 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;
}
select->symbol = symbol;
next_token();
- type_t *orig_type = compound->datatype;
+ type_t *orig_type = compound->base.datatype;
if(orig_type == NULL)
return make_invalid_expression();
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) {
return make_invalid_expression();
}
+ /* 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->compound_entry = iter;
- select->expression.datatype = iter->type;
+ select->expression.datatype = expression_type;
return (expression_t*) select;
}
call->expression.type = EXPR_CALL;
call->function = expression;
- function_type_t *function_type;
- type_t *orig_type = expression->datatype;
- type_t *type = skip_typeref(orig_type);
+ 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(type->type == TYPE_POINTER) {
- pointer_type_t *pointer_type = (pointer_type_t*) 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 = (function_type_t*) type;
- call->expression.datatype = function_type->result_type;
- } else {
- parser_print_error_prefix();
- fputs("called object '", stderr);
- print_expression(expression);
- fputs("' (type ", stderr);
- print_type_quoted(orig_type);
- fputs(") is not a function\n", stderr);
+ type = skip_typeref(pointer_type->points_to);
- function_type = NULL;
- call->expression.datatype = NULL;
+ 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);
}
conditional->condition = expression;
/* 6.5.15.2 */
- type_t *condition_type_orig = conditional->condition->datatype;
+ 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->source_position,
- condition_type_orig);
+ type_error("expected a scalar type",
+ expression->base.source_position, condition_type_orig);
}
}
expression_t *const f_expr = parse_sub_expression(precedence);
conditional->false_expression = f_expr;
- type_t *const true_type = t_expr->datatype;
+ type_t *const true_type = t_expr->base.datatype;
if(true_type == NULL)
return (expression_t*) conditional;
- type_t *const false_type = f_expr->datatype;
+ type_t *const false_type = f_expr->base.datatype;
if(false_type == NULL)
return (expression_t*) conditional;
/* TODO */
} else {
type_error_incompatible("while parsing conditional",
- expression->source_position, true_type,
+ expression->base.source_position, true_type,
skipped_false_type);
}
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;
static void semantic_unexpr_scalar(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_integer(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_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);
- switch (type->type) {
- case TYPE_ARRAY: {
- array_type_t *const array_type = (array_type_t*)type;
- expression->expression.datatype = array_type->element_type;
- break;
- }
+ if(!is_type_pointer(type)) {
+ parser_print_error_prefix();
+ fputs("Unary '*' needs pointer or arrray type, but type ", stderr);
+ print_type_quoted(orig_type);
+ fputs(" given.\n", stderr);
+ return;
+ }
- case TYPE_POINTER: {
- pointer_type_t *pointer_type = (pointer_type_t*)type;
- expression->expression.datatype = pointer_type->points_to;
- break;
- }
+ pointer_type_t *pointer_type = &type->pointer;
+ type_t *result_type = pointer_type->points_to;
- default:
- parser_print_error_prefix();
- fputs("'Unary *' needs pointer or arrray type, but type ", stderr);
- print_type_quoted(orig_type);
- fputs(" given.\n", stderr);
- return;
- }
+ 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) \
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 if (type_left->type == TYPE_ARRAY && is_type_integer(type_right)) {
- const array_type_t *const arr_type = (const array_type_t*)type_left;
- expression->expression.datatype =
- make_pointer_type(arr_type->element_type, TYPE_QUALIFIER_NONE);
- } else if (type_right->type == TYPE_ARRAY && is_type_integer(type_left)) {
- const array_type_t *const arr_type = (const array_type_t*)type_right;
- expression->expression.datatype =
- make_pointer_type(arr_type->element_type, TYPE_QUALIFIER_NONE);
} else {
parser_print_error_prefix();
fprintf(stderr, "invalid operands to binary + (");
{
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_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->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)
+ 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) {
- parse_error("Cannot assign to arrays.");
- } else if (type_left != NULL) {
- semantic_assign(type_left, &expression->right, "assignment");
+ 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) \
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");
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_void_ptr = make_pointer_type(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)
projects / cparser / blobdiff