X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast.c;h=50eaec37816cb01663d20f0e49a3683bb3f88914;hb=b5e161a375492f2af666767725c86d9dfab4f5f8;hp=d2de04eb3d03fc0fe2303b427ce2d0548f8160e3;hpb=1c622ff40fc61cbef1202888d3184215d88de680;p=cparser

diff --git a/ast.c b/ast.c
index d2de04e..50eaec3 100644
--- a/ast.c
+++ b/ast.c
@@ -22,6 +22,8 @@
 #include "ast_t.h"
 #include "symbol_t.h"
 #include "type_t.h"
+#include "parser.h"
+#include "lang_features.h"
 
 #include <assert.h>
 #include <stdio.h>
@@ -705,7 +707,7 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p
 	switch(expression->kind) {
 	case EXPR_UNKNOWN:
 	case EXPR_INVALID:
-		fprintf(out, "*invalid expression*");
+		fprintf(out, "$invalid expression$");
 		break;
 	case EXPR_CHARACTER_CONSTANT:
 		print_character_constant(&expression->conste);
@@ -856,9 +858,7 @@ static void print_label_statement(const label_statement_t *statement)
 {
 	fprintf(stderr, "(%p)", (void*) statement->label);
 	fprintf(out, "%s:\n", statement->label->symbol->string);
-	if(statement->statement != NULL) {
-		print_statement(statement->statement);
-	}
+	print_statement(statement->statement);
 }
 
 /**
@@ -868,12 +868,10 @@ static void print_label_statement(const label_statement_t *statement)
  */
 static void print_if_statement(const if_statement_t *statement)
 {
-	fputs("if(", out);
+	fputs("if (", out);
 	print_expression(statement->condition);
 	fputs(") ", out);
-	if(statement->true_statement != NULL) {
-		print_statement(statement->true_statement);
-	}
+	print_statement(statement->true_statement);
 
 	if(statement->false_statement != NULL) {
 		print_indent();
@@ -889,7 +887,7 @@ static void print_if_statement(const if_statement_t *statement)
  */
 static void print_switch_statement(const switch_statement_t *statement)
 {
-	fputs("switch(", out);
+	fputs("switch (", out);
 	print_expression(statement->expression);
 	fputs(") ", out);
 	print_statement(statement->body);
@@ -935,6 +933,9 @@ static void print_declaration_statement(
 	declaration_t *declaration = statement->declarations_begin;
 	for( ; declaration != statement->declarations_end->next;
 	       declaration = declaration->next) {
+	    if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY)
+	    	continue;
+
 		if(!first) {
 			print_indent();
 		} else {
@@ -952,7 +953,7 @@ static void print_declaration_statement(
  */
 static void print_while_statement(const while_statement_t *statement)
 {
-	fputs("while(", out);
+	fputs("while (", out);
 	print_expression(statement->condition);
 	fputs(") ", out);
 	print_statement(statement->body);
@@ -968,7 +969,7 @@ static void print_do_while_statement(const do_while_statement_t *statement)
 	fputs("do ", out);
 	print_statement(statement->body);
 	print_indent();
-	fputs("while(", out);
+	fputs("while (", out);
 	print_expression(statement->condition);
 	fputs(");\n", out);
 }
@@ -980,7 +981,7 @@ static void print_do_while_statement(const do_while_statement_t *statement)
  */
 static void print_for_statement(const for_statement_t *statement)
 {
-	fputs("for(", out);
+	fputs("for (", out);
 	if(statement->scope.declarations != NULL) {
 		assert(statement->initialisation == NULL);
 		print_declaration(statement->scope.declarations);
@@ -1085,6 +1086,9 @@ end_of_print_asm_statement:
 void print_statement(const statement_t *statement)
 {
 	switch(statement->kind) {
+	case STATEMENT_EMPTY:
+		fputs(";\n", out);
+		break;
 	case STATEMENT_COMPOUND:
 		print_compound_statement(&statement->compound);
 		break;
@@ -1131,7 +1135,7 @@ void print_statement(const statement_t *statement)
 		print_asm_statement(&statement->asms);
 		break;
 	case STATEMENT_INVALID:
-		fprintf(out, "*invalid statement*");
+		fprintf(out, "$invalid statement$");
 		break;
 	}
 }
@@ -1166,7 +1170,7 @@ static void print_storage_class(storage_class_tag_t storage_class)
 void print_initializer(const initializer_t *initializer)
 {
 	if(initializer == NULL) {
-		fputs("{ NIL-INITIALIZER }", out);
+		fputs("{}", out);
 		return;
 	}
 
@@ -1184,8 +1188,9 @@ void print_initializer(const initializer_t *initializer)
 		for(size_t i = 0 ; i < list->len; ++i) {
 			const initializer_t *sub_init = list->initializers[i];
 			print_initializer(list->initializers[i]);
-			if(i < list->len-1 && sub_init->kind != INITIALIZER_DESIGNATOR) {
-				fputs(", ", out);
+			if(i < list->len-1) {
+				if(sub_init == NULL || sub_init->kind != INITIALIZER_DESIGNATOR)
+					fputs(", ", out);
 			}
 		}
 		fputs(" }", out);
@@ -1206,6 +1211,78 @@ void print_initializer(const initializer_t *initializer)
 	panic("invalid initializer kind found");
 }
 
+/**
+ * Print microsoft extended declaration modifiers.
+ */
+static void print_ms_modifiers(const declaration_t *declaration) {
+	if((c_mode & _MS) == 0)
+		return;
+
+	decl_modifiers_t modifiers = declaration->modifiers;
+
+	/* DM_FORCEINLINE handled outside. */
+	if((modifiers & ~DM_FORCEINLINE) != 0 ||
+	    declaration->alignment != 0 || declaration->deprecated != 0 ||
+	    declaration->get_property_sym != NULL || declaration->put_property_sym != NULL) {
+		char *next = "(";
+
+		fputs("__declspec", out);
+		if(modifiers & DM_DLLIMPORT) {
+			fputs(next, out); next = ", "; fputs("dllimport", out);
+		}
+		if(modifiers & DM_DLLEXPORT) {
+			fputs(next, out); next = ", "; fputs("dllexport", out);
+		}
+		if(modifiers & DM_THREAD) {
+			fputs(next, out); next = ", "; fputs("thread", out);
+		}
+		if(modifiers & DM_NAKED) {
+			fputs(next, out); next = ", "; fputs("naked", out);
+		}
+		if(modifiers & DM_THREAD) {
+			fputs(next, out); next = ", "; fputs("thread", out);
+		}
+		if(modifiers & DM_SELECTANY) {
+			fputs(next, out); next = ", "; fputs("selectany", out);
+		}
+		if(modifiers & DM_NOTHROW) {
+			fputs(next, out); next = ", "; fputs("nothrow", out);
+		}
+		if(modifiers & DM_NORETURN) {
+			fputs(next, out); next = ", "; fputs("noreturn", out);
+		}
+		if(modifiers & DM_NOINLINE) {
+			fputs(next, out); next = ", "; fputs("noinline", out);
+		}
+		if(declaration->deprecated != 0) {
+			fputs(next, out); next = ", "; fputs("deprecated", out);
+			if(declaration->deprecated_string != NULL)
+				fprintf(out, "(\"%s\")", declaration->deprecated_string);
+		}
+		if(declaration->alignment != 0) {
+			fputs(next, out); next = ", "; fprintf(out, "align(%u)", declaration->alignment);
+		}
+		if(modifiers & DM_RESTRICT) {
+			fputs(next, out); next = ", "; fputs("restrict", out);
+		}
+		if(modifiers & DM_NOALIAS) {
+			fputs(next, out); next = ", "; fputs("noalias", out);
+		}
+	    if(declaration->get_property_sym != NULL || declaration->put_property_sym != NULL) {
+	    	char *comma = "";
+			fputs(next, out); next = ", "; fprintf(out, "property(");
+	    	if(declaration->get_property_sym != NULL) {
+	    		fprintf(out, "get=%s", declaration->get_property_sym->string);
+	    		comma = ", ";
+			}
+	    	if(declaration->put_property_sym != NULL)
+	    		fprintf(out, "%sput=%s", comma, declaration->put_property_sym->string);
+			fputc(')', out);
+		}
+		fputs(") ", out);
+	}
+}
+
 /**
  * Print a declaration in the NORMAL namespace.
  *
@@ -1215,11 +1292,16 @@ static void print_normal_declaration(const declaration_t *declaration)
 {
 	print_storage_class((storage_class_tag_t) declaration->declared_storage_class);
 	if(declaration->is_inline) {
-		if (declaration->modifiers & DM_FORCEINLINE)
+		if(declaration->modifiers & DM_FORCEINLINE)
 			fputs("__forceinline ", out);
-		else
-			fputs("inline ", out);
+		else {
+			if(declaration->modifiers & DM_MICROSOFT_INLINE)
+				fputs("__inline ", out);
+			else
+				fputs("inline ", out);
+		}
 	}
+	print_ms_modifiers(declaration);
 	print_type_ext(declaration->type, declaration->symbol,
 	               &declaration->scope);
 
@@ -1318,7 +1400,7 @@ bool is_constant_initializer(const initializer_t *initializer)
 	case INITIALIZER_VALUE:
 		return is_constant_expression(initializer->value.value);
 
-	case INITIALIZER_LIST: {
+	case INITIALIZER_LIST:
 		for(size_t i = 0; i < initializer->list.len; ++i) {
 			initializer_t *sub_initializer = initializer->list.initializers[i];
 			if(!is_constant_initializer(sub_initializer))
@@ -1326,7 +1408,6 @@ bool is_constant_initializer(const initializer_t *initializer)
 		}
 		return true;
 	}
-	}
 	panic("invalid initializer kind found");
 }
 
@@ -1372,6 +1453,14 @@ bool is_address_constant(const expression_t *expression)
 	case EXPR_UNARY_TAKE_ADDRESS:
 		return is_object_with_constant_address(expression->unary.value);
 
+	case EXPR_UNARY_DEREFERENCE: {
+		type_t *real_type = revert_automatic_type_conversion(expression->unary.value);
+		/* dereferencing a function is a NOP */
+		if(is_type_function(real_type)) {
+			return is_address_constant(expression->unary.value);
+		}
+	}
+
 	case EXPR_UNARY_CAST:
 		return is_type_pointer(skip_typeref(expression->base.type))
 			&& (is_constant_expression(expression->unary.value)
@@ -1419,6 +1508,8 @@ bool is_constant_expression(const expression_t *expression)
 	case EXPR_SIZEOF:
 	case EXPR_CLASSIFY_TYPE:
 	case EXPR_FUNCTION:
+	case EXPR_FUNCSIG:
+	case EXPR_FUNCDNAME:
 	case EXPR_PRETTY_FUNCTION:
 	case EXPR_OFFSETOF:
 	case EXPR_ALIGNOF:
@@ -1438,8 +1529,8 @@ bool is_constant_expression(const expression_t *expression)
 	case EXPR_UNARY_PREFIX_DECREMENT:
 	case EXPR_UNARY_BITFIELD_EXTRACT:
 	case EXPR_UNARY_ASSUME: /* has VOID type */
-	case EXPR_UNARY_DEREFERENCE:
 	case EXPR_UNARY_TAKE_ADDRESS:
+	case EXPR_UNARY_DEREFERENCE:
 	case EXPR_BINARY_ASSIGN:
 	case EXPR_BINARY_MUL_ASSIGN:
 	case EXPR_BINARY_DIV_ASSIGN: