synchronized with edgfe, using new inline heuristic

[cparser] / write_fluffy.c

diff --git a/write_fluffy.c b/write_fluffy.c
index a313ed0..0d66b0b 100644 (file)
--- a/write_fluffy.c
+++ b/write_fluffy.c
@@ -1,9 +1,29 @@
+/*
+ * This file is part of cparser.
+ * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
 #include <config.h>
 
 #include <errno.h>
 #include <string.h>
 
 #include "write_fluffy.h"
+#include "symbol_t.h"
 #include "ast_t.h"
 #include "type_t.h"
 #include "type.h"
@@ -157,6 +177,8 @@ static void write_type(const type_t *type)
        case TYPE_INVALID:
                panic("invalid type found");
                break;
+       case TYPE_COMPLEX:
+       case TYPE_IMAGINARY:
        default:
                fprintf(out, "/* TODO type */");
                break;
@@ -200,7 +222,7 @@ static void write_expression(const expression_t *expression);
 
 static void write_unary_expression(const unary_expression_t *expression)
 {
-       switch(expression->expression.kind) {
+       switch(expression->base.kind) {
        case EXPR_UNARY_NEGATE:
                fputc('-', out);
                break;
@@ -220,7 +242,7 @@ static void write_expression(const expression_t *expression)
        switch(expression->kind) {
        case EXPR_CONST:
                constant = &expression->conste;
-               if(is_type_integer(expression->base.datatype)) {
+               if(is_type_integer(expression->base.type)) {
                        fprintf(out, "%lld", constant->v.int_value);
                } else {
                        fprintf(out, "%Lf", constant->v.float_value);