- implemented -Wsign-compare

[cparser] / ast.c

diff --git a/ast.c b/ast.c
index 073ab7d..a35a73a 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -37,15 +37,15 @@ static void print_const(const const_expression_t *cnst)
 
        if(is_type_integer(cnst->expression.datatype)) {
                fprintf(out, "%lld", cnst->v.int_value);
-       } else if(is_type_floating(cnst->expression.datatype)) {
+       } else if(is_type_float(cnst->expression.datatype)) {
                fprintf(out, "%Lf", cnst->v.float_value);
        }
 }
 
-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;
@@ -59,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);
@@ -72,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(
@@ -264,12 +264,17 @@ static void print_array_expression(const array_access_expression_t *expression)
        }
 }
 
-static void print_sizeof_expression(const sizeof_expression_t *expression)
+static void print_typeprop_expression(const typeprop_expression_t *expression)
 {
-       fputs("sizeof", out);
-       if(expression->size_expression != NULL) {
+       if (expression->expression.kind == EXPR_SIZEOF) {
+               fputs("sizeof", out);
+       } else {
+               assert(expression->expression.kind == EXPR_ALIGNOF);
+               fputs("__alignof__", out);
+       }
+       if(expression->tp_expression != NULL) {
                fputc('(', out);
-               print_expression(expression->size_expression);
+               print_expression(expression->tp_expression);
                fputc(')', out);
        } else {
                fputc('(', out);
@@ -278,13 +283,6 @@ static void print_sizeof_expression(const sizeof_expression_t *expression)
        }
 }
 
-static void print_alignof_expression(const alignof_expression_t *expression)
-{
-       fputs("__alignof__(", out);
-       print_type(expression->type);
-       fputc(')', out);
-}
-
 static void print_builtin_symbol(const builtin_symbol_expression_t *expression)
 {
        fputs(expression->symbol->string, out);
@@ -427,10 +425,8 @@ void print_expression(const expression_t *expression)
                print_unary_expression(&expression->unary);
                break;
        case EXPR_SIZEOF:
-               print_sizeof_expression(&expression->sizeofe);
-               break;
        case EXPR_ALIGNOF:
-               print_alignof_expression(&expression->alignofe);
+               print_typeprop_expression(&expression->typeprop);
                break;
        case EXPR_BUILTIN_SYMBOL:
                print_builtin_symbol(&expression->builtin_symbol);
@@ -592,10 +588,10 @@ 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);
-       if(statement->context.declarations != NULL) {
+       if(statement->scope.declarations != NULL) {
                assert(statement->initialisation == NULL);
-               print_declaration(statement->context.declarations);
-               if(statement->context.declarations->next != NULL) {
+               print_declaration(statement->scope.declarations);
+               if(statement->scope.declarations->next != NULL) {
                        panic("multiple declarations in for statement not supported yet");
                }
                fputc(' ', out);
@@ -626,7 +622,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);
@@ -640,7 +636,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);
        }
 }
 
@@ -651,7 +647,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;
@@ -775,7 +771,7 @@ static void print_normal_declaration(const declaration_t *declaration)
                        fputs("inline ", out);
        }
        print_type_ext(declaration->type, declaration->symbol,
-                      &declaration->context);
+                      &declaration->scope);
 
        if(declaration->type->kind == TYPE_FUNCTION) {
                if(declaration->init.statement != NULL) {
@@ -828,7 +824,7 @@ void print_ast(const translation_unit_t *unit)
 {
        inc_type_visited();
 
-       declaration_t *declaration = unit->context.declarations;
+       declaration_t *declaration = unit->scope.declarations;
        for( ; declaration != NULL; declaration = declaration->next) {
                if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY)
                        continue;