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;
return res;
}
+static inline size_t get_initializer_size(initializer_type_t type)
+{
+ static const size_t size[] = {
+ [INITIALIZER_VALUE] = sizeof(initializer_value_t),
+ [INITIALIZER_STRING] = sizeof(initializer_string_t),
+ [INITIALIZER_LIST] = sizeof(initializer_list_t)
+ };
+ assert(type < INITIALIZER_COUNT);
+ assert(size[type] != 0);
+ return size[type];
+}
+
+static inline initializer_t *allocate_initializer(initializer_type_t type)
+{
+ initializer_t *result = allocate_ast_zero(get_initializer_size(type));
+ result->type = type;
+
+ return result;
+}
+
static inline void free_type(void *type)
{
obstack_free(type_obst, type);
print_type_quoted(previous_declaration->type);
fputc('\n', stderr);
} else {
- const storage_class_t old_storage = (storage_class_t)previous_declaration->storage_class;
- const storage_class_t new_storage = (storage_class_t)declaration->storage_class;
+ const storage_class_t old_storage = previous_declaration->storage_class;
+ const storage_class_t new_storage = declaration->storage_class;
if (current_function == NULL) {
if (old_storage != STORAGE_CLASS_STATIC &&
new_storage == STORAGE_CLASS_STATIC) {
{
/* The C-standard allows promoting to int or unsigned int (see § 7.2.2
* and esp. footnote 108). However we can't fold constants (yet), so we
- * can't decide whether unsigned int is possible, while int always works.
+ * can't decide wether unsigned int is possible, while int always works.
* (unsigned int would be preferable when possible... for stuff like
* struct { enum { ... } bla : 4; } ) */
if(type->type == TYPE_ENUM)
return ATOMIC_TYPE_INT;
assert(type->type == TYPE_ATOMIC);
- atomic_type_type_t atype = type->v.atomic_type.atype;
+ atomic_type_t *atomic_type = (atomic_type_t*) type;
+ atomic_type_type_t atype = atomic_type->atype;
return atype;
}
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->source_position, source_type, dest_type);
+ return expression;
+ }
- return create_cast_expression(expression, dest_type);
- }
- if(dest_type->type == TYPE_POINTER) {
- type_t *pointer_type = 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_POINTER:
+ if (pointers_compatible(source_type, dest_type)) {
+ return create_cast_expression(expression, dest_type);
+ }
+ break;
- case TYPE_ARRAY: {
- type_t *const array_type = source_type;
- if (types_compatible(array_type->v.array_type.element_type,
- pointer_type->v.pointer_type.points_to)) {
- return create_cast_expression(expression, dest_type);
+ case TYPE_ARRAY: {
+ array_type_t *array_type = (array_type_t*) source_type;
+ pointer_type_t *pointer_type
+ = (pointer_type_t*) dest_type;
+ 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->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");
-}
-
-static bool is_atomic_type(const type_t *type, atomic_type_type_t atype)
-{
- if(type->type != TYPE_ATOMIC)
- return false;
- return type->v.atomic_type.atype == atype;
-}
-
-static bool is_pointer(const type_t *type)
-{
- return type->type == TYPE_POINTER;
-}
-
-static bool is_compound_type(const type_t *type)
-{
- return type->type == TYPE_COMPOUND_STRUCT
- || type->type == TYPE_COMPOUND_UNION;
}
/** Implements the rules from § 6.5.16.1 */
type_t *const type_right = skip_typeref(orig_type_right);
if ((is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) ||
- (is_pointer(type_left) && is_null_expression(*right)) ||
- (is_atomic_type(type_left, ATOMIC_TYPE_BOOL)
- && is_pointer(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);
return;
}
- if (is_pointer(type_left) && is_pointer(type_right)) {
- type_t *pointer_type_left = type_left;
- type_t *pointer_type_right = type_right;
- type_t *points_to_left = pointer_type_left->v.pointer_type.points_to;
- type_t *points_to_right = pointer_type_right->v.pointer_type.points_to;
+ if (is_type_pointer(type_left) && is_type_pointer(type_right)) {
+ pointer_type_t *pointer_type_left = (pointer_type_t*) type_left;
+ pointer_type_t *pointer_type_right = (pointer_type_t*) type_right;
+ 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_atomic_type(points_to_left, ATOMIC_TYPE_VOID)
- && !is_atomic_type(points_to_right, ATOMIC_TYPE_VOID)
+ 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;
}
return;
}
- if (is_compound_type(type_left)
+ if (is_type_compound(type_left)
&& types_compatible(type_left, type_right)) {
*right = create_implicit_cast(*right, type_left);
return;
next_token();
expect_void('(');
- for (int depth = 1; depth > 0;) {
+ int depth = 1;
+ while(depth > 0) {
switch(token.type) {
case T_EOF:
parse_error("EOF while parsing attribute");
}
#endif
-static initializer_t *initializer_from_string(type_t *type, const char *string)
+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_ast_zero(sizeof(initializer[0]));
-
- initializer->type = INITIALIZER_STRING;
- initializer->v.string = string;
+ 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)
{
-
/* 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) {
- type_t *element_type = type->v.array_type.element_type;
+ array_type_t *array_type = (array_type_t*) type;
+ type_t *element_type = array_type->element_type;
if(element_type->type == TYPE_ATOMIC) {
- atomic_type_type_t atype = element_type->v.atomic_type.atype;
+ atomic_type_t *atomic_type = (atomic_type_t*) element_type;
+ atomic_type_type_t atype = atomic_type->atype;
/* TODO handle wide strings */
if(atype == ATOMIC_TYPE_CHAR
|| atype == ATOMIC_TYPE_UCHAR) {
string_literal_t *literal = (string_literal_t*) expression;
- return initializer_from_string(type, literal->value);
+ return initializer_from_string(array_type, literal->value);
}
}
}
semantic_assign(type, &expression, "initializer");
- initializer_t *result = allocate_ast_zero(sizeof(result[0]));
- result->type = INITIALIZER_VALUE;
- result->v.value = expression;
+ initializer_t *result = allocate_initializer(INITIALIZER_VALUE);
+ result->value.value = expression;
return result;
}
/* TODO: ignore qualifiers, comparing pointers is probably
* not correct */
if(expression != NULL && expression_type == type) {
- initializer_t *result = allocate_ast_zero(sizeof(result[0]));
- result->type = INITIALIZER_VALUE;
+ initializer_t *result = allocate_initializer(INITIALIZER_VALUE);
if(type != NULL) {
semantic_assign(type, &expression, "initializer");
}
- result->v.value = expression;
+ result->value.value = expression;
return result;
}
initializer_t *result = NULL;
initializer_t **elems;
if(type->type == TYPE_ARRAY) {
- type_t *element_type = type->v.array_type.element_type;
- element_type = skip_typeref(element_type);
+ array_type_t *array_type = (array_type_t*) type;
+ type_t *element_type = array_type->element_type;
+ element_type = skip_typeref(element_type);
initializer_t *sub;
had_initializer_brace_warning = false;
} else {
assert(type->type == TYPE_COMPOUND_STRUCT
|| type->type == TYPE_COMPOUND_UNION);
- context_t *context = &type->v.compound_type.declaration->context;
+ compound_type_t *compound_type = (compound_type_t*) type;
+ context_t *context = & compound_type->declaration->context;
declaration_t *first = context->declarations;
if(first == NULL)
if(token.type == '}')
break;
expect_block(',');
+ if(token.type == '}')
+ break;
type_t *iter_type = iter->type;
iter_type = skip_typeref(iter_type);
int len = ARR_LEN(elems);
size_t elems_size = sizeof(initializer_t*) * len;
- initializer_t *init = allocate_ast_zero(sizeof(init[0]) + elems_size);
+ initializer_list_t *init = allocate_ast_zero(sizeof(init[0]) + elems_size);
- init->type = INITIALIZER_LIST;
- init->v.list.len = len;
- memcpy(init->v.list.initializers, elems, elems_size);
+ init->initializer.type = INITIALIZER_LIST;
+ init->len = len;
+ memcpy(init->initializers, elems, elems_size);
DEL_ARR_F(elems);
- result = init;
+ result = (initializer_t*) init;
if(read_paren) {
if(token.type == ',')
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);
declaration->symbol = symbol;
}
+ enum_type_t *const enum_type = allocate_type_zero(sizeof(enum_type[0]));
+ enum_type->type.type = TYPE_ENUM;
+ enum_type->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(enum_type);
parse_attributes();
}
- return declaration;
+ return (type_t*) enum_type;
}
/**
expect(')');
- type_t *typeof = allocate_type_zero(sizeof(typeof[0]));
- typeof->type = TYPE_TYPEOF;
- typeof->v.typeof_type.expression = expression;
- typeof->v.typeof_type.typeof_type = type;
+ typeof_type_t *typeof = allocate_type_zero(sizeof(typeof[0]));
+ typeof->type.type = TYPE_TYPEOF;
+ typeof->expression = expression;
+ typeof->typeof_type = type;
- return typeof;
+ return (type_t*) typeof;
}
typedef enum {
static type_t *create_builtin_type(symbol_t *symbol)
{
- type_t *type = allocate_type_zero(sizeof(type[0]));
- type->type = TYPE_BUILTIN;
- type->v.builtin_type.symbol = symbol;
+ builtin_type_t *type = allocate_type_zero(sizeof(type[0]));
+ type->type.type = TYPE_BUILTIN;
+ type->symbol = symbol;
/* TODO... */
- type->v.builtin_type.real_type = type_int;
+ type->real_type = type_int;
- return type;
+ return (type_t*) type;
}
static type_t *get_typedef_type(symbol_t *symbol)
|| declaration->storage_class != STORAGE_CLASS_TYPEDEF)
return NULL;
- type_t *type = allocate_type_zero(sizeof(type[0]));
- type->type = TYPE_TYPEDEF;
- type->v.typedef_type.declaration = declaration;
+ typedef_type_t *typedef_type = allocate_type_zero(sizeof(typedef_type[0]));
+ typedef_type->type.type = TYPE_TYPEDEF;
+ typedef_type->declaration = declaration;
- return type;
+ return (type_t*) typedef_type;
}
static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
{
- type_t *type = NULL;
- type_qualifiers_t type_qualifiers = TYPE_QUALIFIER_NONE;
- 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:
- type = allocate_type_zero(sizeof(type[0]));
- type->type = TYPE_COMPOUND_STRUCT;
- type->v.compound_type.declaration = parse_compound_type_specifier(true);
+ case T_struct: {
+ type = allocate_type_zero(sizeof(struct compound_type_t));
+ compound_type_t *compound_type = (compound_type_t*) type;
+ compound_type->type.type = TYPE_COMPOUND_STRUCT;
+ compound_type->declaration = parse_compound_type_specifier(true);
break;
- case T_union:
- type = allocate_type_zero(sizeof(type[0]));
- type->type = TYPE_COMPOUND_UNION;
- type->v.compound_type.declaration = parse_compound_type_specifier(false);
+ }
+ case T_union: {
+ type = allocate_type_zero(sizeof(compound_type_t));
+ compound_type_t *compound_type = (compound_type_t*) type;
+ compound_type->type.type = TYPE_COMPOUND_UNION;
+ compound_type->declaration = parse_compound_type_specifier(false);
break;
+ }
case T_enum:
- type = allocate_type_zero(sizeof(type[0]));
- type->type = TYPE_ENUM;
- type->v.enum_type.declaration = parse_enum_specifier();
-
+ type = parse_enum_specifier();
break;
case T___typeof__:
type = parse_typeof();
atomic_type = ATOMIC_TYPE_INVALID;
}
- type = allocate_type_zero(sizeof(type[0]));
- type->type = TYPE_ATOMIC;
- type->v.atomic_type.atype = atomic_type;
- newtype = 1;
+ 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;
} else {
if(type_specifiers != 0) {
parse_error("multiple datatypes in declaration");
}
}
- type->qualifiers = type_qualifiers;
+ type->qualifiers = (type_qualifier_t)type_qualifiers;
type_t *result = typehash_insert(type);
- if(newtype && result != type) {
+ if(newtype && result != (type_t*) type) {
free_type(type);
}
parse_error("typedef not allowed in parameter list");
}
- /* Array as last part of a parameter type is just syntactic sugar. Turn it
+ /* Array as last part of a paramter type is just syntactic sugar. Turn it
* into a pointer */
if (declaration->type->type == TYPE_ARRAY) {
- const type_t *const arr_type = declaration->type;
- declaration->type =
- make_pointer_type(arr_type->v.array_type.element_type, TYPE_QUALIFIER_NONE);
+ const array_type_t *const arr_type =
+ (const array_type_t*)declaration->type;
+ type_t *element_type = arr_type->element_type;
+ declaration->type = make_pointer_type(element_type, TYPE_QUALIFIER_NONE);
}
return declaration;
}
-static declaration_t *parse_parameters(type_t *type)
+static declaration_t *parse_parameters(function_type_t *type)
{
if(token.type == T_IDENTIFIER) {
symbol_t *symbol = token.v.symbol;
}
if(token.type == ')') {
- type->v.function_type.unspecified_parameters = 1;
+ type->unspecified_parameters = 1;
return NULL;
}
if(token.type == T_void && look_ahead(1)->type == ')') {
switch(token.type) {
case T_DOTDOTDOT:
next_token();
- type->v.function_type.variadic = 1;
+ type->variadic = 1;
return declarations;
case T_IDENTIFIER:
last_declaration->next = declaration;
last_parameter->next = parameter;
} else {
- type->v.function_type.parameters = parameter;
+ type->parameters = parameter;
declarations = declaration;
}
last_parameter = parameter;
typedef struct construct_function_type_t construct_function_type_t;
struct construct_function_type_t {
construct_type_t construct_type;
- type_t *function_type;
+ function_type_t *function_type;
};
typedef struct parsed_array_t parsed_array_t;
{
eat('(');
- type_t *type = allocate_type_zero(sizeof(type[0]));
- type->type = TYPE_FUNCTION;
+ function_type_t *type = allocate_type_zero(sizeof(type[0]));
+ type->type.type = TYPE_FUNCTION;
declaration_t *parameters = parse_parameters(type);
if(declaration != NULL) {
parsed_pointer_t *parsed_pointer;
parsed_array_t *parsed_array;
construct_function_type_t *construct_function_type;
- type_t *ftype;
- type_t *ptype;
- type_t *atype;
+ 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;
- ftype = construct_function_type->function_type;
+ function_type = construct_function_type->function_type;
- ftype->v.function_type.result_type = type;
- type = ftype;
+ function_type->result_type = type;
+ type = (type_t*) function_type;
break;
case CONSTRUCT_POINTER:
parsed_pointer = (parsed_pointer_t*) iter;
- ptype = allocate_type_zero(sizeof(ptype[0]));
+ pointer_type = allocate_type_zero(sizeof(pointer_type[0]));
- ptype->type = TYPE_POINTER;
- ptype->v.pointer_type.points_to = type;
- ptype->qualifiers = parsed_pointer->type_qualifiers;
- type = ptype;
+ pointer_type->type.type = TYPE_POINTER;
+ pointer_type->points_to = type;
+ pointer_type->type.qualifiers = parsed_pointer->type_qualifiers;
+ type = (type_t*) pointer_type;
break;
case CONSTRUCT_ARRAY:
- parsed_array = (parsed_array_t*) iter;
- atype = allocate_type_zero(sizeof(atype[0]));
-
- atype->type = TYPE_ARRAY;
- atype->v.array_type.element_type = type;
- atype->qualifiers = parsed_array->type_qualifiers;
- atype->v.array_type.is_static = parsed_array->is_static;
- atype->v.array_type.is_variable = parsed_array->is_variable;
- atype->v.array_type.size = parsed_array->size;
- type = atype;
+ 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;
break;
}
- type_t *hashed_type = typehash_insert(type);
+ type_t *hashed_type = typehash_insert((type_t*) 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) {
- if(type->v.array_type.size == NULL) {
+ array_type_t *array_type = (array_type_t*) type;
+
+ if(array_type->size == NULL) {
const_t *cnst = allocate_ast_zero(sizeof(cnst[0]));
cnst->expression.type = EXPR_CONST;
cnst->expression.datatype = type_size_t;
if(initializer->type == INITIALIZER_LIST) {
- cnst->v.int_value = initializer->v.list.len;
+ initializer_list_t *list = &initializer->list;
+ cnst->v.int_value = list->len;
} else {
assert(initializer->type == INITIALIZER_STRING);
- cnst->v.int_value = strlen(initializer->v.string) + 1;
+ initializer_string_t *string = &initializer->string;
+ cnst->v.int_value = strlen(string->string) + 1;
}
- type->v.array_type.size = (expression_t*) cnst;
+ array_type->size = (expression_t*) cnst;
}
}
+
ndeclaration->init.initializer = initializer;
} else if(token.type == '{') {
if(type->type != TYPE_FUNCTION) {
switch (specifiers.type->type) {
case TYPE_COMPOUND_STRUCT:
case TYPE_COMPOUND_UNION: {
- const type_t *const comp_type = specifiers.type;
- if (comp_type->v.compound_type.declaration->symbol == NULL) {
+ const compound_type_t *const comp_type =
+ (const compound_type_t*)specifiers.type;
+ if (comp_type->declaration->symbol == NULL) {
parse_warning_pos(source_position,
"unnamed struct/union that defines no instances");
}
static declaration_t *create_implicit_function(symbol_t *symbol,
const source_position_t source_position)
{
- type_t *ftype = allocate_type_zero(sizeof(ftype[0]));
+ function_type_t *function_type
+ = allocate_type_zero(sizeof(function_type[0]));
- ftype->type = TYPE_FUNCTION;
- ftype->v.function_type.result_type = type_int;
- ftype->v.function_type.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(ftype);
- if(type != ftype) {
- free_type(ftype);
+ type_t *type = typehash_insert((type_t*) function_type);
+ if(type != (type_t*) function_type) {
+ free_type(function_type);
}
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 = 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 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 = (array_type_t*) type;
+ 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->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->datatype);
+ pointer_type_t *pointer_type = (pointer_type_t*) type;
+
+ 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
+ = (const array_access_expression_t*) expression;
+ type_t *type_left = skip_typeref(array_access->array_ref->datatype);
+ assert(is_type_pointer(type_left));
+ pointer_type_t *pointer_type = (pointer_type_t*) type_left;
+ return pointer_type->points_to;
+ }
+
+ default:
+ break;
+ }
+
+ return expression->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;
}
}
assert(statement->type == STATEMENT_COMPOUND);
+ compound_statement_t *compound_statement
+ = (compound_statement_t*) statement;
/* find last statement and use it's type */
const statement_t *last_statement = NULL;
- const statement_t *iter = statement->v.compound_stmt.statements;
+ const statement_t *iter = compound_statement->statements;
for( ; iter != NULL; iter = iter->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
- = last_statement->v.expression->datatype;
+ = expression_statement->expression->datatype;
} else {
expression->expression.datatype = type_void;
}
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;
-
- type_t *type = allocate_type_zero(sizeof(type[0]));
- type->type = TYPE_FUNCTION;
- type->v.function_type.result_type = result_type;
- type->v.function_type.parameters = parameter;
-
- type_t *result = typehash_insert(type);
- if(result != 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) {
- type_t *pointer = type_left;
- array_access->expression.datatype = pointer->v.pointer_type.points_to;
- } else if(type_left->type == TYPE_ARRAY) {
- type_t *array_type = type_left;
- array_access->expression.datatype = array_type->v.array_type.element_type;
- } else if(type_right->type == TYPE_POINTER) {
- type_t *pointer = type_right;
- array_access->expression.datatype = pointer->v.pointer_type.points_to;
- } else if(type_right->type == TYPE_ARRAY) {
- type_t *array_type = type_right;
- array_access->expression.datatype = array_type->v.array_type.element_type;
+
+ type_t *type_left = skip_typeref(left->datatype);
+ type_t *type_inside = skip_typeref(inside->datatype);
+ type_t *result_type;
+
+ if(type_left != NULL && type_inside != NULL) {
+ if(is_type_pointer(type_left)) {
+ pointer_type_t *pointer = (pointer_type_t*) type_left;
+ 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 = (pointer_type_t*) type_inside;
+ 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);
+ expression_t *expression = parse_sub_expression(precedence);
+ expression->datatype = revert_automatic_type_conversion(expression);
+
sizeof_expression->type = expression->datatype;
sizeof_expression->size_expression = expression;
}
fputc('\n', stderr);
return make_invalid_expression();
}
- type_left = type->v.pointer_type.points_to;
+ pointer_type_t *pointer_type = (pointer_type_t*) type;
+ type_left = pointer_type->points_to;
}
type_left = skip_typeref(type_left);
return make_invalid_expression();
}
- type_t *compound_type = type_left;
- declaration_t *declaration = compound_type->v.compound_type.declaration;
+ compound_type_t *compound_type = (compound_type_t*) type_left;
+ declaration_t *declaration = compound_type->declaration;
if(!declaration->init.is_defined) {
parser_print_error_prefix();
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;
- type_t *function_type;
- type_t *orig_type = expression->datatype;
- type_t *type = skip_typeref(orig_type);
+ function_type_t *function_type;
+ type_t *orig_type = expression->datatype;
+ if(orig_type != NULL) {
+ function_type = NULL;
+ type_t *type = skip_typeref(orig_type);
- if(type->type == TYPE_POINTER) {
- type = skip_typeref(type->v.pointer_type.points_to);
- }
- if (type->type == TYPE_FUNCTION) {
- function_type = type;
- call->expression.datatype = type->v.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);
+ if(is_type_pointer(type)) {
+ pointer_type_t *pointer_type = (pointer_type_t*) type;
+
+ type = skip_typeref(pointer_type->points_to);
- function_type = NULL;
- call->expression.datatype = NULL;
+ if (type->type == TYPE_FUNCTION) {
+ function_type = (function_type_t*) type;
+ 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 */
expect(')');
if(function_type != NULL) {
- function_parameter_t *parameter = function_type->v.function_type.parameters;
+ function_parameter_t *parameter = function_type->parameters;
call_argument_t *argument = call->arguments;
for( ; parameter != NULL && argument != NULL;
parameter = parameter->next, argument = argument->next) {
fprintf(stderr, "'\n");
} else if(argument != NULL) {
/* too many parameters */
- if(!function_type->v.function_type.variadic
- && !function_type->v.function_type.unspecified_parameters) {
+ if(!function_type->variadic
+ && !function_type->unspecified_parameters) {
parser_print_error_prefix();
fprintf(stderr, "too many arguments to function '");
print_expression(expression);
return;
type_t *type = skip_typeref(orig_type);
- switch (type->type) {
- case TYPE_ARRAY:
- expression->expression.datatype = type->v.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:
- expression->expression.datatype = type->v.pointer_type.points_to;
- break;
+ pointer_type_t *pointer_type = (pointer_type_t*)type;
+ type_t *result_type = pointer_type->points_to;
- default:
- parser_print_error_prefix();
- fputs("'Unary *' needs pointer or array 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->datatype = revert_automatic_type_conversion(value);
+
+ type_t *orig_type = value->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->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 type_t *const arr_type = type_left;
- expression->expression.datatype =
- make_pointer_type(arr_type->v.array_type.element_type, TYPE_QUALIFIER_NONE);
- } else if (type_right->type == TYPE_ARRAY && is_type_integer(type_left)) {
- const type_t *const arr_type = type_right;
- expression->expression.datatype =
- make_pointer_type(arr_type->v.array_type.element_type, TYPE_QUALIFIER_NONE);
} else {
parser_print_error_prefix();
fprintf(stderr, "invalid operands to binary + (");
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;
if(orig_type_left == NULL)
return;
- type_t *type_left = skip_typeref(orig_type_left);
+ 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.");
+ parser_print_error_prefix();
+ fprintf(stderr, "Cannot assign to arrays ('");
+ print_expression(left);
+ fprintf(stderr, "')\n");
return;
}
-
if(type_left->qualifiers & TYPE_QUALIFIER_CONST) {
parser_print_error_prefix();
fprintf(stderr, "assignment to readonly location '");
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;
}
semantic_assign(orig_type_left, &expression->right, "assignment");
static statement_t *parse_case_statement(void)
{
eat(T_case);
- statement_t *label = allocate_ast_zero(sizeof(label[0]));
- label->type = STATEMENT_CASE_LABEL;
- label->source_position = token.source_position;
+ case_label_statement_t *label = allocate_ast_zero(sizeof(label[0]));
+ label->statement.type = STATEMENT_CASE_LABEL;
+ label->statement.source_position = token.source_position;
- label->v.case_label_stmt.expression = parse_expression();
+ label->expression = parse_expression();
expect(':');
- label->v.case_label_stmt.label_statement = parse_statement();
+ label->label_statement = parse_statement();
- return label;
+ return (statement_t*) label;
}
static statement_t *parse_default_statement(void)
{
eat(T_default);
- statement_t *label = allocate_ast_zero(sizeof(label[0]));
- label->type = STATEMENT_CASE_LABEL;
- label->source_position = token.source_position;
+ case_label_statement_t *label = allocate_ast_zero(sizeof(label[0]));
+ label->statement.type = STATEMENT_CASE_LABEL;
+ label->statement.source_position = token.source_position;
expect(':');
- label->v.case_label_stmt.label_statement = parse_statement();
+ label->label_statement = parse_statement();
return (statement_t*) label;
}
label->source_position = token.source_position;
}
- statement_t *label_statement = allocate_ast_zero(sizeof(label[0]));
+ label_statement_t *label_statement = allocate_ast_zero(sizeof(label[0]));
- label_statement->type = STATEMENT_LABEL;
- label_statement->source_position = token.source_position;
- label_statement->v.label_stmt.label = label;
+ label_statement->statement.type = STATEMENT_LABEL;
+ label_statement->statement.source_position = token.source_position;
+ label_statement->label = label;
expect(':');
parse_error("label at end of compound statement");
return (statement_t*) label_statement;
} else {
- label_statement->v.label_stmt.label_statement = parse_statement();
+ label_statement->label_statement = parse_statement();
}
- return label_statement;
+ return (statement_t*) label_statement;
}
static statement_t *parse_if(void)
{
eat(T_if);
- statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->type = STATEMENT_IF;
- statement->source_position = token.source_position;
+ if_statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
+ statement->statement.type = STATEMENT_IF;
+ statement->statement.source_position = token.source_position;
expect('(');
- statement->v.if_stmt.condition = parse_expression();
+ statement->condition = parse_expression();
expect(')');
- statement->v.if_stmt.true_statement = parse_statement();
+ statement->true_statement = parse_statement();
if(token.type == T_else) {
next_token();
- statement->v.if_stmt.false_statement = parse_statement();
+ statement->false_statement = parse_statement();
}
- return statement;
+ return (statement_t*) statement;
}
static statement_t *parse_switch(void)
{
eat(T_switch);
- statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->type = STATEMENT_SWITCH;
- statement->source_position = token.source_position;
+ switch_statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
+ statement->statement.type = STATEMENT_SWITCH;
+ statement->statement.source_position = token.source_position;
expect('(');
- statement->v.switch_stmt.expression = parse_expression();
+ statement->expression = parse_expression();
expect(')');
- statement->v.switch_stmt.body = parse_statement();
+ statement->body = parse_statement();
- return statement;
+ return (statement_t*) statement;
}
static statement_t *parse_while(void)
{
eat(T_while);
- statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->type = STATEMENT_WHILE;
- statement->source_position = token.source_position;
+ while_statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
+ statement->statement.type = STATEMENT_WHILE;
+ statement->statement.source_position = token.source_position;
expect('(');
- statement->v.while_stmt.condition = parse_expression();
+ statement->condition = parse_expression();
expect(')');
- statement->v.while_stmt.body = parse_statement();
+ statement->body = parse_statement();
- return statement;
+ return (statement_t*) statement;
}
static statement_t *parse_do(void)
{
eat(T_do);
- statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->type = STATEMENT_DO_WHILE;
- statement->source_position = token.source_position;
+ do_while_statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
+ statement->statement.type = STATEMENT_DO_WHILE;
+ statement->statement.source_position = token.source_position;
- statement->v.while_stmt.body = parse_statement();
+ statement->body = parse_statement();
expect(T_while);
expect('(');
- statement->v.while_stmt.condition = parse_expression();
+ statement->condition = parse_expression();
expect(')');
expect(';');
- return statement;
+ return (statement_t*) statement;
}
static statement_t *parse_for(void)
{
eat(T_for);
- statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->type = STATEMENT_FOR;
- statement->source_position = token.source_position;
+ for_statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
+ statement->statement.type = STATEMENT_FOR;
+ statement->statement.source_position = token.source_position;
expect('(');
int top = environment_top();
context_t *last_context = context;
- set_context(&statement->v.for_stmt.context);
+ set_context(&statement->context);
if(token.type != ';') {
if(is_declaration_specifier(&token, false)) {
parse_declaration();
} else {
- statement->v.for_stmt.initialisation = parse_expression();
+ statement->initialisation = parse_expression();
expect(';');
}
} else {
}
if(token.type != ';') {
- statement->v.for_stmt.condition = parse_expression();
+ statement->condition = parse_expression();
}
expect(';');
if(token.type != ')') {
- statement->v.for_stmt.step = parse_expression();
+ statement->step = parse_expression();
}
expect(')');
- statement->v.for_stmt.body = parse_statement();
+ statement->body = parse_statement();
- assert(context == &statement->v.for_stmt.context);
+ assert(context == &statement->context);
set_context(last_context);
environment_pop_to(top);
- return statement;
+ return (statement_t*) statement;
}
static statement_t *parse_goto(void)
declaration_t *label = get_label(symbol);
- statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
+ goto_statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->type = STATEMENT_GOTO;
- statement->source_position = token.source_position;
+ statement->statement.type = STATEMENT_GOTO;
+ statement->statement.source_position = token.source_position;
- statement->v.goto_label = label;
+ statement->label = label;
expect(';');
- return statement;
+ return (statement_t*) statement;
}
static statement_t *parse_continue(void)
{
eat(T_return);
- statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
+ return_statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->type = STATEMENT_RETURN;
- statement->source_position = token.source_position;
+ statement->statement.type = STATEMENT_RETURN;
+ statement->statement.source_position = token.source_position;
assert(current_function->type->type == TYPE_FUNCTION);
- type_t *function_type = current_function->type;
- type_t *return_type = function_type->v.function_type.result_type;
+ function_type_t *function_type = (function_type_t*) current_function->type;
+ type_t *return_type = function_type->result_type;
expression_t *return_value;
if(token.type != ';') {
"non-void");
}
}
- statement->v.return_value = return_value;
+ statement->return_value = return_value;
expect(';');
- return statement;
+ return (statement_t*) statement;
}
static statement_t *parse_declaration_statement(void)
{
declaration_t *before = last_declaration;
- statement_t *statement
+ declaration_statement_t *statement
= allocate_ast_zero(sizeof(statement[0]));
- statement->type = STATEMENT_DECLARATION;
- statement->source_position = token.source_position;
+ statement->statement.type = STATEMENT_DECLARATION;
+ statement->statement.source_position = token.source_position;
declaration_specifiers_t specifiers;
memset(&specifiers, 0, sizeof(specifiers));
}
if(before == NULL) {
- statement->v.declaration_stmt.begin = context->declarations;
+ statement->declarations_begin = context->declarations;
} else {
- statement->v.declaration_stmt.begin = before->next;
+ statement->declarations_begin = before->next;
}
- statement->v.declaration_stmt.end = last_declaration;
+ statement->declarations_end = last_declaration;
- return statement;
+ return (statement_t*) statement;
}
static statement_t *parse_expression_statement(void)
{
- statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->type = STATEMENT_EXPRESSION;
- statement->source_position = token.source_position;
+ expression_statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
+ statement->statement.type = STATEMENT_EXPRESSION;
+ statement->statement.source_position = token.source_position;
- statement->v.expression = parse_expression();
+ statement->expression = parse_expression();
expect(';');
- return statement;
+ return (statement_t*) statement;
}
static statement_t *parse_statement(void)
static statement_t *parse_compound_statement(void)
{
- statement_t *compound_statement
+ compound_statement_t *compound_statement
= allocate_ast_zero(sizeof(compound_statement[0]));
- compound_statement->type = STATEMENT_COMPOUND;
- compound_statement->source_position = token.source_position;
+ compound_statement->statement.type = STATEMENT_COMPOUND;
+ compound_statement->statement.source_position = token.source_position;
eat('{');
int top = environment_top();
context_t *last_context = context;
- set_context(&compound_statement->v.compound_stmt.context);
+ set_context(&compound_statement->context);
statement_t *last_statement = NULL;
if(last_statement != NULL) {
last_statement->next = statement;
} else {
- compound_statement->v.compound_stmt.statements = statement;
+ compound_statement->statements = statement;
}
while(statement->next != NULL)
if(token.type != '}') {
parser_print_error_prefix_pos(
- compound_statement->source_position);
+ compound_statement->statement.source_position);
fprintf(stderr, "end of file while looking for closing '}'\n");
}
next_token();
- assert(context == &compound_statement->v.compound_stmt.context);
+ assert(context == &compound_statement->context);
set_context(last_context);
environment_pop_to(top);
- return compound_statement;
+ return (statement_t*) compound_statement;
}
static translation_unit_t *parse_translation_unit(void)
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_const_char = make_atomic_type(ATOMIC_TYPE_CHAR, TYPE_QUALIFIER_CONST);
+ 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_const_char, TYPE_QUALIFIER_NONE);
+ type_string = make_pointer_type(type_char, TYPE_QUALIFIER_NONE);
}
void exit_parser(void)
projects / cparser / blobdiff