X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast.c;h=e1097544da3ba03d76b6c598e86341de7f4dc8b5;hb=9de06381987e3b71a9efea26cb9b596fd433191c;hp=6590f578cffa0bf1bd5a2602bc554c88a590a67c;hpb=6734a093fb9d14f6a626293849de8a38b39b9457;p=cparser

diff --git a/ast.c b/ast.c
index 6590f57..e109754 100644
--- a/ast.c
+++ b/ast.c
@@ -16,20 +16,33 @@ static FILE *out;
 static int   indent;
 
 static void print_statement(const statement_t *statement);
-static void print_declaration(const declaration_t *declaration);
 
-static void print_indent(void)
+void change_indent(int delta)
+{
+	indent += delta;
+	assert(indent >= 0);
+}
+
+void print_indent(void)
 {
 	for(int i = 0; i < indent; ++i)
 		fprintf(out, "\t");
 }
 
-static void print_const(const const_t *cnst)
+static void print_const(const const_expression_t *cnst)
 {
-	fprintf(out, "%d", cnst->value);
+	if(cnst->expression.datatype == NULL)
+		return;
+
+	if(is_type_integer(cnst->expression.datatype)) {
+		fprintf(out, "%lld", cnst->v.int_value);
+	} else if(is_type_floating(cnst->expression.datatype)) {
+		fprintf(out, "%Lf", cnst->v.float_value);
+	}
 }
 
-static void print_string_literal(const string_literal_t *string_literal)
+static void print_string_literal(
+		const string_literal_expression_t *string_literal)
 {
 	fputc('"', out);
 	for(const char *c = string_literal->value; *c != '\0'; ++c) {
@@ -58,7 +71,7 @@ static void print_string_literal(const string_literal_t *string_literal)
 
 static void print_call_expression(const call_expression_t *call)
 {
-	print_expression(call->method);
+	print_expression(call->function);
 	fprintf(out, "(");
 	call_argument_t *argument = call->arguments;
 	int              first    = 1;
@@ -149,7 +162,7 @@ static void print_unary_expression(const unary_expression_t *unexpr)
 		fputs(")", out);
 		break;
 	case UNEXPR_INVALID:
-		fprintf(out, "unop%d", unexpr->type);
+		fprintf(out, "unop%d", (int) unexpr->type);
 		break;
 	}
 	fputs("(", out);
@@ -164,11 +177,19 @@ static void print_reference_expression(const reference_expression_t *ref)
 
 static void print_array_expression(const array_access_expression_t *expression)
 {
-	fputs("(", out);
-	print_expression(expression->array_ref);
-	fputs(")[", out);
-	print_expression(expression->index);
-	fputs("]", out);
+	if(!expression->flipped) {
+		fputs("(", out);
+		print_expression(expression->array_ref);
+		fputs(")[", out);
+		print_expression(expression->index);
+		fputs("]", out);
+	} else {
+		fputs("(", out);
+		print_expression(expression->index);
+		fputs(")[", out);
+		print_expression(expression->array_ref);
+		fputs("]", out);
+	}
 }
 
 static void print_sizeof_expression(const sizeof_expression_t *expression)
@@ -190,48 +211,99 @@ static void print_builtin_symbol(const builtin_symbol_expression_t *expression)
 	fputs(expression->symbol->string, out);
 }
 
+static void print_conditional(const conditional_expression_t *expression)
+{
+	fputs("(", out);
+	print_expression(expression->condition);
+	fputs(" ? ", out);
+	print_expression(expression->true_expression);
+	fputs(" : ", out);
+	print_expression(expression->false_expression);
+	fputs(")", out);
+}
+
+static void print_va_arg(const va_arg_expression_t *expression)
+{
+	fputs("__builtin_va_arg(", out);
+	print_expression(expression->arg);
+	fputs(", ", out);
+	print_type(expression->expression.datatype);
+	fputs(")", out);
+}
+
+static void print_select(const select_expression_t *expression)
+{
+	print_expression(expression->compound);
+	if(expression->compound->base.datatype == NULL ||
+			expression->compound->base.datatype->type == TYPE_POINTER) {
+		fputs("->", out);
+	} else {
+		fputc('.', out);
+	}
+	fputs(expression->symbol->string, out);
+}
+
+static void print_classify_type_expression(
+	const classify_type_expression_t *const expr)
+{
+	fputs("__builtin_classify_type(", out);
+	print_expression(expr->type_expression);
+	fputc(')', out);
+}
+
 void print_expression(const expression_t *expression)
 {
 	switch(expression->type) {
+	case EXPR_UNKNOWN:
 	case EXPR_INVALID:
 		fprintf(out, "*invalid expression*");
 		break;
 	case EXPR_CONST:
-		print_const((const const_t*) expression);
+		print_const(&expression->conste);
 		break;
 	case EXPR_FUNCTION:
 	case EXPR_PRETTY_FUNCTION:
 	case EXPR_STRING_LITERAL:
-		print_string_literal((const string_literal_t*) expression);
+		print_string_literal(&expression->string);
 		break;
 	case EXPR_CALL:
-		print_call_expression((const call_expression_t*) expression);
+		print_call_expression(&expression->call);
 		break;
 	case EXPR_BINARY:
-		print_binary_expression((const binary_expression_t*) expression);
+		print_binary_expression(&expression->binary);
 		break;
 	case EXPR_REFERENCE:
-		print_reference_expression((const reference_expression_t*) expression);
+		print_reference_expression(&expression->reference);
 		break;
 	case EXPR_ARRAY_ACCESS:
-		print_array_expression((const array_access_expression_t*) expression);
+		print_array_expression(&expression->array_access);
 		break;
 	case EXPR_UNARY:
-		print_unary_expression((const unary_expression_t*) expression);
+		print_unary_expression(&expression->unary);
 		break;
 	case EXPR_SIZEOF:
-		print_sizeof_expression((const sizeof_expression_t*) expression);
+		print_sizeof_expression(&expression->sizeofe);
 		break;
 	case EXPR_BUILTIN_SYMBOL:
-		print_builtin_symbol((const builtin_symbol_expression_t*) expression);
+		print_builtin_symbol(&expression->builtin_symbol);
 		break;
-
 	case EXPR_CONDITIONAL:
+		print_conditional(&expression->conditional);
+		break;
+	case EXPR_VA_ARG:
+		print_va_arg(&expression->va_arge);
+		break;
+	case EXPR_SELECT:
+		print_select(&expression->select);
+		break;
+	case EXPR_CLASSIFY_TYPE:
+		print_classify_type_expression(&expression->classify_type);
+		break;
+
 	case EXPR_OFFSETOF:
 	case EXPR_STATEMENT:
-	case EXPR_SELECT:
 		/* TODO */
-		fprintf(out, "some expression of type %d", expression->type);
+		fprintf(out, "some expression of type %d", (int) expression->type);
 		break;
 	}
 }
@@ -246,7 +318,7 @@ static void print_compound_statement(const compound_statement_t *block)
 		print_indent();
 		print_statement(statement);
 
-		statement = statement->next;
+		statement = statement->base.next;
 	}
 	indent--;
 	print_indent();
@@ -270,17 +342,18 @@ static void print_expression_statement(const expression_statement_t *statement)
 static void print_goto_statement(const goto_statement_t *statement)
 {
 	fprintf(out, "goto ");
-	if(statement->label != NULL) {
-		fprintf(out, "%s", statement->label->symbol->string);
-	} else {
-		fprintf(out, "?%s", statement->label_symbol->string);
-	}
+	fputs(statement->label->symbol->string, out);
+	fprintf(stderr, "(%p)", (void*) statement->label);
 	fputs(";\n", out);
 }
 
 static void print_label_statement(const label_statement_t *statement)
 {
-	fprintf(out, "%s:\n", statement->symbol->string);
+	fprintf(stderr, "(%p)", (void*) statement->label);
+	fprintf(out, "%s:\n", statement->label->symbol->string);
+	if(statement->label_statement != NULL) {
+		print_statement(statement->label_statement);
+	}
 }
 
 static void print_if_statement(const if_statement_t *statement)
@@ -316,15 +389,23 @@ static void print_case_label(const case_label_statement_t *statement)
 		print_expression(statement->expression);
 		fputs(":\n", out);
 	}
+	print_statement(statement->label_statement);
 }
 
 static void print_declaration_statement(
 		const declaration_statement_t *statement)
 {
+	int first = 1;
 	declaration_t *declaration = statement->declarations_begin;
 	for( ; declaration != statement->declarations_end->next;
 	       declaration = declaration->next) {
+		if(!first) {
+			print_indent();
+		} else {
+			first = 0;
+		}
 		print_declaration(declaration);
+		fputc('\n', out);
 	}
 }
 
@@ -346,9 +427,30 @@ static void print_do_while_statement(const do_while_statement_t *statement)
 	fputs(");\n", out);
 }
 
-static void print_for_statemenet(const for_statement_t *statement)
+static void print_for_statement(const for_statement_t *statement)
 {
-	fprintf(out, "for(TODO) ");
+	fputs("for(", out);
+	if(statement->context.declarations != NULL) {
+		assert(statement->initialisation == NULL);
+		print_declaration(statement->context.declarations);
+		if(statement->context.declarations->next != NULL) {
+			panic("multiple declarations in for statement not supported yet");
+		}
+		fputc(' ', out);
+	} else {
+		if(statement->initialisation) {
+			print_expression(statement->initialisation);
+		}
+		fputs("; ", out);
+	}
+	if(statement->condition != NULL) {
+		print_expression(statement->condition);
+	}
+	fputs("; ", out);
+	if(statement->step != NULL) {
+		print_expression(statement->step);
+	}
+	fputs(")", out);
 	print_statement(statement->body);
 }
 
@@ -395,7 +497,7 @@ void print_statement(const statement_t *statement)
 		print_do_while_statement((const do_while_statement_t*) statement);
 		break;
 	case STATEMENT_FOR:
-		print_for_statemenet((const for_statement_t*) statement);
+		print_for_statement((const for_statement_t*) statement);
 		break;
 	case STATEMENT_INVALID:
 		fprintf(out, "*invalid statement*");
@@ -403,44 +505,115 @@ void print_statement(const statement_t *statement)
 	}
 }
 
-static void print_storage_class(storage_class_t storage_class)
+static void print_storage_class(unsigned storage_class)
 {
-	switch(storage_class) {
+	switch((storage_class_tag_t) storage_class) {
 	case STORAGE_CLASS_ENUM_ENTRY:
 	case STORAGE_CLASS_NONE:
 		break;
-	case STORAGE_CLASS_TYPEDEF:  fputs("typedef ", out); break;
-	case STORAGE_CLASS_EXTERN:   fputs("extern ", out); break;
-	case STORAGE_CLASS_STATIC:   fputs("static ", out); break;
-	case STORAGE_CLASS_AUTO:     fputs("auto ", out); break;
-	case STORAGE_CLASS_REGISTER: fputs("register ", out); break;
+	case STORAGE_CLASS_TYPEDEF:       fputs("typedef ",        out); break;
+	case STORAGE_CLASS_EXTERN:        fputs("extern ",         out); break;
+	case STORAGE_CLASS_STATIC:        fputs("static ",         out); break;
+	case STORAGE_CLASS_AUTO:          fputs("auto ",           out); break;
+	case STORAGE_CLASS_REGISTER:      fputs("register ",       out); break;
+	case STORAGE_CLASS_THREAD:        fputs("__thread",        out); break;
+	case STORAGE_CLASS_THREAD_EXTERN: fputs("extern __thread", out); break;
+	case STORAGE_CLASS_THREAD_STATIC: fputs("static __thread", out); break;
 	}
 }
 
-static void print_declaration(const declaration_t *declaration)
+void print_initializer(const initializer_t *initializer)
+{
+	if(initializer->type == INITIALIZER_VALUE) {
+		const initializer_value_t *value = &initializer->value;
+		print_expression(value->value);
+		return;
+	}
+
+	assert(initializer->type == INITIALIZER_LIST);
+	fputs("{ ", out);
+	const initializer_list_t *list = &initializer->list;
+
+	for(size_t i = 0 ; i < list->len; ++i) {
+		if(i > 0) {
+			fputs(", ", out);
+		}
+		print_initializer(list->initializers[i]);
+	}
+	fputs("}", out);
+}
+
+static void print_normal_declaration(const declaration_t *declaration)
 {
 	print_storage_class(declaration->storage_class);
 	print_type_ext(declaration->type, declaration->symbol,
 	               &declaration->context);
-	if(declaration->statement != NULL) {
-		fputs("\n", out);
-		print_statement(declaration->statement);
-	} else if(declaration->initializer != NULL) {
+	if(declaration->is_inline) {
+		fputs("inline ", out);
+	}
+
+	if(declaration->type->type == TYPE_FUNCTION) {
+		if(declaration->init.statement != NULL) {
+			fputs("\n", out);
+			print_statement(declaration->init.statement);
+			return;
+		}
+	} else if(declaration->init.initializer != NULL) {
 		fputs(" = ", out);
-		print_expression(declaration->initializer);
-		fprintf(out, ";\n");
-	} else {
-		fprintf(out, ";\n");
+		print_initializer(declaration->init.initializer);
+	}
+	fputc(';', out);
+}
+
+void print_declaration(const declaration_t *declaration)
+{
+	if(declaration->namespc != NAMESPACE_NORMAL &&
+			declaration->symbol == NULL)
+		return;
+
+	switch(declaration->namespc) {
+	case NAMESPACE_NORMAL:
+		print_normal_declaration(declaration);
+		break;
+	case NAMESPACE_STRUCT:
+		fputs("struct ", out);
+		fputs(declaration->symbol->string, out);
+		fputc(' ', out);
+		print_compound_definition(declaration);
+		fputc(';', out);
+		break;
+	case NAMESPACE_UNION:
+		fputs("union ", out);
+		fputs(declaration->symbol->string, out);
+		fputc(' ', out);
+		print_compound_definition(declaration);
+		fputc(';', out);
+		break;
+	case NAMESPACE_ENUM:
+		fputs("enum ", out);
+		fputs(declaration->symbol->string, out);
+		fputc(' ', out);
+		print_enum_definition(declaration);
+		fputc(';', out);
+		break;
 	}
 }
 
 void print_ast(const translation_unit_t *unit)
 {
+	inc_type_visited();
+
 	declaration_t *declaration = unit->context.declarations;
-	while(declaration != NULL) {
-		print_declaration(declaration);
+	for( ; declaration != NULL; declaration = declaration->next) {
+		if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY)
+			continue;
+		if(declaration->namespc != NAMESPACE_NORMAL &&
+				declaration->symbol == NULL)
+			continue;
 
-		declaration = declaration->next;
+		print_indent();
+		print_declaration(declaration);
+		fputc('\n', out);
 	}
 }