avoid more casts of type structs

[cparser] / ast.c

diff --git a/ast.c b/ast.c
index 692de23..b326e85 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -35,7 +35,7 @@ static void print_const(const const_t *cnst)
                return;
 
        if(is_type_integer(cnst->expression.datatype)) {
-               fprintf(out, "%d", cnst->v.int_value);
+               fprintf(out, "%lld", cnst->v.int_value);
        } else if(is_type_floating(cnst->expression.datatype)) {
                fprintf(out, "%Lf", cnst->v.float_value);
        }
@@ -161,7 +161,7 @@ static void print_unary_expression(const unary_expression_t *unexpr)
                fputs(")", out);
                break;
        case UNEXPR_INVALID:
-               fprintf(out, "unop%d", unexpr->type);
+               fprintf(out, "unop%d", (int) unexpr->type);
                break;
        }
        fputs("(", out);
@@ -176,11 +176,19 @@ static void print_reference_expression(const reference_expression_t *ref)
 
 static void print_array_expression(const array_access_expression_t *expression)
 {
-       fputs("(", out);
-       print_expression(expression->array_ref);
-       fputs(")[", out);
-       print_expression(expression->index);
-       fputs("]", out);
+       if(!expression->flipped) {
+               fputs("(", out);
+               print_expression(expression->array_ref);
+               fputs(")[", out);
+               print_expression(expression->index);
+               fputs("]", out);
+       } else {
+               fputs("(", out);
+               print_expression(expression->index);
+               fputs(")[", out);
+               print_expression(expression->array_ref);
+               fputs("]", out);
+       }
 }
 
 static void print_sizeof_expression(const sizeof_expression_t *expression)
@@ -234,6 +242,14 @@ 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) {
@@ -279,11 +295,14 @@ 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:
                /* TODO */
-               fprintf(out, "some expression of type %d", expression->type);
+               fprintf(out, "some expression of type %d", (int) expression->type);
                break;
        }
 }
@@ -369,6 +388,7 @@ static void print_case_label(const case_label_statement_t *statement)
                print_expression(statement->expression);
                fputs(":\n", out);
        }
+       print_statement(statement->label_statement);
 }
 
 static void print_declaration_statement(
@@ -501,18 +521,20 @@ static void print_storage_class(storage_class_t storage_class)
 void print_initializer(const initializer_t *initializer)
 {
        if(initializer->type == INITIALIZER_VALUE) {
-               print_expression(initializer->v.value);
+               const initializer_value_t *value = &initializer->value;
+               print_expression(value->value);
                return;
        }
 
        assert(initializer->type == INITIALIZER_LIST);
        fputs("{ ", out);
-       initializer_t *iter = initializer->v.list;
-       for( ; iter != NULL; iter = iter->next) {
-               print_initializer(iter);
-               if(iter->next != NULL) {
+       const initializer_list_t *list = &initializer->list;
+
+       for(size_t i = 0 ; i < list->len; ++i) {
+               if(i > 0) {
                        fputs(", ", out);
                }
+               print_initializer(list->initializers[i]);
        }
        fputs("}", out);
 }