X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast.c;h=d61ff3868c601fd80e87c0f9779fa821409ca5fc;hb=ae40d62f736098a12e3e31ab2d5cfb24f2467742;hp=8c3c54bd2fb5a5cf600806187389d2a4f5ce610f;hpb=b3e2b201ea549e7e44110b0e0d366a4e34ed1914;p=cparser

diff --git a/ast.c b/ast.c
index 8c3c54b..d61ff38 100644
--- a/ast.c
+++ b/ast.c
@@ -234,9 +234,18 @@ static void print_select(const select_expression_t *expression)
 	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;
@@ -278,6 +287,9 @@ void print_expression(const expression_t *expression)
 	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:
@@ -321,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)
@@ -517,9 +530,13 @@ void print_initializer(const initializer_t *initializer)
 
 static void print_normal_declaration(const declaration_t *declaration)
 {
-	print_storage_class(declaration->storage_class);
+	print_storage_class((storage_class_t)declaration->storage_class);
 	print_type_ext(declaration->type, declaration->symbol,
 	               &declaration->context);
+	if(declaration->is_inline) {
+		fputs("inline ", out);
+	}
+
 	if(declaration->type->type == TYPE_FUNCTION) {
 		if(declaration->init.statement != NULL) {
 			fputs("\n", out);
@@ -535,11 +552,11 @@ static void print_normal_declaration(const declaration_t *declaration)
 
 void print_declaration(const declaration_t *declaration)
 {
-	if(declaration->namespace != NAMESPACE_NORMAL &&
+	if(declaration->namespc != NAMESPACE_NORMAL &&
 			declaration->symbol == NULL)
 		return;
 
-	switch(declaration->namespace) {
+	switch(declaration->namespc) {
 	case NAMESPACE_NORMAL:
 		print_normal_declaration(declaration);
 		break;
@@ -576,7 +593,7 @@ void print_ast(const translation_unit_t *unit)
 	for( ; declaration != NULL; declaration = declaration->next) {
 		if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY)
 			continue;
-		if(declaration->namespace != NAMESPACE_NORMAL &&
+		if(declaration->namespc != NAMESPACE_NORMAL &&
 				declaration->symbol == NULL)
 			continue;