X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=69dba39ee72707fdad82a5e3650229f8f4f0b892;hb=22420f9404b76d3ab2536c7d3903cbcf05a792a8;hp=7008dea0327299bd280cab6ad504041719fe715a;hpb=dad2cfa20847b2ec1de207f807c41c4ed3471b81;p=cparser diff --git a/parser.c b/parser.c index 7008dea..69dba39 100644 --- a/parser.c +++ b/parser.c @@ -17,22 +17,30 @@ //#define PRINT_TOKENS //#define ABORT_ON_ERROR #define MAX_LOOKAHEAD 2 +//#define STRICT_C99 -struct environment_entry_t { - symbol_t *symbol; +typedef struct { declaration_t *old_declaration; - const void *old_context; -}; + symbol_t *symbol; + unsigned short namespace; +} stack_entry_t; static token_t token; static token_t lookahead_buffer[MAX_LOOKAHEAD]; static int lookahead_bufpos; -static struct obstack environment_obstack; -static environment_entry_t **environment_stack = NULL; +static stack_entry_t *environment_stack = NULL; +static context_t *global_context = NULL; static context_t *context = NULL; static declaration_t *last_declaration = NULL; static struct obstack temp_obst; +static type_t *type_int = NULL; +static type_t *type_double = NULL; +static type_t *type_const_char = NULL; +static type_t *type_string = NULL; +static type_t *type_void = NULL; +static type_t *type_size_t = NULL; + static statement_t *parse_compound_statement(void); static statement_t *parse_statement(void); @@ -108,6 +116,11 @@ static inline void *allocate_type_zero(size_t size) return res; } +static inline void free_type(void *type) +{ + obstack_free(type_obst, type); +} + /** * returns the top element of the environment stack */ @@ -139,26 +152,35 @@ static inline const token_t *look_ahead(int num) return & lookahead_buffer[pos]; } -static inline void eat(token_type_t type) +#define eat(token_type) do { assert(token.type == token_type); next_token(); } while(0) + +static void error(void) { - assert(token.type == type); - next_token(); +#ifdef ABORT_ON_ERROR + abort(); +#endif } -void parser_print_error_prefix_pos(const source_position_t source_position) +static void parser_print_prefix_pos(const source_position_t source_position) { fputs(source_position.input_name, stderr); fputc(':', stderr); fprintf(stderr, "%d", source_position.linenr); - fputs(": error: ", stderr); -#ifdef ABORT_ON_ERROR - abort(); -#endif + fputs(": ", stderr); +} + +static void parser_print_error_prefix_pos( + const source_position_t source_position) +{ + parser_print_prefix_pos(source_position); + fputs("error: ", stderr); + error(); } -void parser_print_error_prefix(void) +static void parser_print_error_prefix(void) { - parser_print_error_prefix_pos(token.source_position); + parser_print_prefix_pos(token.source_position); + error(); } static void parse_error(const char *message) @@ -167,6 +189,13 @@ static void parse_error(const char *message) fprintf(stderr, "parse error: %s\n", message); } +__attribute__((unused)) +static void parse_warning(const char *message) +{ + parser_print_prefix_pos(token.source_position); + fprintf(stderr, "warning: %s\n", message); +} + static void parse_error_expected(const char *message, ...) { va_list args; @@ -237,6 +266,13 @@ static void eat_brace(void) while(token.type != ')') { if(token.type == T_EOF) return; + if(token.type == ')' || token.type == ';' || token.type == '}') { + return; + } + if(token.type == '(') { + eat_brace(); + continue; + } if(token.type == '{') { eat_block(); continue; @@ -266,103 +302,159 @@ static void set_context(context_t *new_context) { context = new_context; - declaration_t *declaration = new_context->declarations; - if(declaration != NULL) { - while(true) { - if(declaration->next == NULL) - break; - declaration = declaration->next; + last_declaration = new_context->declarations; + if(last_declaration != NULL) { + while(last_declaration->next != NULL) { + last_declaration = last_declaration->next; } } - - last_declaration = declaration; } /** * called when we find a 2nd declarator for an identifier we already have a * declarator for */ -static int is_compatible_declaration (declaration_t *declaration, +static bool is_compatible_declaration (declaration_t *declaration, declaration_t *previous) { /* TODO: not correct yet */ return declaration->type == previous->type; } +static declaration_t *get_declaration(symbol_t *symbol, namespace_t namespace) +{ + declaration_t *declaration = symbol->declaration; + for( ; declaration != NULL; declaration = declaration->symbol_next) { + if(declaration->namespace == namespace) + return declaration; + } + + return NULL; +} + +static const char *get_namespace_prefix(namespace_t namespace) +{ + switch(namespace) { + case NAMESPACE_NORMAL: + return ""; + case NAMESPACE_UNION: + return "union "; + case NAMESPACE_STRUCT: + return "struct "; + case NAMESPACE_ENUM: + return "enum "; + } + panic("invalid namespace found"); +} + /** * pushs an environment_entry on the environment stack and links the * corresponding symbol to the new entry */ -static inline declaration_t *environment_push(declaration_t *declaration, - const void *context) +static declaration_t *environment_push(declaration_t *declaration) { - environment_entry_t *entry - = obstack_alloc(&environment_obstack, sizeof(entry[0])); - memset(entry, 0, sizeof(entry[0])); + symbol_t *symbol = declaration->symbol; + namespace_t namespace = declaration->namespace; + assert(declaration->source_position.input_name != NULL); - int top = ARR_LEN(environment_stack); - ARR_RESIZE(environment_stack, top + 1); - environment_stack[top] = entry; + /* a declaration should be only pushed once */ + assert(declaration->parent_context == NULL); + declaration->parent_context = context; + + declaration_t *previous_declaration = get_declaration(symbol, namespace); + assert(declaration != previous_declaration); + if(previous_declaration != NULL + && previous_declaration->parent_context == context) { + if(!is_compatible_declaration(declaration, previous_declaration)) { + parser_print_error_prefix_pos(declaration->source_position); + fprintf(stderr, "definition of symbol %s%s with type ", + get_namespace_prefix(namespace), symbol->string); + error(); + print_type(declaration->type); + fputc('\n', stderr); + parser_print_error_prefix_pos( + previous_declaration->source_position); + fprintf(stderr, "is incompatible with previous declaration " + "of type "); + print_type(previous_declaration->type); + fputc('\n', stderr); + } + return previous_declaration; + } - assert(declaration->source_position.input_name != NULL); + /* remember old declaration */ + stack_entry_t entry; + entry.symbol = symbol; + entry.old_declaration = symbol->declaration; + entry.namespace = namespace; + ARR_APP1(environment_stack, entry); - symbol_t *symbol = declaration->symbol; - assert(declaration != symbol->declaration); - - if(symbol->context == context) { - declaration_t *previous_declaration = symbol->declaration; - if(symbol->declaration != NULL) { - if(!is_compatible_declaration(declaration, previous_declaration)) { - parser_print_error_prefix_pos(declaration->source_position); - fprintf(stderr, "definition of symbol '%s' with type ", - declaration->symbol->string); - print_type(declaration->type); - fputc('\n', stderr); - parser_print_error_prefix_pos( - previous_declaration->source_position); - fprintf(stderr, "is incompatible with previous declaration " - "of type "); - print_type(previous_declaration->type); - fputc('\n', stderr); + /* replace/add declaration into declaration list of the symbol */ + if(symbol->declaration == NULL) { + symbol->declaration = declaration; + } else { + declaration_t *iter = symbol->declaration; + for( ; iter != NULL; iter = iter->symbol_next) { + declaration_t *symbol_next = iter->symbol_next; + if(symbol_next == NULL) { + iter->symbol_next = declaration; + assert(declaration->symbol_next == NULL); + break; + } + if(symbol_next->namespace == namespace) { + iter->symbol_next = declaration; + declaration->symbol_next = symbol_next->symbol_next; + break; } - return previous_declaration; } } - entry->old_declaration = symbol->declaration; - entry->old_context = symbol->context; - entry->symbol = symbol; - symbol->declaration = declaration; - symbol->context = context; - return declaration; } /** * pops symbols from the environment stack until @p new_top is the top element */ -static inline void environment_pop_to(size_t new_top) +static void environment_pop_to(size_t new_top) { - environment_entry_t *entry = NULL; size_t top = ARR_LEN(environment_stack); size_t i; + assert(new_top <= top); if(new_top == top) return; - assert(new_top < top); - i = top; - do { - entry = environment_stack[i - 1]; - - symbol_t *symbol = entry->symbol; + for(i = top; i > new_top; --i) { + stack_entry_t *entry = & environment_stack[i - 1]; - symbol->declaration = entry->old_declaration; - symbol->context = entry->old_context; + declaration_t *old_declaration = entry->old_declaration; + symbol_t *symbol = entry->symbol; + namespace_t namespace = entry->namespace; - --i; - } while(i != new_top); - obstack_free(&environment_obstack, entry); + /* replace/remove declaration */ + declaration_t *declaration = symbol->declaration; + assert(declaration != NULL); + if(declaration->namespace == namespace) { + if(old_declaration == NULL) { + symbol->declaration = declaration->symbol_next; + } else { + symbol->declaration = old_declaration; + assert(old_declaration->symbol_next == + declaration->symbol_next); + } + } else { + for(; declaration != NULL; declaration = declaration->symbol_next) { + declaration_t *symbol_next = declaration->symbol_next; + if(symbol_next->namespace == namespace) { + declaration->symbol_next = old_declaration; + assert(old_declaration->symbol_next + == symbol_next->symbol_next); + break; + } + } + assert(declaration != NULL); + } + } ARR_SHRINKLEN(environment_stack, (int) new_top); } @@ -382,9 +474,8 @@ static expression_t *parse_assignment_expression(void) } static void parse_compound_type_entries(void); -static void parse_declarator(declaration_t *declaration, - storage_class_t storage_class, type_t *type, - int may_be_abstract); +static declaration_t *parse_declarator(storage_class_t storage_class, + type_t *type, int may_be_abstract); static declaration_t *record_declaration(declaration_t *declaration); typedef struct declaration_specifiers_t declaration_specifiers_t; @@ -393,19 +484,170 @@ struct declaration_specifiers_t { type_t *type; }; -static compound_type_t *find_compound_type(compound_type_t *types, - const symbol_t *symbol) +static const char *parse_string_literals(void) { - compound_type_t *type = types; - for( ; type != NULL; type = type->next) { - if(type->symbol == symbol) - return type; + assert(token.type == T_STRING_LITERAL); + const char *result = token.v.string; + + next_token(); + + while(token.type == T_STRING_LITERAL) { + result = concat_strings(result, token.v.string); + next_token(); } - return NULL; + return result; +} + +static void parse_attributes(void) +{ + while(true) { + switch(token.type) { + case T___attribute__: + next_token(); + + expect_void('('); + int depth = 1; + while(depth > 0) { + switch(token.type) { + case T_EOF: + parse_error("EOF while parsing attribute"); + break; + case '(': + next_token(); + depth++; + break; + case ')': + next_token(); + depth--; + break; + default: + next_token(); + } + } + break; + case T_asm: + next_token(); + expect_void('('); + if(token.type != T_STRING_LITERAL) { + parse_error_expected("while parsing assembler attribute", + T_STRING_LITERAL); + eat_brace(); + break; + } else { + parse_string_literals(); + } + expect_void(')'); + break; + default: + goto attributes_finished; + } + } + +attributes_finished: + ; } -static type_t *parse_compound_type_specifier(int is_struct) +static designator_t *parse_designation(void) +{ + if(token.type != '[' && token.type != '.') + return NULL; + + designator_t *result = NULL; + designator_t *last = NULL; + + while(1) { + designator_t *designator; + switch(token.type) { + case '[': + designator = allocate_ast_zero(sizeof(designator[0])); + next_token(); + designator->array_access = parse_constant_expression(); + expect(']'); + break; + case '.': + designator = allocate_ast_zero(sizeof(designator[0])); + next_token(); + if(token.type != T_IDENTIFIER) { + parse_error_expected("problem while parsing designator", + T_IDENTIFIER, 0); + return NULL; + } + designator->symbol = token.v.symbol; + next_token(); + break; + default: + expect('='); + return result; + } + + assert(designator != NULL); + if(last != NULL) { + last->next = designator; + } else { + result = designator; + } + last = designator; + } +} + +static initializer_t *parse_initializer_list(void); + +static initializer_t *parse_initializer(void) +{ + designator_t *designator = parse_designation(); + + initializer_t *result; + if(token.type == '{') { + result = parse_initializer_list(); + } else { + result = allocate_ast_zero(sizeof(result[0])); + result->type = INITIALIZER_VALUE; + result->v.value = parse_assignment_expression(); + } + result->designator = designator; + + return result; +} + +static initializer_t *parse_initializer_list(void) +{ + eat('{'); + + initializer_t *result = allocate_ast_zero(sizeof(result[0])); + result->type = INITIALIZER_LIST; + + initializer_t *last = NULL; + while(1) { + initializer_t *initializer = parse_initializer(); + if(last != NULL) { + last->next = initializer; + } else { + result->v.list = initializer; + } + last = initializer; + + if(token.type == '}') + break; + + if(token.type != ',') { + parse_error_expected("problem while parsing initializer list", + ',', '}', 0); + eat_block(); + return result; + } + eat(','); + + if(token.type == '}') + break; + } + + expect('}'); + + return result; +} + +static declaration_t *parse_compound_type_specifier(bool is_struct) { if(is_struct) { eat(T_struct); @@ -413,19 +655,17 @@ static type_t *parse_compound_type_specifier(int is_struct) eat(T_union); } - symbol_t *symbol = NULL; - compound_type_t *compound_type = NULL; + symbol_t *symbol = NULL; + declaration_t *declaration = NULL; if(token.type == T_IDENTIFIER) { symbol = token.v.symbol; next_token(); - if(context != NULL) { - if(is_struct) { - compound_type = find_compound_type(context->structs, symbol); - } else { - compound_type = find_compound_type(context->unions, symbol); - } + if(is_struct) { + declaration = get_declaration(symbol, NAMESPACE_STRUCT); + } else { + declaration = get_declaration(symbol, NAMESPACE_UNION); } } else if(token.type != '{') { if(is_struct) { @@ -439,39 +679,42 @@ static type_t *parse_compound_type_specifier(int is_struct) return NULL; } - if(compound_type == NULL) { - compound_type = allocate_type_zero(sizeof(compound_type[0])); + if(declaration == NULL) { + declaration = allocate_type_zero(sizeof(declaration[0])); if(is_struct) { - compound_type->type.type = TYPE_COMPOUND_STRUCT; + declaration->namespace = NAMESPACE_STRUCT; } else { - compound_type->type.type = TYPE_COMPOUND_UNION; + declaration->namespace = NAMESPACE_UNION; } - compound_type->source_position = token.source_position; - compound_type->symbol = symbol; + declaration->source_position = token.source_position; + declaration->symbol = symbol; } if(token.type == '{') { - if(compound_type->defined) { + if(declaration->init.is_defined) { + assert(symbol != NULL); parser_print_error_prefix(); fprintf(stderr, "multiple definition of %s %s\n", is_struct ? "struct" : "union", symbol->string); - compound_type->context.declarations = NULL; + declaration->context.declarations = NULL; } - compound_type->defined = 1; + record_declaration(declaration); + declaration->init.is_defined = true; int top = environment_top(); context_t *last_context = context; - set_context(&compound_type->context); + set_context(& declaration->context); parse_compound_type_entries(); + parse_attributes(); - assert(context == &compound_type->context); + assert(context == & declaration->context); set_context(last_context); environment_pop_to(top); } - return (type_t*) compound_type; + return declaration; } static void parse_enum_entries(void) @@ -500,7 +743,7 @@ static void parse_enum_entries(void) if(token.type == '=') { next_token(); - entry->initializer = parse_constant_expression(); + entry->init.initializer = parse_initializer(); } record_declaration(entry); @@ -513,79 +756,73 @@ static void parse_enum_entries(void) expect_void('}'); } -static enum_type_t *find_enum_type(enum_type_t *types, const symbol_t *symbol) -{ - enum_type_t *type = types; - for( ; type != NULL; type = type->next) { - if(type->symbol == symbol) - return type; - } - - return NULL; -} - -static type_t *parse_enum_specifier(void) +static declaration_t *parse_enum_specifier(void) { eat(T_enum); - symbol_t *symbol = NULL; - enum_type_t *enum_type = NULL; + declaration_t *declaration; + symbol_t *symbol; if(token.type == T_IDENTIFIER) { symbol = token.v.symbol; next_token(); - if(context != NULL) { - enum_type = find_enum_type(context->enums, symbol); - } + declaration = get_declaration(symbol, NAMESPACE_ENUM); } else if(token.type != '{') { parse_error_expected("problem while parsing enum type specifier", T_IDENTIFIER, '{', 0); return NULL; + } else { + declaration = NULL; + symbol = NULL; } - if(enum_type == NULL) { - enum_type = allocate_type_zero(sizeof(enum_type[0])); - enum_type->type.type = TYPE_ENUM; - enum_type->source_position = token.source_position; - enum_type->symbol = symbol; + if(declaration == NULL) { + declaration = allocate_type_zero(sizeof(declaration[0])); + + declaration->namespace = NAMESPACE_ENUM; + declaration->source_position = token.source_position; + declaration->symbol = symbol; } if(token.type == '{') { - if(enum_type->defined) { + if(declaration->init.is_defined) { parser_print_error_prefix(); fprintf(stderr, "multiple definitions of enum %s\n", symbol->string); - enum_type->entries_begin = NULL; - enum_type->entries_end = NULL; } - enum_type->defined = 1; - - declaration_t *before = last_declaration; + record_declaration(declaration); + declaration->init.is_defined = 1; parse_enum_entries(); - - if(before == NULL) { - enum_type->entries_begin = context->declarations; - } else { - enum_type->entries_begin = before->next; - } - enum_type->entries_end = last_declaration; + parse_attributes(); } - return (type_t*) enum_type; + return declaration; +} + +/** + * if a symbol is a typedef to another type, return true + */ +static bool is_typedef_symbol(symbol_t *symbol) +{ + declaration_t *declaration = get_declaration(symbol, NAMESPACE_NORMAL); + if(declaration == NULL + || declaration->storage_class != STORAGE_CLASS_TYPEDEF) + return false; + + return true; } static type_t *parse_typeof(void) { eat(T___typeof__); - type_t *result; + type_t *type; expect('('); - declaration_t *declaration; - expression_t *expression; + expression_t *expression = NULL; restart: switch(token.type) { @@ -598,93 +835,32 @@ restart: goto restart; case T_IDENTIFIER: - declaration = token.v.symbol->declaration; - if(declaration != NULL - && declaration->storage_class == STORAGE_CLASS_TYPEDEF) { - result = parse_typename(); - break; + if(is_typedef_symbol(token.v.symbol)) { + type = parse_typename(); + } else { + expression = parse_expression(); + type = expression->datatype; } - expression = parse_expression(); - result = expression->datatype; break; TYPENAME_START - result = parse_typename(); + type = parse_typename(); break; default: expression = parse_expression(); - result = expression->datatype; + type = expression->datatype; break; } expect(')'); - return result; -} - -static const char *parse_string_literals(void) -{ - assert(token.type == T_STRING_LITERAL); - const char *result = token.v.string; + typeof_type_t *typeof = allocate_type_zero(sizeof(typeof[0])); + typeof->type.type = TYPE_TYPEOF; + typeof->expression = expression; + typeof->typeof_type = type; - next_token(); - - while(token.type == T_STRING_LITERAL) { - result = concat_strings(result, token.v.string); - next_token(); - } - - return result; -} - -static void parse_attributes(void) -{ - while(true) { - switch(token.type) { - case T___attribute__: - next_token(); - - expect_void('('); - int depth = 1; - while(depth > 0) { - switch(token.type) { - case T_EOF: - parse_error("EOF while parsing attribute"); - break; - case '(': - next_token(); - depth++; - break; - case ')': - next_token(); - depth--; - break; - default: - next_token(); - } - } - break; - case T_asm: - next_token(); - expect_void('('); - if(token.type != T_STRING_LITERAL) { - parse_error_expected("while parsing assembler attribute", - T_STRING_LITERAL); - eat_brace(); - break; - } else { - parse_string_literals(); - } - expect_void(')'); - break; - default: - goto attributes_finished; - } - } - -attributes_finished: - ; + return (type_t*) typeof; } typedef enum { @@ -713,17 +889,25 @@ static type_t *create_builtin_type(symbol_t *symbol) type->type.type = TYPE_BUILTIN; type->symbol = symbol; - type_t *result = typehash_insert((type_t*) type); - if(result != (type_t*) type) { - obstack_free(type_obst, type); - } + return (type_t*) type; +} - return result; +static type_t *get_typedef_type(symbol_t *symbol) +{ + declaration_t *declaration = get_declaration(symbol, NAMESPACE_NORMAL); + if(declaration == NULL + || 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; + + return (type_t*) typedef_type; } static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) { - declaration_t *declaration; type_t *type = NULL; unsigned type_qualifiers = 0; unsigned type_specifiers = 0; @@ -803,16 +987,34 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) } break; - /* TODO: if type != NULL for the following rules issue an error */ - case T_struct: - type = parse_compound_type_specifier(1); + /* 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 = (type_t*) compound_type; break; - case T_union: - type = parse_compound_type_specifier(0); + } + 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 = (type_t*) compound_type; break; - case T_enum: - type = parse_enum_specifier(); + } + 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; break; + } case T___typeof__: type = parse_typeof(); break; @@ -826,17 +1028,16 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) parse_attributes(); break; - case T_IDENTIFIER: - declaration = token.v.symbol->declaration; - if(declaration == NULL || - declaration->storage_class != STORAGE_CLASS_TYPEDEF) { + case T_IDENTIFIER: { + type_t *typedef_type = get_typedef_type(token.v.symbol); + + if(typedef_type == NULL) goto finish_specifiers; - } - type = declaration->type; - assert(type != NULL); next_token(); + type = typedef_type; break; + } /* function specifier */ default: @@ -941,7 +1142,13 @@ finish_specifiers: default: /* invalid specifier combination, give an error message */ if(type_specifiers == 0) { +#ifndef STRICT_C99 + parse_warning("no type specifiers in declaration (using int)"); + atomic_type = ATOMIC_TYPE_INT; + break; +#else parse_error("no type specifiers given in declaration"); +#endif } else if((type_specifiers & SPECIFIER_SIGNED) && (type_specifiers & SPECIFIER_UNSIGNED)) { parse_error("signed and unsigned specifiers gives"); @@ -967,78 +1174,30 @@ finish_specifiers: type->qualifiers = type_qualifiers; - type_t *result = typehash_insert(type); - if(newtype && result != (type_t*) type) { - obstack_free(type_obst, type); - } - - specifiers->type = result; -} - -static unsigned parse_type_qualifiers(void) -{ - unsigned type_qualifiers = 0; - - while(true) { - switch(token.type) { - /* type qualifiers */ - MATCH_TYPE_QUALIFIER(T_const, TYPE_QUALIFIER_CONST); - MATCH_TYPE_QUALIFIER(T_restrict, TYPE_QUALIFIER_RESTRICT); - MATCH_TYPE_QUALIFIER(T_volatile, TYPE_QUALIFIER_VOLATILE); - MATCH_TYPE_QUALIFIER(T_inline, TYPE_QUALIFIER_INLINE); - - default: - return type_qualifiers; - } - } -} - -typedef struct parsed_pointer_t parsed_pointer_t; -struct parsed_pointer_t { - unsigned type_qualifiers; - parsed_pointer_t *next; -}; - -static parsed_pointer_t *parse_pointers(void) -{ - parsed_pointer_t *result = NULL; - parsed_pointer_t *last_pointer = NULL; - - while(token.type == '*') { - next_token(); - parsed_pointer_t *pointer - = obstack_alloc(&temp_obst, sizeof(pointer[0])); - pointer->type_qualifiers = parse_type_qualifiers(); - - if(last_pointer != NULL) { - last_pointer->next = pointer; - } else { - result = pointer; - } - last_pointer = pointer; + type_t *result = typehash_insert(type); + if(newtype && result != (type_t*) type) { + free_type(type); } - return result; + specifiers->type = result; } -static type_t *make_pointers(type_t *type, parsed_pointer_t *pointer) +static type_qualifier_t parse_type_qualifiers(void) { - for( ; pointer != NULL; pointer = pointer->next) { - pointer_type_t *pointer_type - = allocate_type_zero(sizeof(pointer_type[0])); - pointer_type->type.type = TYPE_POINTER; - pointer_type->points_to = type; - pointer_type->type.qualifiers = pointer->type_qualifiers; + type_qualifier_t type_qualifiers = 0; - type_t *result = typehash_insert((type_t*) pointer_type); - if(result != (type_t*) pointer_type) { - obstack_free(type_obst, pointer_type); - } + while(true) { + switch(token.type) { + /* type qualifiers */ + MATCH_TYPE_QUALIFIER(T_const, TYPE_QUALIFIER_CONST); + MATCH_TYPE_QUALIFIER(T_restrict, TYPE_QUALIFIER_RESTRICT); + MATCH_TYPE_QUALIFIER(T_volatile, TYPE_QUALIFIER_VOLATILE); + MATCH_TYPE_QUALIFIER(T_inline, TYPE_QUALIFIER_INLINE); - type = result; + default: + return type_qualifiers; + } } - - return type; } static void parse_identifier_list(void) @@ -1063,20 +1222,22 @@ static declaration_t *parse_parameter(void) parse_declaration_specifiers(&specifiers); - declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0])); - parse_declarator(declaration, specifiers.storage_class, - specifiers.type, 1); + declaration_t *declaration = parse_declarator(specifiers.storage_class, + specifiers.type, 1); + + /* TODO check declaration constraints for parameters */ + if(declaration->storage_class == STORAGE_CLASS_TYPEDEF) { + parse_error("typedef not allowed in parameter list"); + } return declaration; } -static declaration_t *parse_parameters(method_type_t *type) +static declaration_t *parse_parameters(function_type_t *type) { if(token.type == T_IDENTIFIER) { - symbol_t *symbol = token.v.symbol; - declaration_t *declaration = symbol->declaration; - if(declaration == NULL - || declaration->storage_class != STORAGE_CLASS_TYPEDEF) { + symbol_t *symbol = token.v.symbol; + if(!is_typedef_symbol(symbol)) { /* TODO */ parse_identifier_list(); return NULL; @@ -1092,11 +1253,11 @@ static declaration_t *parse_parameters(method_type_t *type) return NULL; } - declaration_t *declarations = NULL; - declaration_t *declaration; - declaration_t *last_declaration = NULL; - method_parameter_t *parameter; - method_parameter_t *last_parameter = NULL; + declaration_t *declarations = NULL; + declaration_t *declaration; + declaration_t *last_declaration = NULL; + function_parameter_t *parameter; + function_parameter_t *last_parameter = NULL; while(true) { switch(token.type) { @@ -1133,25 +1294,133 @@ static declaration_t *parse_parameters(method_type_t *type) } } -typedef struct declarator_part declarator_part; -struct declarator_part { - parsed_pointer_t *pointers; - method_type_t *method_type; - declarator_part *inner; +typedef enum { + CONSTRUCT_POINTER, + CONSTRUCT_FUNCTION, + CONSTRUCT_ARRAY +} construct_type_type_t; + +typedef struct construct_type_t construct_type_t; +struct construct_type_t { + construct_type_type_t type; + construct_type_t *next; +}; + +typedef struct parsed_pointer_t parsed_pointer_t; +struct parsed_pointer_t { + construct_type_t construct_type; + type_qualifier_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; +}; + +typedef struct parsed_array_t parsed_array_t; +struct parsed_array_t { + construct_type_t construct_type; + type_qualifier_t type_qualifiers; + bool is_static; + bool is_variable; + expression_t *size; }; +typedef struct construct_base_type_t construct_base_type_t; +struct construct_base_type_t { + construct_type_t construct_type; + type_t *type; +}; + +static construct_type_t *parse_pointer_declarator(void) +{ + eat('*'); + + parsed_pointer_t *pointer = obstack_alloc(&temp_obst, sizeof(pointer[0])); + memset(pointer, 0, sizeof(pointer[0])); + pointer->type_qualifiers = parse_type_qualifiers(); + + return (construct_type_t*) pointer; +} + +static construct_type_t *parse_array_declarator(void) +{ + eat('['); + + parsed_array_t *array = obstack_alloc(&temp_obst, sizeof(array[0])); + memset(array, 0, sizeof(array[0])); + + if(token.type == T_static) { + array->is_static = true; + next_token(); + } + + type_qualifier_t type_qualifiers = parse_type_qualifiers(); + if(type_qualifiers != 0) { + if(token.type == T_static) { + array->is_static = true; + next_token(); + } + } + array->type_qualifiers = type_qualifiers; + + if(token.type == '*' && look_ahead(1)->type == ']') { + array->is_variable = true; + next_token(); + } else if(token.type != ']') { + array->size = parse_assignment_expression(); + } + + expect(']'); + + return (construct_type_t*) array; +} + +static construct_type_t *parse_function_declarator(declaration_t *declaration) +{ + eat('('); + + function_type_t *type = allocate_type_zero(sizeof(type[0])); + type->type.type = TYPE_FUNCTION; + + declaration_t *parameters = parse_parameters(type); + if(declaration != NULL) { + declaration->context.declarations = parameters; + } + + construct_function_type_t *construct_function_type = + obstack_alloc(&temp_obst, sizeof(construct_function_type[0])); + memset(construct_function_type, 0, sizeof(construct_function_type[0])); + construct_function_type->construct_type.type = CONSTRUCT_FUNCTION; + construct_function_type->function_type = type; + + expect(')'); + + return (construct_type_t*) construct_function_type; +} -static declarator_part *parse_inner_declarator(declaration_t *declaration, - int may_be_abstract) +static construct_type_t *parse_inner_declarator(declaration_t *declaration, + int may_be_abstract) { - declarator_part *part = obstack_alloc(&temp_obst, sizeof(part[0])); - memset(part, 0, sizeof(part[0])); + construct_type_t *result = NULL; + construct_type_t *last = NULL; - part->pointers = parse_pointers(); + while(token.type == '*') { + construct_type_t *type = parse_pointer_declarator(); + if(last != NULL) { + last->next = type; + } else { + result = type; + } + last = type; + } /* TODO: find out if this is correct */ parse_attributes(); + construct_type_t *inner_types = NULL; + switch(token.type) { case T_IDENTIFIER: if(declaration == NULL) { @@ -1164,7 +1433,7 @@ static declarator_part *parse_inner_declarator(declaration_t *declaration, break; case '(': next_token(); - part->inner = parse_inner_declarator(declaration, may_be_abstract); + inner_types = parse_inner_declarator(declaration, may_be_abstract); expect(')'); break; default: @@ -1175,123 +1444,142 @@ static declarator_part *parse_inner_declarator(declaration_t *declaration, } while(true) { + construct_type_t *type; switch(token.type) { case '(': - next_token(); - - method_type_t *method_type - = allocate_type_zero(sizeof(method_type[0])); - method_type->type.type = TYPE_METHOD; - - declaration_t *parameters = parse_parameters(method_type); - if(declaration != NULL) { - declaration->context.declarations = parameters; - } - - part->method_type = method_type; - - expect(')'); + type = parse_function_declarator(declaration); break; case '[': - next_token(); - - if(token.type == T_static) { - next_token(); - } - - unsigned type_qualifiers = parse_type_qualifiers(); - if(type_qualifiers != 0) { - if(token.type == T_static) { - next_token(); - } - } - - /* TODO */ - - if(token.type == '*' && look_ahead(1)->type == ']') { - next_token(); - } else if(token.type != ']') { - parse_assignment_expression(); - } - - expect(']'); + type = parse_array_declarator(); break; default: goto declarator_finished; } + + if(last != NULL) { + last->next = type; + } else { + result = type; + } + last = type; } declarator_finished: parse_attributes(); - return part; + if(inner_types != NULL) { + if(last != NULL) { + last->next = inner_types; + } else { + result = inner_types; + } + last = inner_types; + } + + return result; } -static type_t *construct_declarator_type(declarator_part *part, type_t *type) +static type_t *construct_declarator_type(construct_type_t *construct_list, + type_t *type) { - do { - type = make_pointers(type, part->pointers); + 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; - method_type_t *method_type = part->method_type; - if(method_type != NULL) { - method_type->result_type = type; + switch(iter->type) { + case CONSTRUCT_FUNCTION: + construct_function_type = (construct_function_type_t*) iter; + function_type = construct_function_type->function_type; - type_t *result = typehash_insert((type_t*) method_type); - if(result != (type_t*) method_type) { - obstack_free(type_obst, method_type); - } - type = result; + function_type->result_type = type; + type = (type_t*) function_type; + break; + + case CONSTRUCT_POINTER: + parsed_pointer = (parsed_pointer_t*) iter; + pointer_type = allocate_type_zero(sizeof(pointer_type[0])); + + 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; + 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; } - part = part->inner; - } while(part != NULL); + type_t *hashed_type = typehash_insert((type_t*) type); + if(hashed_type != type) { + free_type(type); + type = hashed_type; + } + } return type; } -static void parse_declarator(declaration_t *declaration, - storage_class_t storage_class, type_t *type, - int may_be_abstract) +static declaration_t *parse_declarator(storage_class_t storage_class, + type_t *type, int may_be_abstract) { - declarator_part *part + declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0])); + declaration->storage_class = storage_class; + + construct_type_t *construct_type = parse_inner_declarator(declaration, may_be_abstract); + declaration->type = construct_declarator_type(construct_type, type); - if(part != NULL) { - declaration->type = construct_declarator_type(part, type); - declaration->storage_class = storage_class; - obstack_free(&temp_obst, part); + if(construct_type != NULL) { + obstack_free(&temp_obst, construct_type); } + + return declaration; } static type_t *parse_abstract_declarator(type_t *base_type) { - declarator_part *part = parse_inner_declarator(NULL, 1); - - if(part == NULL) - return NULL; + construct_type_t *construct_type = parse_inner_declarator(NULL, 1); - type_t *result = construct_declarator_type(part, base_type); - obstack_free(&temp_obst, part); + type_t *result = construct_declarator_type(construct_type, base_type); + if(construct_type != NULL) { + obstack_free(&temp_obst, construct_type); + } return result; } static declaration_t *record_declaration(declaration_t *declaration) { - if(context == NULL) - return declaration; + assert(context != NULL); symbol_t *symbol = declaration->symbol; if(symbol != NULL) { - declaration_t *alias = environment_push(declaration, context); + declaration_t *alias = environment_push(declaration); if(alias != declaration) return alias; + } else { + declaration->parent_context = context; } if(last_declaration != NULL) { last_declaration->next = declaration; } else { - context->declarations = declaration; + context->declarations = declaration; } last_declaration = declaration; @@ -1307,41 +1595,37 @@ static void parser_error_multiple_definition(declaration_t *previous, parser_print_error_prefix_pos(previous->source_position); fprintf(stderr, "this is the location of the previous " "definition.\n"); + error(); } static void parse_init_declarators(const declaration_specifiers_t *specifiers) { while(true) { declaration_t *ndeclaration - = allocate_ast_zero(sizeof(ndeclaration[0])); + = parse_declarator(specifiers->storage_class, specifiers->type, 0); - parse_declarator(ndeclaration, specifiers->storage_class, - specifiers->type, 0); declaration_t *declaration = record_declaration(ndeclaration); if(token.type == '=') { next_token(); - /* TODO: check that this is an allowed type (esp. no method type) */ + /* TODO: check that this is an allowed type (no function type) */ - if(declaration->initializer != NULL) { + if(declaration->init.initializer != NULL) { parser_error_multiple_definition(declaration, ndeclaration); } - if(token.type == '{') { - // TODO - expect_void('}'); - } else { - declaration->initializer = parse_assignment_expression(); - } + ndeclaration->init.initializer = parse_initializer(); } else if(token.type == '{') { - if(declaration->type->type != TYPE_METHOD) { + if(declaration->type->type != TYPE_FUNCTION) { parser_print_error_prefix(); fprintf(stderr, "Declarator "); print_type_ext(declaration->type, declaration->symbol, NULL); - fprintf(stderr, " is not a method type.\n"); + fprintf(stderr, " has a body but is not a function type.\n"); + eat_block(); + continue; } - if(declaration->initializer != NULL) { + if(declaration->init.statement != NULL) { parser_error_multiple_definition(declaration, ndeclaration); } if(ndeclaration != declaration) { @@ -1356,7 +1640,7 @@ static void parse_init_declarators(const declaration_specifiers_t *specifiers) /* push function parameters */ declaration_t *parameter = declaration->context.declarations; for( ; parameter != NULL; parameter = parameter->next) { - environment_push(parameter, context); + environment_push(parameter); } statement_t *statement = parse_compound_statement(); @@ -1365,7 +1649,7 @@ static void parse_init_declarators(const declaration_specifiers_t *specifiers) set_context(last_context); environment_pop_to(top); - declaration->statement = statement; + declaration->init.statement = statement; return; } @@ -1385,10 +1669,10 @@ static void parse_struct_declarators(const declaration_specifiers_t *specifiers) /* TODO (bitfields) */ } else { declaration_t *declaration - = allocate_ast_zero(sizeof(declaration[0])); - parse_declarator(declaration, specifiers->storage_class, - specifiers->type, 1); + = parse_declarator(specifiers->storage_class, + specifiers->type, 1); + /* TODO: check constraints for struct declarations */ /* TODO: check for doubled fields */ record_declaration(declaration); @@ -1413,8 +1697,6 @@ static void parse_compound_type_entries(void) while(token.type != '}' && token.type != T_EOF) { declaration_specifiers_t specifiers; memset(&specifiers, 0, sizeof(specifiers)); - /* TODO not correct as this allows storage class stuff... but only - * specifiers and qualifiers sould be allowed here */ parse_declaration_specifiers(&specifiers); parse_struct_declarators(&specifiers); @@ -1427,12 +1709,21 @@ static void parse_compound_type_entries(void) static void parse_declaration(void) { + source_position_t source_position = token.source_position; + declaration_specifiers_t specifiers; memset(&specifiers, 0, sizeof(specifiers)); parse_declaration_specifiers(&specifiers); if(token.type == ';') { next_token(); + + declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0])); + + declaration->type = specifiers.type; + declaration->storage_class = specifiers.storage_class; + declaration->source_position = source_position; + record_declaration(declaration); return; } parse_init_declarators(&specifiers); @@ -1490,8 +1781,9 @@ static expression_t *parse_string_const(void) { string_literal_t *cnst = allocate_ast_zero(sizeof(cnst[0])); - cnst->expression.type = EXPR_STRING_LITERAL; - cnst->value = parse_string_literals(); + cnst->expression.type = EXPR_STRING_LITERAL; + cnst->expression.datatype = type_string; + cnst->value = parse_string_literals(); return (expression_t*) cnst; } @@ -1500,14 +1792,66 @@ static expression_t *parse_int_const(void) { const_t *cnst = allocate_ast_zero(sizeof(cnst[0])); - cnst->expression.type = EXPR_CONST; - cnst->value = token.v.intvalue; + cnst->expression.type = EXPR_CONST; + cnst->expression.datatype = type_int; + cnst->v.int_value = token.v.intvalue; + + next_token(); + + return (expression_t*) cnst; +} + +static expression_t *parse_float_const(void) +{ + const_t *cnst = allocate_ast_zero(sizeof(cnst[0])); + + cnst->expression.type = EXPR_CONST; + cnst->expression.datatype = type_double; + cnst->v.float_value = token.v.floatvalue; next_token(); return (expression_t*) cnst; } +static declaration_t *create_implicit_function(symbol_t *symbol, + const source_position_t source_position) +{ + function_type_t *function_type = allocate_type_zero(sizeof(function_type)); + + function_type->type.type = TYPE_FUNCTION; + function_type->result_type = type_int; + function_type->unspecified_parameters = true; + + type_t *type = typehash_insert((type_t*) function_type); + if(type != (type_t*) function_type) { + free_type(function_type); + } + + declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0])); + + declaration->storage_class = STORAGE_CLASS_EXTERN; + declaration->type = type; + declaration->symbol = symbol; + declaration->source_position = source_position; + + /* prepend the implicit definition to the global context + * this is safe since the symbol wasn't declared as anything else yet + */ + assert(symbol->declaration == NULL); + + context_t *last_context = context; + context = global_context; + + environment_push(declaration); + declaration->next = context->declarations; + context->declarations = declaration; + + context = last_context; + + return declaration; +} + static expression_t *parse_reference(void) { reference_expression_t *ref = allocate_ast_zero(sizeof(ref[0])); @@ -1515,17 +1859,43 @@ static expression_t *parse_reference(void) ref->expression.type = EXPR_REFERENCE; ref->symbol = token.v.symbol; - if(ref->symbol->declaration == NULL) { - parser_print_error_prefix(); - fprintf(stderr, "unknown symbol '%s' found.\n", ref->symbol->string); - } - ref->declaration = ref->symbol->declaration; + declaration_t *declaration = get_declaration(ref->symbol, NAMESPACE_NORMAL); + source_position_t source_position = token.source_position; next_token(); + if(declaration == NULL) { +#ifndef STRICT_C99 + /* an implicitely defined function */ + if(token.type == '(') { + parser_print_prefix_pos(token.source_position); + fprintf(stderr, "warning: implicit declaration of function '%s'\n", + ref->symbol->string); + + declaration = create_implicit_function(ref->symbol, + source_position); + } else +#endif + { + parser_print_error_prefix(); + fprintf(stderr, "unknown symbol '%s' found.\n", ref->symbol->string); + return (expression_t*) ref; + } + } + + ref->declaration = declaration; + ref->expression.datatype = declaration->type; + return (expression_t*) ref; } +static void check_cast_allowed(expression_t *expression, type_t *dest_type) +{ + (void) expression; + (void) dest_type; + /* TODO check if cast is allowed and issue warnings/errors */ +} + static expression_t *parse_cast(void) { unary_expression_t *cast = allocate_ast_zero(sizeof(cast[0])); @@ -1539,6 +1909,8 @@ static expression_t *parse_cast(void) expect(')'); expression_t *value = parse_sub_expression(20); + check_cast_allowed(value, type); + cast->expression.datatype = type; cast->value = value; @@ -1552,6 +1924,22 @@ static expression_t *parse_statement_expression(void) expression->expression.type = EXPR_STATEMENT; expression->statement = parse_compound_statement(); + /* find last statement and use it's type */ + const statement_t *last_statement = NULL; + const statement_t *statement = expression->statement; + for( ; statement != NULL; statement = statement->next) { + last_statement = statement; + } + + if(last_statement->type == STATEMENT_EXPRESSION) { + const expression_statement_t *expression_statement = + (const expression_statement_t*) last_statement; + expression->expression.datatype + = expression_statement->expression->datatype; + } else { + expression->expression.datatype = type_void; + } + expect(')'); return (expression_t*) expression; @@ -1561,7 +1949,6 @@ static expression_t *parse_brace_expression(void) { eat('('); - declaration_t *declaration; switch(token.type) { case '{': /* gcc extension: a stement expression */ @@ -1571,9 +1958,7 @@ static expression_t *parse_brace_expression(void) TYPE_SPECIFIERS return parse_cast(); case T_IDENTIFIER: - declaration = token.v.symbol->declaration; - if(declaration != NULL && - (declaration->storage_class == STORAGE_CLASS_TYPEDEF)) { + if(is_typedef_symbol(token.v.symbol)) { return parse_cast(); } } @@ -1590,8 +1975,9 @@ static expression_t *parse_function_keyword(void) /* TODO */ string_literal_t *expression = allocate_ast_zero(sizeof(expression[0])); - expression->expression.type = EXPR_FUNCTION; - expression->value = "TODO: FUNCTION"; + expression->expression.type = EXPR_FUNCTION; + expression->expression.datatype = type_string; + expression->value = "TODO: FUNCTION"; return (expression_t*) expression; } @@ -1602,15 +1988,16 @@ static expression_t *parse_pretty_function_keyword(void) /* TODO */ string_literal_t *expression = allocate_ast_zero(sizeof(expression[0])); - expression->expression.type = EXPR_PRETTY_FUNCTION; - expression->value = "TODO: PRETTY FUNCTION"; + expression->expression.type = EXPR_PRETTY_FUNCTION; + expression->expression.datatype = type_string; + expression->value = "TODO: PRETTY FUNCTION"; return (expression_t*) expression; } -static member_designator_t *parse_member_designators(void) +static designator_t *parse_designator(void) { - member_designator_t *result = allocate_ast_zero(sizeof(result[0])); + designator_t *result = allocate_ast_zero(sizeof(result[0])); if(token.type != T_IDENTIFIER) { parse_error_expected("problem while parsing member designator", @@ -1621,7 +2008,7 @@ static member_designator_t *parse_member_designators(void) result->symbol = token.v.symbol; next_token(); - member_designator_t *last_designator = result; + designator_t *last_designator = result; while(true) { if(token.type == '.') { next_token(); @@ -1631,9 +2018,8 @@ static member_designator_t *parse_member_designators(void) eat_brace(); return NULL; } - member_designator_t *designator - = allocate_ast_zero(sizeof(result[0])); - designator->symbol = token.v.symbol; + designator_t *designator = allocate_ast_zero(sizeof(result[0])); + designator->symbol = token.v.symbol; next_token(); last_designator->next = designator; @@ -1642,8 +2028,7 @@ static member_designator_t *parse_member_designators(void) } if(token.type == '[') { next_token(); - member_designator_t *designator - = allocate_ast_zero(sizeof(result[0])); + designator_t *designator = allocate_ast_zero(sizeof(result[0])); designator->array_access = parse_expression(); if(designator->array_access == NULL) { eat_brace(); @@ -1667,12 +2052,29 @@ static expression_t *parse_offsetof(void) offsetof_expression_t *expression = allocate_ast_zero(sizeof(expression[0])); - expression->expression.type = EXPR_OFFSETOF; + expression->expression.type = EXPR_OFFSETOF; + expression->expression.datatype = type_size_t; expect('('); expression->type = parse_typename(); expect(','); - expression->member_designators = parse_member_designators(); + expression->designator = parse_designator(); + expect(')'); + + return (expression_t*) expression; +} + +static expression_t *parse_va_arg(void) +{ + eat(T___builtin_va_arg); + + va_arg_expression_t *expression = allocate_ast_zero(sizeof(expression[0])); + expression->expression.type = EXPR_VA_ARG; + + expect('('); + expression->arg = parse_assignment_expression(); + expect(','); + expression->expression.datatype = parse_typename(); expect(')'); return (expression_t*) expression; @@ -1684,6 +2086,8 @@ static expression_t *parse_builtin_symbol(void) = allocate_ast_zero(sizeof(expression[0])); expression->expression.type = EXPR_BUILTIN_SYMBOL; + /* TODO: set datatype */ + expression->symbol = token.v.symbol; next_token(); @@ -1696,6 +2100,8 @@ static expression_t *parse_primary_expression(void) switch(token.type) { case T_INTEGER: return parse_int_const(); + case T_FLOATINGPOINT: + return parse_float_const(); case T_STRING_LITERAL: return parse_string_const(); case T_IDENTIFIER: @@ -1706,9 +2112,10 @@ static expression_t *parse_primary_expression(void) return parse_pretty_function_keyword(); case T___builtin_offsetof: return parse_offsetof(); + case T___builtin_va_arg: + return parse_va_arg(); case T___builtin_expect: case T___builtin_va_start: - case T___builtin_va_arg: case T___builtin_va_end: return parse_builtin_symbol(); @@ -1721,11 +2128,16 @@ static expression_t *parse_primary_expression(void) print_token(stderr, &token); fprintf(stderr, "\n"); eat_statement(); - return NULL; + + expression_t *expression = allocate_ast_zero(sizeof(expression[0])); + expression->type = EXPR_INVALID; + expression->datatype = type_void; + + return expression; } static expression_t *parse_array_expression(unsigned precedence, - expression_t *array_ref) + expression_t *array_ref) { (void) precedence; @@ -1734,41 +2146,40 @@ static expression_t *parse_array_expression(unsigned precedence, array_access_expression_t *array_access = allocate_ast_zero(sizeof(array_access[0])); - array_access->expression.type = EXPR_ARRAY_ACCESS; - array_access->array_ref = array_ref; - array_access->index = parse_expression(); + array_access->expression.type = EXPR_ARRAY_ACCESS; + array_access->array_ref = array_ref; + array_access->index = parse_expression(); + + type_t *array_type = array_ref->datatype; + if(array_type != NULL) { + if(array_type->type == TYPE_POINTER) { + pointer_type_t *pointer = (pointer_type_t*) array_type; + array_access->expression.datatype = pointer->points_to; + } else { + parser_print_error_prefix(); + fprintf(stderr, "array access on object with non-pointer type "); + print_type(array_type); + fprintf(stderr, "\n"); + } + } if(token.type != ']') { parse_error_expected("Problem while parsing array access", ']', 0); - return NULL; + return (expression_t*) array_access; } next_token(); return (expression_t*) array_access; } -static type_t *get_expression_type(const expression_t *expression) -{ - (void) expression; - /* TODO */ - return NULL; -} - -static int is_declaration_specifier(const token_t *token, - int only_type_specifiers) +static bool is_declaration_specifier(const token_t *token, + bool only_type_specifiers) { - declaration_t *declaration; - switch(token->type) { TYPE_SPECIFIERS return 1; case T_IDENTIFIER: - declaration = token->v.symbol->declaration; - if(declaration == NULL) - return 0; - if(declaration->storage_class != STORAGE_CLASS_TYPEDEF) - return 0; - return 1; + return is_typedef_symbol(token->v.symbol); STORAGE_CLASSES TYPE_QUALIFIERS if(only_type_specifiers) @@ -1786,15 +2197,16 @@ static expression_t *parse_sizeof(unsigned precedence) sizeof_expression_t *sizeof_expression = allocate_ast_zero(sizeof(sizeof_expression[0])); - sizeof_expression->expression.type = EXPR_SIZEOF; + sizeof_expression->expression.type = EXPR_SIZEOF; + sizeof_expression->expression.datatype = type_size_t; - if(token.type == '(' && is_declaration_specifier(look_ahead(1), 1)) { + if(token.type == '(' && is_declaration_specifier(look_ahead(1), true)) { next_token(); sizeof_expression->type = parse_typename(); expect(')'); } else { expression_t *expression = parse_sub_expression(precedence); - sizeof_expression->type = get_expression_type(expression); + sizeof_expression->type = expression->datatype; sizeof_expression->size_expression = expression; } @@ -1814,10 +2226,11 @@ static expression_t *parse_select_expression(unsigned precedence, select->expression.type = EXPR_SELECT; select->compound = compound; + /* TODO: datatype */ + if(token.type != T_IDENTIFIER) { - parse_error_expected("Problem while parsing compound select", - T_IDENTIFIER, 0); - return NULL; + parse_error_expected("Problem while parsing select", T_IDENTIFIER, 0); + return (expression_t*) select; } select->symbol = token.v.symbol; next_token(); @@ -1831,8 +2244,8 @@ static expression_t *parse_call_expression(unsigned precedence, (void) precedence; call_expression_t *call = allocate_ast_zero(sizeof(call[0])); - call->expression.type = EXPR_CALL; - call->method = expression; + call->expression.type = EXPR_CALL; + call->function = expression; /* parse arguments */ eat('('); @@ -1858,9 +2271,59 @@ static expression_t *parse_call_expression(unsigned precedence, } expect(')'); + type_t *type = expression->datatype; + if(type != NULL) { + /* we can call pointer to function */ + if(type->type == TYPE_POINTER) { + pointer_type_t *pointer = (pointer_type_t*) type; + type = pointer->points_to; + } + + if(type == NULL || type->type != TYPE_FUNCTION) { + parser_print_error_prefix(); + fprintf(stderr, "expected a function type for call but found " + "type "); + print_type(expression->datatype); + fprintf(stderr, "\n"); + } else { + function_type_t *function_type = (function_type_t*) type; + call->expression.datatype = function_type->result_type; + } + } + return (expression_t*) call; } +static void type_error(const char *msg, const source_position_t source_position, + type_t *type) +{ + parser_print_error_prefix_pos(source_position); + fprintf(stderr, "%s, but found type ", msg); + print_type(type); + fputc('\n', stderr); + error(); +} + +static void type_error_incompatible(const char *msg, + const source_position_t source_position, type_t *type1, type_t *type2) +{ + parser_print_error_prefix_pos(source_position); + fprintf(stderr, "%s, incompatible types: ", msg); + print_type(type1); + fprintf(stderr, " - "); + print_type(type2); + fprintf(stderr, ")\n"); + error(); +} + +static type_t *get_type_after_conversion(const type_t *type1, + const type_t *type2) +{ + /* TODO... */ + (void) type2; + return (type_t*) type1; +} + static expression_t *parse_conditional_expression(unsigned precedence, expression_t *expression) { @@ -1868,12 +2331,52 @@ static expression_t *parse_conditional_expression(unsigned precedence, conditional_expression_t *conditional = allocate_ast_zero(sizeof(conditional[0])); + conditional->expression.type = EXPR_CONDITIONAL; conditional->condition = expression; + /* 6.5.15.2 */ + type_t *condition_type = conditional->condition->datatype; + if(condition_type != NULL) { + if(!is_type_scalar(condition_type)) { + type_error("expected a scalar type", expression->source_position, + condition_type); + } + } + conditional->true_expression = parse_expression(); expect(':'); conditional->false_expression = parse_sub_expression(precedence); + type_t *true_type = conditional->true_expression->datatype; + if(true_type == NULL) + return (expression_t*) conditional; + type_t *false_type = conditional->false_expression->datatype; + if(false_type == NULL) + return (expression_t*) conditional; + + /* 6.5.15.3 */ + if(true_type == false_type) { + conditional->expression.datatype = true_type; + } else if(is_type_arithmetic(true_type) && is_type_arithmetic(false_type)) { + type_t *result = get_type_after_conversion(true_type, false_type); + /* TODO: create implicit convs if necessary */ + conditional->expression.datatype = result; + } else if(true_type->type == TYPE_POINTER && + false_type->type == TYPE_POINTER && + true /* TODO compatible points_to types */) { + /* TODO */ + } else if(/* (is_null_ptr_const(true_type) && false_type->type == TYPE_POINTER) + || (is_null_ptr_const(false_type) && + true_type->type == TYPE_POINTER) TODO*/ false) { + /* TODO */ + } else if(/* 1 is pointer to object type, other is void* */ false) { + /* TODO */ + } else { + type_error_incompatible("problem while parsing conditional", + expression->source_position, true_type, + false_type); + } + return (expression_t*) conditional; } @@ -1886,99 +2389,179 @@ static expression_t *parse_extension(unsigned precedence) return parse_sub_expression(precedence); } -#define CREATE_UNARY_EXPRESSION_PARSER(token_type, unexpression_type) \ -static \ -expression_t *parse_##unexpression_type(unsigned precedence) \ -{ \ - eat(token_type); \ - \ - unary_expression_t *unary_expression \ - = allocate_ast_zero(sizeof(unary_expression[0])); \ - unary_expression->expression.type = EXPR_UNARY; \ - unary_expression->type = unexpression_type; \ - unary_expression->value = parse_sub_expression(precedence); \ - \ - return (expression_t*) unary_expression; \ -} - -CREATE_UNARY_EXPRESSION_PARSER('-', UNEXPR_NEGATE) -CREATE_UNARY_EXPRESSION_PARSER('+', UNEXPR_PLUS) -CREATE_UNARY_EXPRESSION_PARSER('!', UNEXPR_NOT) -CREATE_UNARY_EXPRESSION_PARSER('*', UNEXPR_DEREFERENCE) -CREATE_UNARY_EXPRESSION_PARSER('&', UNEXPR_TAKE_ADDRESS) -CREATE_UNARY_EXPRESSION_PARSER('~', UNEXPR_BITWISE_NEGATE) -CREATE_UNARY_EXPRESSION_PARSER(T_PLUSPLUS, UNEXPR_PREFIX_INCREMENT) -CREATE_UNARY_EXPRESSION_PARSER(T_MINUSMINUS, UNEXPR_PREFIX_DECREMENT) - -#define CREATE_UNARY_POSTFIX_EXPRESSION_PARSER(token_type, unexpression_type) \ -static \ -expression_t *parse_##unexpression_type(unsigned precedence, \ - expression_t *left) \ +static type_t *get_unexpr_arithmetic_type(const expression_t *expression) +{ + /* TODO */ + return expression->datatype; +} + +static type_t *get_unexpr_dereference_type(const expression_t *expression) +{ + type_t *expression_type = expression->datatype; + + if(expression_type->type == TYPE_POINTER) { + pointer_type_t *pointer_type = (pointer_type_t*) expression_type; + return pointer_type->points_to; + } + panic("deref TODO..."); + return NULL; +} + +static type_t *get_unexpr_take_addr_type(const expression_t *expression) +{ + type_t *type = expression->datatype; + return make_pointer_type(type, 0); +} + +#define CREATE_UNARY_EXPRESSION_PARSER(token_type, unexpression_type, tfunc) \ +static expression_t *parse_##unexpression_type(unsigned precedence) \ +{ \ + eat(token_type); \ + \ + unary_expression_t *unary_expression \ + = allocate_ast_zero(sizeof(unary_expression[0])); \ + unary_expression->expression.type = EXPR_UNARY; \ + unary_expression->type = unexpression_type; \ + unary_expression->value = parse_sub_expression(precedence); \ + unary_expression->expression.datatype = tfunc(unary_expression->value); \ + \ + return (expression_t*) unary_expression; \ +} + +CREATE_UNARY_EXPRESSION_PARSER('-', UNEXPR_NEGATE, get_unexpr_arithmetic_type) +CREATE_UNARY_EXPRESSION_PARSER('+', UNEXPR_PLUS, get_unexpr_arithmetic_type) +CREATE_UNARY_EXPRESSION_PARSER('!', UNEXPR_NOT, get_unexpr_arithmetic_type) +CREATE_UNARY_EXPRESSION_PARSER('*', UNEXPR_DEREFERENCE, + get_unexpr_dereference_type) +CREATE_UNARY_EXPRESSION_PARSER('&', UNEXPR_TAKE_ADDRESS, + get_unexpr_take_addr_type) +CREATE_UNARY_EXPRESSION_PARSER('~', UNEXPR_BITWISE_NEGATE, + get_unexpr_arithmetic_type) +CREATE_UNARY_EXPRESSION_PARSER(T_PLUSPLUS, UNEXPR_PREFIX_INCREMENT, + get_unexpr_arithmetic_type) +CREATE_UNARY_EXPRESSION_PARSER(T_MINUSMINUS, UNEXPR_PREFIX_DECREMENT, + get_unexpr_arithmetic_type) + +#define CREATE_UNARY_POSTFIX_EXPRESSION_PARSER(token_type, unexpression_type, \ + tfunc) \ +static expression_t *parse_##unexpression_type(unsigned precedence, \ + expression_t *left) \ { \ (void) precedence; \ eat(token_type); \ \ unary_expression_t *unary_expression \ = allocate_ast_zero(sizeof(unary_expression[0])); \ - unary_expression->expression.type = EXPR_UNARY; \ - unary_expression->type = unexpression_type; \ - unary_expression->value = left; \ + unary_expression->expression.type = EXPR_UNARY; \ + unary_expression->type = unexpression_type; \ + unary_expression->value = left; \ + unary_expression->expression.datatype = tfunc(left); \ \ return (expression_t*) unary_expression; \ } -CREATE_UNARY_POSTFIX_EXPRESSION_PARSER(T_PLUSPLUS, UNEXPR_POSTFIX_INCREMENT) -CREATE_UNARY_POSTFIX_EXPRESSION_PARSER(T_MINUSMINUS, UNEXPR_POSTFIX_DECREMENT) - -#define CREATE_BINEXPR_PARSER(token_type, binexpression_type) \ -static \ -expression_t *parse_##binexpression_type(unsigned precedence, \ - expression_t *left) \ -{ \ - eat(token_type); \ - \ - expression_t *right = parse_sub_expression(precedence); \ - \ - binary_expression_t *binexpr \ - = allocate_ast_zero(sizeof(binexpr[0])); \ - binexpr->expression.type = EXPR_BINARY; \ - binexpr->type = binexpression_type; \ - binexpr->left = left; \ - binexpr->right = right; \ - \ - return (expression_t*) binexpr; \ -} - -CREATE_BINEXPR_PARSER(',', BINEXPR_COMMA) -CREATE_BINEXPR_PARSER('*', BINEXPR_MUL) -CREATE_BINEXPR_PARSER('/', BINEXPR_DIV) -CREATE_BINEXPR_PARSER('%', BINEXPR_MOD) -CREATE_BINEXPR_PARSER('+', BINEXPR_ADD) -CREATE_BINEXPR_PARSER('-', BINEXPR_SUB) -CREATE_BINEXPR_PARSER('<', BINEXPR_LESS) -CREATE_BINEXPR_PARSER('>', BINEXPR_GREATER) -CREATE_BINEXPR_PARSER('=', BINEXPR_ASSIGN) -CREATE_BINEXPR_PARSER(T_EQUALEQUAL, BINEXPR_EQUAL) -CREATE_BINEXPR_PARSER(T_EXCLAMATIONMARKEQUAL, BINEXPR_NOTEQUAL) -CREATE_BINEXPR_PARSER(T_LESSEQUAL, BINEXPR_LESSEQUAL) -CREATE_BINEXPR_PARSER(T_GREATEREQUAL, BINEXPR_GREATEREQUAL) -CREATE_BINEXPR_PARSER('&', BINEXPR_BITWISE_AND) -CREATE_BINEXPR_PARSER('|', BINEXPR_BITWISE_OR) -CREATE_BINEXPR_PARSER('^', BINEXPR_BITWISE_XOR) -CREATE_BINEXPR_PARSER(T_ANDAND, BINEXPR_LOGICAL_AND) -CREATE_BINEXPR_PARSER(T_PIPEPIPE, BINEXPR_LOGICAL_OR) -CREATE_BINEXPR_PARSER(T_LESSLESS, BINEXPR_SHIFTLEFT) -CREATE_BINEXPR_PARSER(T_GREATERGREATER, BINEXPR_SHIFTRIGHT) -CREATE_BINEXPR_PARSER(T_PLUSEQUAL, BINEXPR_ADD_ASSIGN) -CREATE_BINEXPR_PARSER(T_MINUSEQUAL, BINEXPR_SUB_ASSIGN) -CREATE_BINEXPR_PARSER(T_ASTERISKEQUAL, BINEXPR_MUL_ASSIGN) -CREATE_BINEXPR_PARSER(T_SLASHEQUAL, BINEXPR_DIV_ASSIGN) -CREATE_BINEXPR_PARSER(T_PERCENTEQUAL, BINEXPR_MOD_ASSIGN) -CREATE_BINEXPR_PARSER(T_LESSLESSEQUAL, BINEXPR_SHIFTLEFT_ASSIGN) -CREATE_BINEXPR_PARSER(T_GREATERGREATEREQUAL, BINEXPR_SHIFTRIGHT_ASSIGN) -CREATE_BINEXPR_PARSER(T_ANDEQUAL, BINEXPR_BITWISE_AND_ASSIGN) -CREATE_BINEXPR_PARSER(T_PIPEEQUAL, BINEXPR_BITWISE_OR_ASSIGN) -CREATE_BINEXPR_PARSER(T_CARETEQUAL, BINEXPR_BITWISE_XOR_ASSIGN) +CREATE_UNARY_POSTFIX_EXPRESSION_PARSER(T_PLUSPLUS, UNEXPR_POSTFIX_INCREMENT, + get_unexpr_arithmetic_type) +CREATE_UNARY_POSTFIX_EXPRESSION_PARSER(T_MINUSMINUS, UNEXPR_POSTFIX_DECREMENT, + get_unexpr_arithmetic_type) + +static type_t *get_binexpr_int_type(const expression_t *left, + const expression_t *right) +{ + (void) left; + (void) right; + return type_int; +} + +static type_t *get_binexpr_arithmetic_type(const expression_t *left, + const expression_t *right) +{ + (void) right; + return left->datatype; +} + +static type_t *get_binexpr_arithmetic_assign_type(const expression_t *left, + const expression_t *right) +{ + (void) right; + /* TODO */ + return left->datatype; +} + +static type_t *get_binexpr_right_type(const expression_t *left, + const expression_t *right) +{ + (void) left; + return right->datatype; +} + +#define CREATE_BINEXPR_PARSER(token_type, binexpression_type, tfunc) \ +static expression_t *parse_##binexpression_type(unsigned precedence, \ + expression_t *left) \ +{ \ + eat(token_type); \ + \ + expression_t *right = parse_sub_expression(precedence); \ + \ + binary_expression_t *binexpr \ + = allocate_ast_zero(sizeof(binexpr[0])); \ + binexpr->expression.type = EXPR_BINARY; \ + binexpr->type = binexpression_type; \ + binexpr->left = left; \ + binexpr->right = right; \ + binexpr->expression.datatype = tfunc(left, right); \ + \ + return (expression_t*) binexpr; \ +} + +CREATE_BINEXPR_PARSER(',', BINEXPR_COMMA, get_binexpr_right_type) +CREATE_BINEXPR_PARSER('*', BINEXPR_MUL, get_binexpr_arithmetic_type) +CREATE_BINEXPR_PARSER('/', BINEXPR_DIV, get_binexpr_arithmetic_type) +CREATE_BINEXPR_PARSER('%', BINEXPR_MOD, get_binexpr_arithmetic_type) +CREATE_BINEXPR_PARSER('+', BINEXPR_ADD, get_binexpr_arithmetic_type) +CREATE_BINEXPR_PARSER('-', BINEXPR_SUB, get_binexpr_arithmetic_type) +CREATE_BINEXPR_PARSER('<', BINEXPR_LESS, get_binexpr_int_type) +CREATE_BINEXPR_PARSER('>', BINEXPR_GREATER, get_binexpr_int_type) +CREATE_BINEXPR_PARSER('=', BINEXPR_ASSIGN, get_binexpr_right_type) +CREATE_BINEXPR_PARSER(T_EQUALEQUAL, BINEXPR_EQUAL, + get_binexpr_int_type) +CREATE_BINEXPR_PARSER(T_EXCLAMATIONMARKEQUAL, BINEXPR_NOTEQUAL, + get_binexpr_int_type) +CREATE_BINEXPR_PARSER(T_LESSEQUAL, BINEXPR_LESSEQUAL, + get_binexpr_int_type) +CREATE_BINEXPR_PARSER(T_GREATEREQUAL, BINEXPR_GREATEREQUAL, + get_binexpr_int_type) +CREATE_BINEXPR_PARSER('&', BINEXPR_BITWISE_AND, get_binexpr_arithmetic_type) +CREATE_BINEXPR_PARSER('|', BINEXPR_BITWISE_OR, get_binexpr_arithmetic_type) +CREATE_BINEXPR_PARSER('^', BINEXPR_BITWISE_XOR, get_binexpr_arithmetic_type) +CREATE_BINEXPR_PARSER(T_ANDAND, BINEXPR_LOGICAL_AND, + get_binexpr_int_type) +CREATE_BINEXPR_PARSER(T_PIPEPIPE, BINEXPR_LOGICAL_OR, + get_binexpr_int_type) +CREATE_BINEXPR_PARSER(T_LESSLESS, BINEXPR_SHIFTLEFT, + get_binexpr_arithmetic_type) +CREATE_BINEXPR_PARSER(T_GREATERGREATER, BINEXPR_SHIFTRIGHT, + get_binexpr_arithmetic_type) +CREATE_BINEXPR_PARSER(T_PLUSEQUAL, BINEXPR_ADD_ASSIGN, + get_binexpr_arithmetic_assign_type) +CREATE_BINEXPR_PARSER(T_MINUSEQUAL, BINEXPR_SUB_ASSIGN, + get_binexpr_arithmetic_assign_type) +CREATE_BINEXPR_PARSER(T_ASTERISKEQUAL, BINEXPR_MUL_ASSIGN, + get_binexpr_arithmetic_assign_type) +CREATE_BINEXPR_PARSER(T_SLASHEQUAL, BINEXPR_DIV_ASSIGN, + get_binexpr_arithmetic_assign_type) +CREATE_BINEXPR_PARSER(T_PERCENTEQUAL, BINEXPR_MOD_ASSIGN, + get_binexpr_arithmetic_assign_type) +CREATE_BINEXPR_PARSER(T_LESSLESSEQUAL, BINEXPR_SHIFTLEFT_ASSIGN, + get_binexpr_arithmetic_assign_type) +CREATE_BINEXPR_PARSER(T_GREATERGREATEREQUAL, BINEXPR_SHIFTRIGHT_ASSIGN, + get_binexpr_arithmetic_assign_type) +CREATE_BINEXPR_PARSER(T_ANDEQUAL, BINEXPR_BITWISE_AND_ASSIGN, + get_binexpr_arithmetic_assign_type) +CREATE_BINEXPR_PARSER(T_PIPEEQUAL, BINEXPR_BITWISE_OR_ASSIGN, + get_binexpr_arithmetic_assign_type) +CREATE_BINEXPR_PARSER(T_CARETEQUAL, BINEXPR_BITWISE_XOR_ASSIGN, + get_binexpr_arithmetic_assign_type) static expression_t *parse_sub_expression(unsigned precedence) { @@ -1996,8 +2579,8 @@ static expression_t *parse_sub_expression(unsigned precedence) } else { left = parse_primary_expression(); } - if(left != NULL) - left->source_position = source_position; + assert(left != NULL); + left->source_position = source_position; while(true) { if(token.type < 0) { @@ -2011,8 +2594,10 @@ static expression_t *parse_sub_expression(unsigned precedence) break; left = parser->infix_parser(parser->infix_precedence, left); - if(left != NULL) - left->source_position = source_position; + + assert(left != NULL); + assert(left->type != EXPR_INVALID); + left->source_position = source_position; } return left; @@ -2025,8 +2610,8 @@ static expression_t *parse_expression(void) -void register_expression_parser(parse_expression_function parser, - int token_type, unsigned precedence) +static void register_expression_parser(parse_expression_function parser, + int token_type, unsigned precedence) { expression_parser_function_t *entry = &expression_parsers[token_type]; @@ -2040,8 +2625,9 @@ void register_expression_parser(parse_expression_function parser, entry->precedence = precedence; } -void register_expression_infix_parser(parse_expression_infix_function parser, - int token_type, unsigned precedence) +static void register_expression_infix_parser( + parse_expression_infix_function parser, int token_type, + unsigned precedence) { expression_parser_function_t *entry = &expression_parsers[token_type]; @@ -2250,7 +2836,7 @@ static statement_t *parse_for(void) set_context(&statement->context); if(token.type != ';') { - if(is_declaration_specifier(&token, 0)) { + if(is_declaration_specifier(&token, false)) { parse_declaration(); } else { statement->initialisation = parse_expression(); @@ -2370,7 +2956,6 @@ static statement_t *parse_expression_statement(void) static statement_t *parse_statement(void) { - declaration_t *declaration; statement_t *statement = NULL; /* declaration or statement */ @@ -2434,9 +3019,7 @@ static statement_t *parse_statement(void) break; } - declaration = token.v.symbol->declaration; - if(declaration != NULL && - declaration->storage_class == STORAGE_CLASS_TYPEDEF) { + if(is_typedef_symbol(token.v.symbol)) { statement = parse_declaration_statement(); break; } @@ -2512,6 +3095,9 @@ static translation_unit_t *parse_translation_unit(void) { translation_unit_t *unit = allocate_ast_zero(sizeof(unit[0])); + assert(global_context == NULL); + global_context = &unit->context; + assert(context == NULL); set_context(&unit->context); @@ -2523,13 +3109,15 @@ static translation_unit_t *parse_translation_unit(void) context = NULL; last_declaration = NULL; + assert(global_context == &unit->context); + global_context = NULL; + return unit; } translation_unit_t *parse(void) { - obstack_init(&environment_obstack); - environment_stack = NEW_ARR_F(environment_entry_t*, 0); + environment_stack = NEW_ARR_F(stack_entry_t, 0); type_set_output(stderr); @@ -2540,7 +3128,6 @@ translation_unit_t *parse(void) translation_unit_t *unit = parse_translation_unit(); DEL_ARR_F(environment_stack); - obstack_free(&environment_obstack, NULL); return unit; } @@ -2549,6 +3136,13 @@ void init_parser(void) { init_expression_parsers(); obstack_init(&temp_obst); + + type_int = make_atomic_type(ATOMIC_TYPE_INT, 0); + type_double = make_atomic_type(ATOMIC_TYPE_DOUBLE, 0); + type_size_t = make_atomic_type(ATOMIC_TYPE_UINT, 0); + type_const_char = make_atomic_type(ATOMIC_TYPE_CHAR, TYPE_QUALIFIER_CONST); + type_void = make_atomic_type(ATOMIC_TYPE_VOID, 0); + type_string = make_pointer_type(type_const_char, 0); } void exit_parser(void)