X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast.c;h=0ba0492d4e6b9dfb657938b39c59dcdb95e6514d;hb=6dc5b6251ac0d183a62021b991d17d2debd603eb;hp=1599986f799203388ece5edc1fc3970308129acd;hpb=3f09e64eade51d0c8a4e21d2da68d0d48f2f7f53;p=cparser

diff --git a/ast.c b/ast.c
index 1599986..0ba0492 100644
--- a/ast.c
+++ b/ast.c
@@ -6,28 +6,77 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <ctype.h>
 
 #include "adt/error.h"
 
 struct obstack ast_obstack;
 
-static
-void print_const(FILE *out, const const_t *cnst)
+static FILE *out;
+static int   indent;
+
+static void print_statement(const statement_t *statement);
+
+void change_indent(int delta)
 {
-	fprintf(out, "%d", cnst->value);
+	indent += delta;
+	assert(indent >= 0);
 }
 
-static
-void print_string_literal(FILE *out, const string_literal_t *string_literal)
+void print_indent(void)
 {
-	/* TODO escape " and non-printable chars */
-	fprintf(out, "\"%s\"", string_literal->value);
+	for(int i = 0; i < indent; ++i)
+		fprintf(out, "\t");
 }
 
-static
-void print_call_expression(FILE *out, const call_expression_t *call)
+static void print_const(const const_expression_t *cnst)
 {
-	print_expression(out, call->method);
+	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_quoted_string(const char *string)
+{
+	fputc('"', out);
+	for(const char *c = string; *c != '\0'; ++c) {
+		switch(*c) {
+		case '\"':  fputs("\\\"", out); break;
+		case '\\':  fputs("\\\\", out); break;
+		case '\a':  fputs("\\a", out); break;
+		case '\b':  fputs("\\b", out); break;
+		case '\f':  fputs("\\f", out); break;
+		case '\n':  fputs("\\n", out); break;
+		case '\r':  fputs("\\r", out); break;
+		case '\t':  fputs("\\t", out); break;
+		case '\v':  fputs("\\v", out); break;
+		case '\?':  fputs("\\?", out); break;
+		default:
+			if(!isprint(*c)) {
+				fprintf(out, "\\x%x", *c);
+				break;
+			}
+			fputc(*c, out);
+			break;
+		}
+	}
+	fputc('"', out);
+}
+
+static void print_string_literal(
+		const string_literal_expression_t *string_literal)
+{
+	print_quoted_string(string_literal->value);
+}
+
+static void print_call_expression(const call_expression_t *call)
+{
+	print_expression(call->function);
 	fprintf(out, "(");
 	call_argument_t *argument = call->arguments;
 	int              first    = 1;
@@ -37,248 +86,602 @@ void print_call_expression(FILE *out, const call_expression_t *call)
 		} else {
 			first = 0;
 		}
-		print_expression(out, argument->expression);
+		print_expression(argument->expression);
 
 		argument = argument->next;
 	}
 	fprintf(out, ")");
 }
 
-static
-void print_binary_expression(FILE *out, const binary_expression_t *binexpr)
+static void print_binary_expression(const binary_expression_t *binexpr)
 {
 	fprintf(out, "(");
-	print_expression(out, binexpr->left);
+	print_expression(binexpr->left);
 	fprintf(out, " ");
 	switch(binexpr->type) {
-	case BINEXPR_INVALID:
-		fprintf(out, "INVOP");
-		break;
-	case BINEXPR_ASSIGN:
-		fprintf(out, "<-");
-		break;
-	case BINEXPR_ADD:
-		fprintf(out, "+");
-		break;
-	case BINEXPR_SUB:
-		fprintf(out, "-");
-		break;
-	case BINEXPR_NOTEQUAL:
-		fprintf(out, "/=");
-		break;
-	case BINEXPR_EQUAL:
-		fprintf(out, "=");
-		break;
-	case BINEXPR_LESS:
-		fprintf(out, "<");
-		break;
-	case BINEXPR_LESSEQUAL:
-		fprintf(out, "<=");
-		break;
-	case BINEXPR_GREATER:
-		fprintf(out, ">");
-		break;
-	case BINEXPR_GREATEREQUAL:
-		fprintf(out, ">=");
-		break;
-	default:
-		/* TODO: add missing ops */
-		fprintf(out, "op%d", binexpr->type);
-		break;
+	case BINEXPR_INVALID:	         fputs("INVOP", out); break;
+	case BINEXPR_COMMA:              fputs(",", out);     break;
+	case BINEXPR_ASSIGN:             fputs("=", out);     break;
+	case BINEXPR_ADD:                fputs("+", out);     break;
+	case BINEXPR_SUB:                fputs("-", out);     break;
+	case BINEXPR_MUL:                fputs("*", out);     break;
+	case BINEXPR_MOD:                fputs("%", out);     break;
+	case BINEXPR_DIV:                fputs("/", out);     break;
+	case BINEXPR_BITWISE_OR:         fputs("|", out);     break;
+	case BINEXPR_BITWISE_AND:        fputs("&", out);     break;
+	case BINEXPR_BITWISE_XOR:        fputs("^", out);     break;
+	case BINEXPR_LOGICAL_OR:         fputs("||", out);    break;
+	case BINEXPR_LOGICAL_AND:        fputs("&&", out);    break;
+	case BINEXPR_NOTEQUAL:           fputs("!=", out);    break;
+	case BINEXPR_EQUAL:              fputs("==", out);    break;
+	case BINEXPR_LESS:               fputs("<", out);     break;
+	case BINEXPR_LESSEQUAL:          fputs("<=", out);    break;
+	case BINEXPR_GREATER:            fputs(">", out);     break;
+	case BINEXPR_GREATEREQUAL:       fputs(">=", out);    break;
+	case BINEXPR_SHIFTLEFT:          fputs("<<", out);    break;
+	case BINEXPR_SHIFTRIGHT:         fputs(">>", out);    break;
+
+	case BINEXPR_ADD_ASSIGN:         fputs("+=", out);    break;
+	case BINEXPR_SUB_ASSIGN:         fputs("-=", out);    break;
+	case BINEXPR_MUL_ASSIGN:         fputs("*=", out);    break;
+	case BINEXPR_MOD_ASSIGN:         fputs("%=", out);    break;
+	case BINEXPR_DIV_ASSIGN:         fputs("/=", out);    break;
+	case BINEXPR_BITWISE_OR_ASSIGN:  fputs("|=", out);    break;
+	case BINEXPR_BITWISE_AND_ASSIGN: fputs("&=", out);    break;
+	case BINEXPR_BITWISE_XOR_ASSIGN: fputs("^=", out);    break;
+	case BINEXPR_SHIFTLEFT_ASSIGN:   fputs("<<=", out);   break;
+	case BINEXPR_SHIFTRIGHT_ASSIGN:  fputs(">>=", out);   break;
 	}
 	fprintf(out, " ");
-	print_expression(out, binexpr->right);
+	print_expression(binexpr->right);
 	fprintf(out, ")");
 }
 
-void print_expression(FILE *out, const expression_t *expression)
+static void print_unary_expression(const unary_expression_t *unexpr)
+{
+	switch(unexpr->type) {
+	case UNEXPR_NEGATE:           fputs("-", out);  break;
+	case UNEXPR_PLUS:             fputs("+", out);  break;
+	case UNEXPR_NOT:              fputs("!", out);  break;
+	case UNEXPR_BITWISE_NEGATE:   fputs("~", out);  break;
+	case UNEXPR_PREFIX_INCREMENT: fputs("++", out); break;
+	case UNEXPR_PREFIX_DECREMENT: fputs("--", out); break;
+	case UNEXPR_DEREFERENCE:      fputs("*", out);  break;
+	case UNEXPR_TAKE_ADDRESS:     fputs("&", out);  break;
+
+	case UNEXPR_POSTFIX_INCREMENT:
+		fputs("(", out);
+		print_expression(unexpr->value);
+		fputs(")", out);
+		fputs("++", out);
+		return;
+	case UNEXPR_POSTFIX_DECREMENT:
+		fputs("(", out);
+		print_expression(unexpr->value);
+		fputs(")", out);
+		fputs("--", out);
+		return;
+	case UNEXPR_CAST:
+		fputs("(", out);
+		print_type(unexpr->expression.datatype);
+		fputs(")", out);
+		break;
+	case UNEXPR_CAST_IMPLICIT:
+		print_expression(unexpr->value);
+		return;
+	case UNEXPR_INVALID:
+		fprintf(out, "unop%d", (int) unexpr->type);
+		break;
+	}
+	fputs("(", out);
+	print_expression(unexpr->value);
+	fputs(")", out);
+}
+
+static void print_reference_expression(const reference_expression_t *ref)
+{
+	fprintf(out, "%s", ref->declaration->symbol->string);
+}
+
+static void print_array_expression(const array_access_expression_t *expression)
+{
+	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)
+{
+	fputs("sizeof", out);
+	if(expression->size_expression != NULL) {
+		fputc('(', out);
+		print_expression(expression->size_expression);
+		fputc(')', out);
+	} else {
+		fputc('(', out);
+		print_type(expression->type);
+		fputc(')', out);
+	}
+}
+
+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(out, (const const_t*) expression);
+		print_const(&expression->conste);
 		break;
+	case EXPR_FUNCTION:
+	case EXPR_PRETTY_FUNCTION:
 	case EXPR_STRING_LITERAL:
-		print_string_literal(out, (const string_literal_t*) expression);
+		print_string_literal(&expression->string);
 		break;
 	case EXPR_CALL:
-		print_call_expression(out, (const call_expression_t*) expression);
+		print_call_expression(&expression->call);
 		break;
 	case EXPR_BINARY:
-		print_binary_expression(out, (const binary_expression_t*) expression);
+		print_binary_expression(&expression->binary);
 		break;
 	case EXPR_REFERENCE:
-	case EXPR_UNARY:
-	case EXPR_SELECT:
+		print_reference_expression(&expression->reference);
+		break;
 	case EXPR_ARRAY_ACCESS:
+		print_array_expression(&expression->array_access);
+		break;
+	case EXPR_UNARY:
+		print_unary_expression(&expression->unary);
+		break;
 	case EXPR_SIZEOF:
+		print_sizeof_expression(&expression->sizeofe);
+		break;
+	case EXPR_BUILTIN_SYMBOL:
+		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:
 		/* TODO */
-		fprintf(out, "some expression of type %d", expression->type);
+		fprintf(out, "some expression of type %d", (int) expression->type);
 		break;
 	}
 }
 
-static
-void print_compound_statement(FILE *out, int indent,
-                              const compound_statement_t *block)
+static void print_compound_statement(const compound_statement_t *block)
 {
-	statement_t *statement = block->first_statement;
+	fputs("{\n", out);
+	indent++;
+
+	statement_t *statement = block->statements;
 	while(statement != NULL) {
-		print_statement(out, indent + 1, statement);
+		print_indent();
+		print_statement(statement);
 
-		statement = statement->next;
+		statement = statement->base.next;
 	}
+	indent--;
+	print_indent();
+	fputs("}\n", out);
 }
 
-static
-void print_return_statement(FILE *out, const return_statement_t *statement)
+static void print_return_statement(const return_statement_t *statement)
 {
 	fprintf(out, "return ");
 	if(statement->return_value != NULL)
-		print_expression(out, statement->return_value);
+		print_expression(statement->return_value);
+	fputs(";\n", out);
 }
 
-static
-void print_expression_statement(FILE *out,
-                                const expression_statement_t *statement)
+static void print_expression_statement(const expression_statement_t *statement)
 {
-	print_expression(out, statement->expression);
+	print_expression(statement->expression);
+	fputs(";\n", out);
 }
 
-static
-void print_goto_statement(FILE *out, const goto_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(FILE *out, const label_statement_t *statement)
+static void print_label_statement(const label_statement_t *statement)
 {
-	fprintf(out, ":%s", 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(FILE *out, int indent, const if_statement_t *statement)
+static void print_if_statement(const if_statement_t *statement)
 {
-	fprintf(out, "if ");
-	print_expression(out, statement->condition);
-	fprintf(out, ":\n");
+	fputs("if(", out);
+	print_expression(statement->condition);
+	fputs(") ", out);
 	if(statement->true_statement != NULL) {
-		print_statement(out, indent, statement->true_statement);
+		print_statement(statement->true_statement);
 	}
 
 	if(statement->false_statement != NULL) {
-		fprintf(out, "else:\n");
-		print_statement(out, indent, statement->false_statement);
+		print_indent();
+		fputs("else ", out);
+		print_statement(statement->false_statement);
 	}
 }
 
-static
-void print_declaration_statement(FILE *out,
-                                 const declaration_statement_t *statement)
+static void print_switch_statement(const switch_statement_t *statement)
 {
-	(void) statement;
-	fprintf(out, "*declaration statement*");
+	fputs("switch(", out);
+	print_expression(statement->expression);
+	fputs(") ", out);
+	print_statement(statement->body);
 }
 
-void print_statement(FILE *out, int indent, const statement_t *statement)
+static void print_case_label(const case_label_statement_t *statement)
 {
-	for(int i = 0; i < indent; ++i)
-		fprintf(out, "\t");
+	if(statement->expression == NULL) {
+		fputs("default:\n", out);
+	} else {
+		fputs("case ", out);
+		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);
+	}
+}
+
+static void print_while_statement(const while_statement_t *statement)
+{
+	fputs("while(", out);
+	print_expression(statement->condition);
+	fputs(") ", out);
+	print_statement(statement->body);
+}
+
+static void print_do_while_statement(const do_while_statement_t *statement)
+{
+	fputs("do ", out);
+	print_statement(statement->body);
+	print_indent();
+	fputs("while(", out);
+	print_expression(statement->condition);
+	fputs(");\n", out);
+}
+
+static void print_for_statement(const for_statement_t *statement)
+{
+	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);
+}
+
+static void print_asm_constraints(asm_constraint_t *constraints)
+{
+	asm_constraint_t *constraint = constraints;
+	for( ; constraint != NULL; constraint = constraint->next) {
+		if(constraint != constraints)
+			fputs(", ", out);
+
+		if(constraint->symbol) {
+			fprintf(out, "[%s] ", constraint->symbol->string);
+		}
+		print_quoted_string(constraint->constraints);
+		fputs(" (", out);
+		print_expression(constraint->expression);
+		fputs(")", out);
+	}
+}
+
+static void print_asm_clobbers(asm_clobber_t *clobbers)
+{
+	asm_clobber_t *clobber = clobbers;
+	for( ; clobber != NULL; clobber = clobber->next) {
+		if(clobber != clobbers)
+			fputs(", ", out);
+
+		print_quoted_string(clobber->clobber);
+	}
+}
+
+static void print_asm_statement(const asm_statement_t *statement)
+{
+	fputs("asm ", out);
+	if(statement->is_volatile) {
+		fputs("volatile ", out);
+	}
+	fputs("(", out);
+	print_quoted_string(statement->asm_text);
+	if(statement->inputs == NULL && statement->outputs == NULL
+			&& statement->clobbers == NULL)
+		goto end_of_print_asm_statement;
+
+	fputs(" : ", out);
+	print_asm_constraints(statement->inputs);
+	if(statement->outputs == NULL && statement->clobbers == NULL)
+		goto end_of_print_asm_statement;
+
+	fputs(" : ", out);
+	print_asm_constraints(statement->outputs);
+	if(statement->clobbers == NULL)
+		goto end_of_print_asm_statement;
+
+	fputs(" : ", out);
+	print_asm_clobbers(statement->clobbers);
+
+end_of_print_asm_statement:
+	fputs(");\n", out);
+}
+
+void print_statement(const statement_t *statement)
+{
 	switch(statement->type) {
 	case STATEMENT_COMPOUND:
-		print_compound_statement(out, indent,
-		                         (const compound_statement_t*) statement);
+		print_compound_statement(&statement->compound);
 		break;
 	case STATEMENT_RETURN:
-		print_return_statement(out, (const return_statement_t*) statement);
+		print_return_statement(&statement->returns);
 		break;
 	case STATEMENT_EXPRESSION:
-		print_expression_statement(out,
-		                           (const expression_statement_t*) statement);
+		print_expression_statement(&statement->expression);
 		break;
 	case STATEMENT_LABEL:
-		print_label_statement(out, (const label_statement_t*) statement);
+		print_label_statement(&statement->label);
 		break;
 	case STATEMENT_GOTO:
-		print_goto_statement(out, (const goto_statement_t*) statement);
+		print_goto_statement(&statement->gotos);
+		break;
+	case STATEMENT_CONTINUE:
+		fputs("continue;\n", out);
+		break;
+	case STATEMENT_BREAK:
+		fputs("break;\n", out);
 		break;
 	case STATEMENT_IF:
-		print_if_statement(out, indent, (const if_statement_t*) statement);
+		print_if_statement(&statement->ifs);
+		break;
+	case STATEMENT_SWITCH:
+		print_switch_statement(&statement->switchs);
+		break;
+	case STATEMENT_CASE_LABEL:
+		print_case_label(&statement->case_label);
 		break;
 	case STATEMENT_DECLARATION:
-		print_declaration_statement(out,
-		                            (const declaration_statement_t*) statement);
+		print_declaration_statement(&statement->declaration);
+		break;
+	case STATEMENT_WHILE:
+		print_while_statement(&statement->whiles);
+		break;
+	case STATEMENT_DO_WHILE:
+		print_do_while_statement(&statement->do_while);
+		break;
+	case STATEMENT_FOR:
+		print_for_statement(&statement->fors);
+		break;
+	case STATEMENT_ASM:
+		print_asm_statement(&statement->asms);
 		break;
 	case STATEMENT_INVALID:
-	default:
 		fprintf(out, "*invalid statement*");
 		break;
-
 	}
-	fprintf(out, "\n");
 }
 
-#if 0
-static
-void print_method_parameters(FILE *out, const method_parameter_t *parameters,
-                             const method_type_t *method_type)
+static void print_storage_class(unsigned storage_class)
 {
-	fprintf(out, "(");
+	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_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;
+	}
+}
 
-	int                            first          = 1;
-	const method_parameter_t      *parameter      = parameters;
-	const method_parameter_type_t *parameter_type
-		= method_type->parameter_types;
-	while(parameter != NULL && parameter_type != NULL) {
-		if(!first) {
-			fprintf(out, ", ");
-		} else {
-			first = 0;
-		}
+void print_initializer(const initializer_t *initializer)
+{
+	if(initializer->type == INITIALIZER_VALUE) {
+		const initializer_value_t *value = &initializer->value;
+		print_expression(value->value);
+		return;
+	}
 
-		print_type(out, parameter_type->type);
-		fprintf(out, " %s", parameter->symbol->string);
+	assert(initializer->type == INITIALIZER_LIST);
+	fputs("{ ", out);
+	const initializer_list_t *list = &initializer->list;
 
-		parameter      = parameter->next;
-		parameter_type = parameter_type->next;
+	for(size_t i = 0 ; i < list->len; ++i) {
+		if(i > 0) {
+			fputs(", ", out);
+		}
+		print_initializer(list->initializers[i]);
 	}
-	assert(parameter == NULL && parameter_type == NULL);
-
-	fprintf(out, ")");
+	fputs("}", out);
 }
-#endif
 
-static
-void print_declaration(FILE *out, const declaration_t *declaration)
+static void print_normal_declaration(const declaration_t *declaration)
 {
-	/* TODO */
-	print_type(out, declaration->type);
-	fprintf(out, " %s", declaration->symbol->string);
+	print_storage_class(declaration->storage_class);
+	if(declaration->is_inline) {
+		fputs("inline ", out);
+	}
+	print_type_ext(declaration->type, declaration->symbol,
+	               &declaration->context);
+
+	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_initializer(declaration->init.initializer);
+	}
+	fputc(';', out);
 }
 
-static
-void print_namespace_entry(FILE *out, const unit_entry_t *entry)
+void print_declaration(const declaration_t *declaration)
 {
-	print_declaration(out, &entry->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(FILE *out, const translation_unit_t *unit)
+void print_ast(const translation_unit_t *unit)
 {
-	unit_entry_t *entry = unit->entries;
-
-	while(entry != NULL) {
-		print_namespace_entry(out, entry);
-
-		entry = entry->next;
+	inc_type_visited();
+
+	declaration_t *declaration = unit->context.declarations;
+	for( ; declaration != NULL; declaration = declaration->next) {
+		if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY)
+			continue;
+		if(declaration->namespc != NAMESPACE_NORMAL &&
+				declaration->symbol == NULL)
+			continue;
+
+		print_indent();
+		print_declaration(declaration);
+		fputc('\n', out);
 	}
 }
 
@@ -292,6 +695,12 @@ void exit_ast(void)
 	obstack_free(&ast_obstack, NULL);
 }
 
+void ast_set_output(FILE *stream)
+{
+	out = stream;
+	type_set_output(stream);
+}
+
 void* (allocate_ast) (size_t size)
 {
 	return _allocate_ast(size);