X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast.c;h=341d5f2d17e6bcd968efc84675eecec3f694ffed;hb=23e9b60ddf7642b66def2665bb799dc12d464cee;hp=0d283f81281d686add6e807cb9b953f8f90349ac;hpb=35b6bfa9d3d3cbaa12c753901d53751a3ea7c0af;p=cparser

diff --git a/ast.c b/ast.c
index 0d283f8..341d5f2 100644
--- a/ast.c
+++ b/ast.c
@@ -16,9 +16,14 @@ 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");
@@ -30,7 +35,7 @@ static void print_const(const const_t *cnst)
 		return;
 
 	if(is_type_integer(cnst->expression.datatype)) {
-		fprintf(out, "%d", cnst->v.int_value);
+		fprintf(out, "%lld", cnst->v.int_value);
 	} else if(is_type_floating(cnst->expression.datatype)) {
 		fprintf(out, "%Lf", cnst->v.float_value);
 	}
@@ -65,7 +70,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;
@@ -156,7 +161,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);
@@ -217,9 +222,30 @@ static void print_va_arg(const va_arg_expression_t *expression)
 	fputs(")", out);
 }
 
+static void print_select(const select_expression_t *expression)
+{
+	print_expression(expression->compound);
+	if(expression->compound->datatype == NULL ||
+			expression->compound->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;
@@ -258,12 +284,17 @@ void print_expression(const expression_t *expression)
 	case EXPR_VA_ARG:
 		print_va_arg((const va_arg_expression_t*) expression);
 		break;
+	case EXPR_SELECT:
+		print_select((const select_expression_t*) expression);
+		break;
+	case EXPR_CLASSIFY_TYPE:
+		print_classify_type_expression((const classify_type_expression_t*)expression);
+		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;
 	}
 }
@@ -302,17 +333,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)
@@ -348,15 +380,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);
 	}
 }
 
@@ -387,10 +427,13 @@ static void print_for_statement(const for_statement_t *statement)
 		if(statement->context.declarations->next != NULL) {
 			panic("multiple declarations in for statement not supported yet");
 		}
-	} else if(statement->initialisation) {
-		print_expression(statement->initialisation);
+		fputc(' ', out);
+	} else {
+		if(statement->initialisation) {
+			print_expression(statement->initialisation);
+		}
+		fputs("; ", out);
 	}
-	fputs("; ", out);
 	if(statement->condition != NULL) {
 		print_expression(statement->condition);
 	}
@@ -467,30 +510,99 @@ static void print_storage_class(storage_class_t storage_class)
 	}
 }
 
-static void print_declaration(const declaration_t *declaration)
+void print_initializer(const initializer_t *initializer)
 {
-	print_storage_class(declaration->storage_class);
+	if(initializer->type == INITIALIZER_VALUE) {
+		//print_expression(initializer->v.value);
+		return;
+	}
+
+#if 0
+	assert(initializer->type == INITIALIZER_LIST);
+	fputs("{ ", out);
+	initializer_t *iter = initializer->v.list;
+	for( ; iter != NULL; iter = iter->next) {
+		print_initializer(iter);
+		if(iter->next != NULL) {
+			fputs(", ", out);
+		}
+	}
+	fputs("}", out);
+#endif
+}
+
+static void print_normal_declaration(const declaration_t *declaration)
+{
+	print_storage_class((storage_class_t)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();
+	set_print_compound_entries(true);
+
 	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);
 	}
 }