X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ast.c;h=7284a5b5788487571ae9c13782aa8df38154d6f5;hb=0a499089dd2383e73ae8364c8eae82c068ba980b;hp=f2c255113deec80fc7efc53c8f9b057c91a0f83a;hpb=07e24ca995bb93c030591edcbdf858993056790f;p=cparser

diff --git a/ast.c b/ast.c
index f2c2551..7284a5b 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>
@@ -113,8 +115,7 @@ static unsigned get_expression_precedence(expression_kind_t kind)
 		[EXPR_CLASSIFY_TYPE]             = PREC_UNARY,
 		[EXPR_ALIGNOF]                   = PREC_UNARY,
 
-		[EXPR_FUNCTION]                  = PREC_PRIM,
-		[EXPR_PRETTY_FUNCTION]           = PREC_PRIM,
+		[EXPR_FUNCNAME]                  = PREC_PRIM,
 		[EXPR_BUILTIN_SYMBOL]            = PREC_PRIM,
 		[EXPR_BUILTIN_CONSTANT_P]        = PREC_PRIM,
 		[EXPR_BUILTIN_PREFETCH]          = PREC_PRIM,
@@ -317,6 +318,24 @@ static void print_string_literal(
 	print_quoted_string(&string_literal->value, '"');
 }
 
+/**
+ * Prints a predefined symbol.
+ */
+static void print_funcname(
+		const funcname_expression_t *funcname)
+{
+	const char *s = "";
+	switch(funcname->kind) {
+	case FUNCNAME_FUNCTION:        s = (c_mode & _C99) ? "__func__" : "__FUNCTION__"; break;
+	case FUNCNAME_PRETTY_FUNCTION: s = "__PRETTY_FUNCTION__"; break;
+	case FUNCNAME_FUNCSIG:         s = "__FUNCSIG__"; break;
+	case FUNCNAME_FUNCDNAME:       s = "__FUNCDNAME__"; break;
+	}
+	fputc('"', out);
+	fputs(s, out);
+	fputc('"', out);
+}
+
 static void print_wide_string_literal(
 	const wide_string_literal_expression_t *const wstr)
 {
@@ -716,8 +735,9 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p
 	case EXPR_CONST:
 		print_const(&expression->conste);
 		break;
-	case EXPR_FUNCTION:
-	case EXPR_PRETTY_FUNCTION:
+	case EXPR_FUNCNAME:
+		print_funcname(&expression->funcname);
+		break;
 	case EXPR_STRING_LITERAL:
 		print_string_literal(&expression->string);
 		break;
@@ -1076,6 +1096,37 @@ end_of_print_asm_statement:
 	fputs(");\n", out);
 }
 
+/**
+ * Print a microsoft __try statement.
+ *
+ * @param statement   the statement
+ */
+static void print_ms_try_statement(const ms_try_statement_t *statement)
+{
+	fputs("__try ", out);
+	print_statement(statement->try_statement);
+	print_indent();
+	if(statement->except_expression != NULL) {
+		fputs("__except(", out);
+		print_expression(statement->except_expression);
+		fputs(") ", out);
+	} else {
+		fputs("__finally ", out);
+	}
+	print_statement(statement->final_statement);
+}
+
+/**
+ * Print a microsoft __leave statement.
+ *
+ * @param statement   the statement
+ */
+static void print_leave_statement(const leave_statement_t *statement)
+{
+	(void) statement;
+	fputs("__leave;\n", out);
+}
+
 /**
  * Print a statement.
  *
@@ -1132,6 +1183,12 @@ void print_statement(const statement_t *statement)
 	case STATEMENT_ASM:
 		print_asm_statement(&statement->asms);
 		break;
+	case STATEMENT_MS_TRY:
+		print_ms_try_statement(&statement->ms_try);
+		break;
+	case STATEMENT_LEAVE:
+		print_leave_statement(&statement->leave);
+		break;
 	case STATEMENT_INVALID:
 		fprintf(out, "$invalid statement$");
 		break;
@@ -1213,10 +1270,14 @@ void print_initializer(const initializer_t *initializer)
  * Print microsoft extended declaration modifiers.
  */
 static void print_ms_modifiers(const declaration_t *declaration) {
-	decl_modifiers_t modifiers = declaration->modifiers;
+	if((c_mode & _MS) == 0)
+		return;
+
+	decl_modifiers_t modifiers = declaration->decl_modifiers;
 
 	/* DM_FORCEINLINE handled outside. */
-	if((modifiers & ~DM_FORCEINLINE) != 0 || declaration->alignment != 0 ||
+	if((modifiers & ~DM_FORCEINLINE) != 0 ||
+	    declaration->alignment != 0 || declaration->deprecated != 0 ||
 	    declaration->get_property_sym != NULL || declaration->put_property_sym != NULL) {
 		char *next = "(";
 
@@ -1248,7 +1309,7 @@ static void print_ms_modifiers(const declaration_t *declaration) {
 		if(modifiers & DM_NOINLINE) {
 			fputs(next, out); next = ", "; fputs("noinline", out);
 		}
-		if(modifiers & DM_DEPRECATED) {
+		if(declaration->deprecated != 0) {
 			fputs(next, out); next = ", "; fputs("deprecated", out);
 			if(declaration->deprecated_string != NULL)
 				fprintf(out, "(\"%s\")", declaration->deprecated_string);
@@ -1286,10 +1347,10 @@ 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->decl_modifiers & DM_FORCEINLINE)
 			fputs("__forceinline ", out);
 		else {
-			if(declaration->modifiers & DM_MICROSOFT_INLINE)
+			if(declaration->decl_modifiers & DM_MICROSOFT_INLINE)
 				fputs("__inline ", out);
 			else
 				fputs("inline ", out);
@@ -1447,6 +1508,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)
@@ -1493,8 +1562,7 @@ bool is_constant_expression(const expression_t *expression)
 	case EXPR_WIDE_STRING_LITERAL:
 	case EXPR_SIZEOF:
 	case EXPR_CLASSIFY_TYPE:
-	case EXPR_FUNCTION:
-	case EXPR_PRETTY_FUNCTION:
+	case EXPR_FUNCNAME:
 	case EXPR_OFFSETOF:
 	case EXPR_ALIGNOF:
 	case EXPR_BUILTIN_CONSTANT_P:
@@ -1513,8 +1581,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: