static void parse_compound_type_entries(void);
static void parse_declarator(declaration_t *declaration,
- storage_class_t storage_class, type_t *type);
+ storage_class_t storage_class, type_t *type,
+ int may_omit_identifier);
static void maybe_push_declaration(declaration_t *declaration);
static void record_declaration(declaration_t *declaration);
}
static
-type_t *parse_pointer(type_t *type)
+int parse_pointers(void)
{
+ int result = 0;
+
while(token.type == '*') {
- /* pointer */
next_token();
+ result++;
+ }
+
+ return result;
+}
+static
+type_t *make_pointers(type_t *type, int count)
+{
+ for(int i = 0; i < count; ++i) {
pointer_type_t *pointer_type
= allocate_type_zero(sizeof(pointer_type[0]));
pointer_type->type.type = TYPE_POINTER;
}
static
-void parse_identifier_list()
+void parse_identifier_list(void)
{
while(1) {
if(token.type != T_IDENTIFIER) {
}
static
-void parse_parameter()
+declaration_t *parse_parameter(void)
{
- if(token.type == T_DOTDOTDOT) {
- next_token();
- return;
- }
-
declaration_specifiers_t specifiers;
memset(&specifiers, 0, sizeof(specifiers));
parse_declaration_specifiers(&specifiers);
- specifiers.type = parse_pointer(specifiers.type);
- if(token.type == '(' || token.type == T_IDENTIFIER) {
- declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0]));
- parse_declarator(declaration, specifiers.storage_class,
- specifiers.type);
+ declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0]));
+ parse_declarator(declaration, specifiers.storage_class,
+ specifiers.type, 1);
+
+#if 0
+ if(declaration->symbol != NULL) {
maybe_push_declaration(declaration);
record_declaration(declaration);
}
+#endif
+
+ return declaration;
}
static
-void parse_parameters()
+void parse_parameters(method_type_t *type)
{
if(token.type == T_IDENTIFIER) {
symbol_t *symbol = token.v.symbol;
}
}
+ if(token.type == ')') {
+ type->unspecified_parameters = 1;
+ return;
+ }
+ if(token.type == T_void && la(1)->type == ')') {
+ next_token();
+ return;
+ }
+
+ declaration_t *declaration;
+ method_parameter_type_t *parameter_type;
+ method_parameter_type_t *last_parameter_type = NULL;
+
while(1) {
switch(token.type) {
case T_DOTDOTDOT:
+ next_token();
+ type->variadic = 1;
+ return;
+
case T_IDENTIFIER:
DECLARATION_START
- parse_parameter();
+ declaration = parse_parameter();
+
+ parameter_type = allocate_type_zero(sizeof(parameter_type[0]));
+ parameter_type->type = declaration->type;
+ parameter_type->symbol = declaration->symbol;
+
+ if(last_parameter_type != NULL) {
+ last_parameter_type->next = parameter_type;
+ } else {
+ type->parameter_types = parameter_type;
+ }
+ last_parameter_type = parameter_type;
break;
+
default:
return;
}
}
}
+typedef struct declarator_part declarator_part;
+struct declarator_part {
+ int pointers;
+ method_type_t *method_type;
+ declarator_part *inner;
+};
+
+static struct obstack temp_obst;
+
+static
+declarator_part *parse_inner_declarator(declaration_t *declaration)
+{
+ declarator_part *part = obstack_alloc(&temp_obst, sizeof(part[0]));
+ memset(part, 0, sizeof(part[0]));
+
+ part->pointers = parse_pointers();
+
+ switch(token.type) {
+ case T_IDENTIFIER:
+ declaration->symbol = token.v.symbol;
+ declaration->source_position = token.source_position;
+ next_token();
+ break;
+ case '(':
+ next_token();
+ part->inner = parse_inner_declarator(declaration);
+ expect(')');
+ break;
+ default:
+ parse_error_expected("problem while parsing declarator", T_IDENTIFIER,
+ '(', 0);
+ }
+
+ while(1) {
+ switch(token.type) {
+ case '(':
+ next_token();
+
+#if 0
+ int top = environment_top();
+ context_t *last_context = context;
+ set_context(&declaration->context);
+#endif
+
+ method_type_t *method_type
+ = allocate_type_zero(sizeof(method_type[0]));
+ method_type->type.type = TYPE_METHOD;
+
+ parse_parameters(method_type);
+
+#if 0
+ assert(context == &declaration->context);
+ set_context(last_context);
+ environment_pop_to(top);
+#endif
+
+ part->method_type = method_type;
+
+ expect(')');
+ 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 == '*' && la(1)->type == ']') {
+ next_token();
+ } else if(token.type != ']') {
+ parse_assignment_expression();
+ }
+
+ expect(']');
+ break;
+ default:
+ goto declarator_finished;
+ }
+ }
+
+declarator_finished:
+ parse_attributes();
+
+ return part;
+}
+
+static
+type_t *construct_declarator_type(declarator_part *part, type_t *type)
+{
+ do {
+ type = make_pointers(type, part->pointers);
+
+ method_type_t *method_type = part->method_type;
+ if(method_type != NULL) {
+ method_type->result_type = type;
+
+ type = (type_t*) method_type;
+ }
+
+ part = part->inner;
+ } while(part != NULL);
+
+ return type;
+}
+
+static
+void parse_declarator(declaration_t *declaration, storage_class_t storage_class,
+ type_t *type, int may_omit_identifier)
+{
+ (void) may_omit_identifier;
+ declarator_part *part = parse_inner_declarator(declaration);
+
+ declaration->type = construct_declarator_type(part, type);
+ declaration->storage_class = storage_class;
+ obstack_free(&temp_obst, part);
+}
+
+#if 0
static
void parse_declarator(declaration_t *declaration, storage_class_t storage_class,
- type_t *type)
+ type_t *type, int may_omit_identifier)
{
- type = parse_pointer(type);
+ ir_type *outer_type = parse_pointers(type);
+
declaration->storage_class = storage_class;
- declaration->type = type;
+ declaration->type = outer_type;
switch(token.type) {
case T_IDENTIFIER:
break;
case '(':
next_token();
- parse_declarator(declaration, storage_class, type);
+ parse_declarator(declaration, storage_class, type, 0);
expect_void(')');
break;
default:
+ if(may_omit_identifier)
+ goto declarator_finished;
parse_error_expected("problem while parsing declarator", T_IDENTIFIER,
'(', 0);
}
context_t *last_context = context;
set_context(&declaration->context);
- parse_parameters();
+ method_type_t *method_type
+ = allocate_type_zero(sizeof(method_type[0]));
+ method_type->type.type = TYPE_METHOD;
+ method_type->result_type = outer_type;
+
+ parse_parameters(method_type);
assert(context == &declaration->context);
set_context(last_context);
environment_pop_to(top);
+ replace_type(&declaration->type, outer_type,
+ method_type);
+
expect_void(')');
break;
case '[':
declarator_finished:
parse_attributes();
}
+#endif
static void record_declaration(declaration_t *declaration)
{
declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0]));
parse_declarator(declaration, specifiers->storage_class,
- specifiers->type);
+ specifiers->type, 0);
maybe_push_declaration(declaration);
record_declaration(declaration);
if(token.type == '=') {
parse_assignment_expression();
}
} else if(token.type == '{') {
- parse_compound_statement();
+ statement_t *statement = parse_compound_statement();
+ declaration->statement = statement;
return;
}
declaration_t *declaration
= allocate_ast_zero(sizeof(declaration[0]));
parse_declarator(declaration, specifiers->storage_class,
- specifiers->type);
+ specifiers->type, 0);
maybe_push_declaration(declaration);
record_declaration(declaration);
/* TODO not correct storage class elements are not allowed here */
parse_declaration_specifiers(&specifiers);
- specifiers.type = parse_pointer(specifiers.type);
+ int pointers = parse_pointers();
+ specifiers.type = make_pointers(specifiers.type, pointers);
return specifiers.type;
}
next_token();
- return NULL;
+ return (statement_t*) compound_statement;
}
static
void init_parser(void)
{
init_expression_parsers();
+ obstack_init(&temp_obst);
}
void exit_parser(void)
{
+ obstack_free(&temp_obst, NULL);
}
projects / cparser / blobdiff