X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=fdb85bd97252e3856e0f3d8c25a090a88af77dc4;hb=353985d8d06fcac2f36682820b8ae635c5e6162e;hp=b119f6e911e0a3d4fc99393b2563113295f3f43e;hpb=764c2b78c425052501270bf09358c89ad9f2c9cc;p=cparser diff --git a/parser.c b/parser.c index b119f6e..fdb85bd 100644 --- a/parser.c +++ b/parser.c @@ -19,17 +19,16 @@ #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; @@ -155,14 +154,14 @@ static inline const token_t *look_ahead(int num) #define eat(token_type) do { assert(token.type == token_type); next_token(); } while(0) -void error(void) +static void error(void) { #ifdef ABORT_ON_ERROR abort(); #endif } -void parser_print_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); @@ -170,14 +169,15 @@ void parser_print_prefix_pos(const source_position_t source_position) fputs(": ", stderr); } -void parser_print_error_prefix_pos(const source_position_t source_position) +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_prefix_pos(token.source_position); error(); @@ -302,16 +302,12 @@ 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; } /** @@ -325,51 +321,93 @@ static bool is_compatible_declaration (declaration_t *declaration, 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) { - symbol_t *symbol = declaration->symbol; - assert(declaration != symbol->declaration); + symbol_t *symbol = declaration->symbol; + namespace_t namespace = declaration->namespace; assert(declaration->source_position.input_name != NULL); - 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); - 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; + /* 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; } - environment_entry_t *entry - = obstack_alloc(&environment_obstack, sizeof(entry[0])); - memset(entry, 0, sizeof(entry[0])); - - int top = ARR_LEN(environment_stack); - ARR_RESIZE(environment_stack, top + 1); - environment_stack[top] = entry; + /* remember old declaration */ + stack_entry_t entry; + entry.symbol = symbol; + entry.old_declaration = symbol->declaration; + entry.namespace = namespace; + ARR_APP1(environment_stack, entry); - entry->old_declaration = symbol->declaration; - entry->old_context = symbol->context; - entry->symbol = symbol; - symbol->declaration = declaration; - symbol->context = context; + /* 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 declaration; } @@ -377,28 +415,46 @@ static inline declaration_t *environment_push(declaration_t *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); } @@ -418,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; @@ -592,19 +647,7 @@ static initializer_t *parse_initializer_list(void) return result; } -static compound_type_t *find_compound_type(compound_type_t *types, - const symbol_t *symbol) -{ - compound_type_t *type = types; - for( ; type != NULL; type = type->next) { - if(type->symbol == symbol) - return type; - } - - return NULL; -} - -static type_t *parse_compound_type_specifier(bool is_struct) +static declaration_t *parse_compound_type_specifier(bool is_struct) { if(is_struct) { eat(T_struct); @@ -612,19 +655,17 @@ static type_t *parse_compound_type_specifier(bool 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) { @@ -638,40 +679,42 @@ static type_t *parse_compound_type_specifier(bool 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) @@ -700,7 +743,7 @@ static void parse_enum_entries(void) if(token.type == '=') { next_token(); - entry->initializer = parse_initializer(); + entry->init.initializer = parse_initializer(); } record_declaration(entry); @@ -713,80 +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(); parse_attributes(); - - if(before == NULL) { - enum_type->entries_begin = context->declarations; - } else { - enum_type->entries_begin = before->next; - } - enum_type->entries_end = last_declaration; } - 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) { @@ -799,29 +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; + typeof_type_t *typeof = allocate_type_zero(sizeof(typeof[0])); + typeof->type.type = TYPE_TYPEOF; + typeof->expression = expression; + typeof->typeof_type = type; + + return (type_t*) typeof; } typedef enum { @@ -850,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) { - free_type(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; @@ -940,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(true); + /* 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(false); + } + 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; @@ -963,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: @@ -1158,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; @@ -1187,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) { @@ -1230,7 +1296,7 @@ static declaration_t *parse_parameters(method_type_t *type) typedef enum { CONSTRUCT_POINTER, - CONSTRUCT_METHOD, + CONSTRUCT_FUNCTION, CONSTRUCT_ARRAY } construct_type_type_t; @@ -1246,10 +1312,10 @@ struct parsed_pointer_t { type_qualifier_t type_qualifiers; }; -typedef struct construct_method_type_t construct_method_type_t; -struct construct_method_type_t { - construct_type_t construct_type; - method_type_t *method_type; +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; @@ -1311,28 +1377,27 @@ static construct_type_t *parse_array_declarator(void) return (construct_type_t*) array; } -static construct_type_t *parse_method_declarator(declaration_t *declaration) +static construct_type_t *parse_function_declarator(declaration_t *declaration) { eat('('); - method_type_t *method_type - = allocate_type_zero(sizeof(method_type[0])); - method_type->type.type = TYPE_METHOD; + function_type_t *type = allocate_type_zero(sizeof(type[0])); + type->type.type = TYPE_FUNCTION; - declaration_t *parameters = parse_parameters(method_type); + declaration_t *parameters = parse_parameters(type); if(declaration != NULL) { declaration->context.declarations = parameters; } - construct_method_type_t *construct_method_type = - obstack_alloc(&temp_obst, sizeof(construct_method_type[0])); - memset(construct_method_type, 0, sizeof(construct_method_type[0])); - construct_method_type->construct_type.type = CONSTRUCT_METHOD; - construct_method_type->method_type = method_type; + 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_method_type; + return (construct_type_t*) construct_function_type; } static construct_type_t *parse_inner_declarator(declaration_t *declaration, @@ -1382,7 +1447,7 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration, construct_type_t *type; switch(token.type) { case '(': - type = parse_method_declarator(declaration); + type = parse_function_declarator(declaration); break; case '[': type = parse_array_declarator(); @@ -1419,20 +1484,20 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, { construct_type_t *iter = construct_list; for( ; iter != NULL; iter = iter->next) { - parsed_pointer_t *parsed_pointer; - parsed_array_t *parsed_array; - construct_method_type_t *construct_method_type; - method_type_t *method_type; - pointer_type_t *pointer_type; - array_type_t *array_type; + parsed_pointer_t *parsed_pointer; + parsed_array_t *parsed_array; + construct_function_type_t *construct_function_type; + function_type_t *function_type; + pointer_type_t *pointer_type; + array_type_t *array_type; switch(iter->type) { - case CONSTRUCT_METHOD: - construct_method_type = (construct_method_type_t*) iter; - method_type = construct_method_type->method_type; + case CONSTRUCT_FUNCTION: + construct_function_type = (construct_function_type_t*) iter; + function_type = construct_function_type->function_type; - method_type->result_type = type; - type = (type_t*) method_type; + function_type->result_type = type; + type = (type_t*) function_type; break; case CONSTRUCT_POINTER: @@ -1469,50 +1534,52 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, 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) { + 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); - declaration->type = construct_declarator_type(construct_type, type); - declaration->storage_class = storage_class; if(construct_type != NULL) { obstack_free(&temp_obst, construct_type); } + + return declaration; } static type_t *parse_abstract_declarator(type_t *base_type) { - construct_type_t *construct_type - = parse_inner_declarator(NULL, 1); - - if(construct_type == NULL) - return NULL; + construct_type_t *construct_type = parse_inner_declarator(NULL, 1); type_t *result = construct_declarator_type(construct_type, base_type); - obstack_free(&temp_obst, construct_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; @@ -1535,30 +1602,30 @@ 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); } - ndeclaration->initializer = parse_initializer(); + 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) { @@ -1573,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(); @@ -1582,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; } @@ -1602,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); @@ -1630,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); @@ -1644,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); @@ -1743,15 +1817,15 @@ static expression_t *parse_float_const(void) static declaration_t *create_implicit_function(symbol_t *symbol, const source_position_t source_position) { - method_type_t *method_type = allocate_type_zero(sizeof(method_type)); + function_type_t *function_type = allocate_type_zero(sizeof(function_type)); - method_type->type.type = TYPE_METHOD; - method_type->result_type = type_int; - method_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((type_t*) method_type); - if(type != (type_t*) method_type) { - free_type(method_type); + 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])); @@ -1761,13 +1835,19 @@ static declaration_t *create_implicit_function(symbol_t *symbol, declaration->symbol = symbol; declaration->source_position = source_position; - /* we have to violate the environment push/pop rules here and assign - * the declaration directly to its symbol and append it to the - * global context */ + /* 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); - symbol->declaration = declaration; - declaration->next = global_context->declarations; - global_context->declarations = declaration; + + context_t *last_context = context; + context = global_context; + + environment_push(declaration); + declaration->next = context->declarations; + context->declarations = declaration; + + context = last_context; return declaration; } @@ -1779,8 +1859,9 @@ static expression_t *parse_reference(void) ref->expression.type = EXPR_REFERENCE; ref->symbol = token.v.symbol; - declaration_t *declaration = ref->symbol->declaration; - source_position_t source_position = token.source_position; + declaration_t *declaration = get_declaration(ref->symbol, NAMESPACE_NORMAL); + + source_position_t source_position = token.source_position; next_token(); if(declaration == NULL) { @@ -1868,7 +1949,6 @@ static expression_t *parse_brace_expression(void) { eat('('); - declaration_t *declaration; switch(token.type) { case '{': /* gcc extension: a stement expression */ @@ -1878,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(); } } @@ -2097,18 +2175,11 @@ static expression_t *parse_array_expression(unsigned precedence, 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) @@ -2174,7 +2245,7 @@ static expression_t *parse_call_expression(unsigned precedence, call_expression_t *call = allocate_ast_zero(sizeof(call[0])); call->expression.type = EXPR_CALL; - call->method = expression; + call->function = expression; /* parse arguments */ eat('('); @@ -2208,14 +2279,15 @@ static expression_t *parse_call_expression(unsigned precedence, type = pointer->points_to; } - if(type == NULL || type->type != TYPE_METHOD) { + if(type == NULL || type->type != TYPE_FUNCTION) { parser_print_error_prefix(); - fprintf(stderr, "expected a method type for call but found type "); + fprintf(stderr, "expected a function type for call but found " + "type "); print_type(expression->datatype); fprintf(stderr, "\n"); } else { - method_type_t *method_type = (method_type_t*) type; - call->expression.datatype = method_type->result_type; + function_type_t *function_type = (function_type_t*) type; + call->expression.datatype = function_type->result_type; } } @@ -2223,7 +2295,7 @@ static expression_t *parse_call_expression(unsigned precedence, } static void type_error(const char *msg, const source_position_t source_position, - const type_t *type) + type_t *type) { parser_print_error_prefix_pos(source_position); fprintf(stderr, "%s, but found type ", msg); @@ -2233,8 +2305,7 @@ static void type_error(const char *msg, const source_position_t source_position, } static void type_error_incompatible(const char *msg, - const source_position_t source_position, const type_t *type1, - const type_t *type2) + 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); @@ -2318,99 +2389,174 @@ 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) +{ + (void) expression; + /* 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) { @@ -2459,8 +2605,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]; @@ -2474,8 +2620,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]; @@ -2804,7 +2951,6 @@ static statement_t *parse_expression_statement(void) static statement_t *parse_statement(void) { - declaration_t *declaration; statement_t *statement = NULL; /* declaration or statement */ @@ -2868,9 +3014,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; } @@ -2968,8 +3112,7 @@ static translation_unit_t *parse_translation_unit(void) 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); @@ -2980,7 +3123,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; }