X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=inline;f=ast.c;h=c29b730bf19560b2633d4ef9c3e11ce8633e3db2;hb=afb476e0d11276b63ca7dfd429f8b2fdd53797b1;hp=a8b66e0d29a6274fe7fddaff5ca35b24260276ed;hpb=cbb685efb1bc71587b73d29bc688eff26c345c11;p=cparser

diff --git a/ast.c b/ast.c
index a8b66e0..c29b730 100644
--- a/ast.c
+++ b/ast.c
@@ -14,6 +14,7 @@ struct obstack ast_obstack;
 
 static FILE *out;
 static int   indent;
+static int   print_implicit_casts = 1;
 
 static void print_statement(const statement_t *statement);
 
@@ -41,10 +42,10 @@ static void print_const(const const_expression_t *cnst)
 	}
 }
 
-static void print_quoted_string(const char *string)
+static void print_quoted_string(const string_t *const string)
 {
 	fputc('"', out);
-	for(const char *c = string; *c != '\0'; ++c) {
+	for (const char *c = string->begin, *const end = c + string->size; c != end; ++c) {
 		switch(*c) {
 		case '\"':  fputs("\\\"", out); break;
 		case '\\':  fputs("\\\\", out); break;
@@ -58,7 +59,7 @@ static void print_quoted_string(const char *string)
 		case '\?':  fputs("\\?", out); break;
 		default:
 			if(!isprint(*c)) {
-				fprintf(out, "\\x%x", *c);
+				fprintf(out, "\\%03o", *c);
 				break;
 			}
 			fputc(*c, out);
@@ -71,7 +72,7 @@ static void print_quoted_string(const char *string)
 static void print_string_literal(
 		const string_literal_expression_t *string_literal)
 {
-	print_quoted_string(string_literal->value);
+	print_quoted_string(&string_literal->value);
 }
 
 static void print_wide_string_literal(
@@ -203,6 +204,10 @@ static void print_unary_expression(const unary_expression_t *unexpr)
 	case EXPR_UNARY_DEREFERENCE:      fputs("*", out);  break;
 	case EXPR_UNARY_TAKE_ADDRESS:     fputs("&", out);  break;
 
+	case EXPR_UNARY_BITFIELD_EXTRACT:
+		print_expression(unexpr->value);
+		return;
+
 	case EXPR_UNARY_POSTFIX_INCREMENT:
 		fputs("(", out);
 		print_expression(unexpr->value);
@@ -215,14 +220,17 @@ static void print_unary_expression(const unary_expression_t *unexpr)
 		fputs(")", out);
 		fputs("--", out);
 		return;
+	case EXPR_UNARY_CAST_IMPLICIT:
+		if(!print_implicit_casts) {
+			print_expression(unexpr->value);
+			return;
+		}
+		/* fallthrough */
 	case EXPR_UNARY_CAST:
 		fputs("(", out);
 		print_type(unexpr->expression.datatype);
 		fputs(")", out);
 		break;
-	case EXPR_UNARY_CAST_IMPLICIT:
-		print_expression(unexpr->value);
-		return;
 	case EXPR_UNARY_ASSUME:
 		fputs("__assume", out);
 		break;
@@ -618,7 +626,7 @@ static void print_asm_constraints(asm_constraint_t *constraints)
 		if(constraint->symbol) {
 			fprintf(out, "[%s] ", constraint->symbol->string);
 		}
-		print_quoted_string(constraint->constraints);
+		print_quoted_string(&constraint->constraints);
 		fputs(" (", out);
 		print_expression(constraint->expression);
 		fputs(")", out);
@@ -632,7 +640,7 @@ static void print_asm_clobbers(asm_clobber_t *clobbers)
 		if(clobber != clobbers)
 			fputs(", ", out);
 
-		print_quoted_string(clobber->clobber);
+		print_quoted_string(&clobber->clobber);
 	}
 }
 
@@ -643,7 +651,7 @@ static void print_asm_statement(const asm_statement_t *statement)
 		fputs("volatile ", out);
 	}
 	fputs("(", out);
-	print_quoted_string(statement->asm_text);
+	print_quoted_string(&statement->asm_text);
 	if(statement->inputs == NULL && statement->outputs == NULL
 			&& statement->clobbers == NULL)
 		goto end_of_print_asm_statement;
@@ -761,7 +769,7 @@ static void print_normal_declaration(const declaration_t *declaration)
 {
 	print_storage_class(declaration->storage_class);
 	if(declaration->is_inline) {
-		if (declaration->decl_modifiers & DM_FORCEINLINE)
+		if (declaration->modifiers & DM_FORCEINLINE)
 			fputs("__forceinline ", out);
 		else
 			fputs("inline ", out);
@@ -861,6 +869,7 @@ bool is_constant_expression(const expression_t *expression)
 	case EXPR_UNARY_POSTFIX_DECREMENT:
 	case EXPR_UNARY_PREFIX_INCREMENT:
 	case EXPR_UNARY_PREFIX_DECREMENT:
+	case EXPR_UNARY_BITFIELD_EXTRACT:
 	case EXPR_UNARY_ASSUME: /* has VOID type */
 	case EXPR_BINARY_ASSIGN:
 	case EXPR_BINARY_MUL_ASSIGN: