__signed is a synonym for signed
[cparser] / ast.c
diff --git a/ast.c b/ast.c
index df07b01..175f632 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -1,7 +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 "ast_t.h"
+#include "symbol_t.h"
 #include "type_t.h"
+#include "parser.h"
+#include "lang_features.h"
 
 #include <assert.h>
 #include <stdio.h>
@@ -79,9 +101,12 @@ static unsigned get_expression_precedence(expression_kind_t kind)
                [EXPR_UNKNOWN]                   = PREC_PRIM,
                [EXPR_INVALID]                   = PREC_PRIM,
                [EXPR_REFERENCE]                 = PREC_PRIM,
+               [EXPR_CHARACTER_CONSTANT]        = PREC_PRIM,
+               [EXPR_WIDE_CHARACTER_CONSTANT]   = PREC_PRIM,
                [EXPR_CONST]                     = PREC_PRIM,
                [EXPR_STRING_LITERAL]            = PREC_PRIM,
                [EXPR_WIDE_STRING_LITERAL]       = PREC_PRIM,
+               [EXPR_COMPOUND_LITERAL]          = PREC_UNARY,
                [EXPR_CALL]                      = PREC_PRIM,
                [EXPR_CONDITIONAL]               = PREC_COND,
                [EXPR_SELECT]                    = PREC_ACCESS,
@@ -90,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,
@@ -154,15 +178,10 @@ static unsigned get_expression_precedence(expression_kind_t kind)
                [EXPR_BINARY_ISLESSGREATER]      = PREC_PRIM,
                [EXPR_BINARY_ISUNORDERED]        = PREC_PRIM
        };
-#ifndef NDEBUG
-       if ((unsigned)kind >= (sizeof(prec)/sizeof(prec[0]))) {
-               panic("wrong expression kind");
-       }
+       assert((unsigned)kind < (sizeof(prec)/sizeof(prec[0])));
        unsigned res = prec[kind];
-       if (res == PREC_BOTTOM) {
-               panic("expression kind not defined in get_expression_precedence()");
-       }
-#endif
+
+       assert(res != PREC_BOTTOM);
        return res;
 }
 
@@ -176,10 +195,14 @@ static void print_const(const const_expression_t *cnst)
        if(cnst->base.type == NULL)
                return;
 
-       if(is_type_integer(cnst->base.type)) {
+       const type_t *const type = skip_typeref(cnst->base.type);
+
+       if (is_type_integer(type)) {
                fprintf(out, "%lld", cnst->v.int_value);
-       } else if(is_type_float(cnst->base.type)) {
+       } else if (is_type_float(type)) {
                fprintf(out, "%Lf", cnst->v.float_value);
+       } else {
+               panic("unknown constant");
        }
 }
 
@@ -187,14 +210,17 @@ static void print_const(const const_expression_t *cnst)
  * Print a quoted string constant.
  *
  * @param string  the string constant
+ * @param border  the border char
  */
-static void print_quoted_string(const string_t *const string)
+static void print_quoted_string(const string_t *const string, char border)
 {
-       fputc('"', out);
-       const char *end = string->begin + string->size;
+       fputc(border, out);
+       const char *end = string->begin + string->size - 1;
        for (const char *c = string->begin; c != end; ++c) {
+               if (*c == border) {
+                       fputc('\\', out);
+               }
                switch(*c) {
-               case '\"':  fputs("\\\"", out); break;
                case '\\':  fputs("\\\\", out); break;
                case '\a':  fputs("\\a", out); break;
                case '\b':  fputs("\\b", out); break;
@@ -213,18 +239,7 @@ static void print_quoted_string(const string_t *const string)
                        break;
                }
        }
-       fputc('"', out);
-}
-
-/**
- * Prints a string literal expression.
- *
- * @param string_literal  the string literal expression
- */
-static void print_string_literal(
-               const string_literal_expression_t *string_literal)
-{
-       print_quoted_string(&string_literal->value);
+       fputc(border, out);
 }
 
 /**
@@ -232,12 +247,12 @@ static void print_string_literal(
  *
  * @param wstr  the wide string literal expression
  */
-static void print_wide_string_literal(
-       const wide_string_literal_expression_t *const wstr)
+static void print_quoted_wide_string(const wide_string_t *const wstr,
+                                     char border)
 {
-       fputs("L\"", out);
-       for (const wchar_rep_t *c   = wstr->value.begin,
-                              *end = c + wstr->value.size;
+       fputc('L', out);
+       fputc(border, out);
+       for (const wchar_rep_t *c = wstr->begin, *end = wstr->begin + wstr->size-1;
             c != end; ++c) {
                switch (*c) {
                        case L'\"':  fputs("\\\"", out); break;
@@ -274,9 +289,68 @@ static void print_wide_string_literal(
                        }
                }
        }
+       fputc(border, out);
+}
+
+/**
+ * Print a constant character expression.
+ *
+ * @param cnst  the constant character expression
+ */
+static void print_character_constant(const const_expression_t *cnst)
+{
+       print_quoted_string(&cnst->v.character, '\'');
+}
+
+static void print_wide_character_constant(const const_expression_t *cnst)
+{
+       print_quoted_wide_string(&cnst->v.wide_character, '\'');
+}
+
+/**
+ * Prints a string literal expression.
+ *
+ * @param string_literal  the string literal expression
+ */
+static void print_string_literal(
+               const string_literal_expression_t *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)
+{
+       print_quoted_wide_string(&wstr->value, '"');
+}
+
+static void print_compound_literal(
+               const compound_literal_expression_t *expression)
+{
+       fputc('(', out);
+       print_type(expression->type);
+       fputs(") ", out);
+       print_initializer(expression->initializer);
+}
+
 /**
  * Prints a call expression.
  *
@@ -567,8 +641,7 @@ static void print_select(const select_expression_t *expression)
 {
        unsigned prec = get_expression_precedence(expression->base.kind);
        print_expression_prec(expression->compound, prec);
-       if(expression->compound->base.type == NULL ||
-                       expression->compound->base.type->kind == TYPE_POINTER) {
+       if(is_type_pointer(expression->compound->base.type)) {
                fputs("->", out);
        } else {
                fputc('.', out);
@@ -596,11 +669,10 @@ static void print_classify_type_expression(
  */
 static void print_designator(const designator_t *designator)
 {
-       fputs(designator->symbol->string, out);
-       for (designator = designator->next; designator != NULL; designator = designator->next) {
-               if (designator->array_access) {
+       for ( ; designator != NULL; designator = designator->next) {
+               if (designator->symbol == NULL) {
                        fputc('[', out);
-                       print_expression_prec(designator->array_access, PREC_ACCESS);
+                       print_expression_prec(designator->array_index, PREC_ACCESS);
                        fputc(']', out);
                } else {
                        fputc('.', out);
@@ -652,19 +724,29 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p
        switch(expression->kind) {
        case EXPR_UNKNOWN:
        case EXPR_INVALID:
-               fprintf(out, "*invalid expression*");
+               fprintf(out, "$invalid expression$");
+               break;
+       case EXPR_CHARACTER_CONSTANT:
+               print_character_constant(&expression->conste);
+               break;
+       case EXPR_WIDE_CHARACTER_CONSTANT:
+               print_wide_character_constant(&expression->conste);
                break;
        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;
        case EXPR_WIDE_STRING_LITERAL:
                print_wide_string_literal(&expression->wide_string);
                break;
+       case EXPR_COMPOUND_LITERAL:
+               print_compound_literal(&expression->compound_literal);
+               break;
        case EXPR_CALL:
                print_call_expression(&expression->call);
                break;
@@ -794,9 +876,7 @@ static void print_label_statement(const label_statement_t *statement)
 {
        fprintf(stderr, "(%p)", (void*) statement->label);
        fprintf(out, "%s:\n", statement->label->symbol->string);
-       if(statement->statement != NULL) {
-               print_statement(statement->statement);
-       }
+       print_statement(statement->statement);
 }
 
 /**
@@ -806,12 +886,10 @@ static void print_label_statement(const label_statement_t *statement)
  */
 static void print_if_statement(const if_statement_t *statement)
 {
-       fputs("if(", out);
+       fputs("if (", out);
        print_expression(statement->condition);
        fputs(") ", out);
-       if(statement->true_statement != NULL) {
-               print_statement(statement->true_statement);
-       }
+       print_statement(statement->true_statement);
 
        if(statement->false_statement != NULL) {
                print_indent();
@@ -827,7 +905,7 @@ static void print_if_statement(const if_statement_t *statement)
  */
 static void print_switch_statement(const switch_statement_t *statement)
 {
-       fputs("switch(", out);
+       fputs("switch (", out);
        print_expression(statement->expression);
        fputs(") ", out);
        print_statement(statement->body);
@@ -845,6 +923,10 @@ static void print_case_label(const case_label_statement_t *statement)
        } else {
                fputs("case ", out);
                print_expression(statement->expression);
+               if (statement->end_range != NULL) {
+                       fputs(" ... ", out);
+                       print_expression(statement->end_range);
+               }
                fputs(":\n", out);
        }
        ++indent;
@@ -869,6 +951,9 @@ static void print_declaration_statement(
        declaration_t *declaration = statement->declarations_begin;
        for( ; declaration != statement->declarations_end->next;
               declaration = declaration->next) {
+           if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY)
+               continue;
+
                if(!first) {
                        print_indent();
                } else {
@@ -886,7 +971,7 @@ static void print_declaration_statement(
  */
 static void print_while_statement(const while_statement_t *statement)
 {
-       fputs("while(", out);
+       fputs("while (", out);
        print_expression(statement->condition);
        fputs(") ", out);
        print_statement(statement->body);
@@ -902,7 +987,7 @@ static void print_do_while_statement(const do_while_statement_t *statement)
        fputs("do ", out);
        print_statement(statement->body);
        print_indent();
-       fputs("while(", out);
+       fputs("while (", out);
        print_expression(statement->condition);
        fputs(");\n", out);
 }
@@ -914,7 +999,7 @@ 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);
+       fputs("for (", out);
        if(statement->scope.declarations != NULL) {
                assert(statement->initialisation == NULL);
                print_declaration(statement->scope.declarations);
@@ -954,7 +1039,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);
@@ -973,7 +1058,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, '"');
        }
 }
 
@@ -989,7 +1074,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;
@@ -1019,6 +1104,9 @@ end_of_print_asm_statement:
 void print_statement(const statement_t *statement)
 {
        switch(statement->kind) {
+       case STATEMENT_EMPTY:
+               fputs(";\n", out);
+               break;
        case STATEMENT_COMPOUND:
                print_compound_statement(&statement->compound);
                break;
@@ -1065,7 +1153,7 @@ void print_statement(const statement_t *statement)
                print_asm_statement(&statement->asms);
                break;
        case STATEMENT_INVALID:
-               fprintf(out, "*invalid statement*");
+               fprintf(out, "$invalid statement$");
                break;
        }
 }
@@ -1075,9 +1163,9 @@ void print_statement(const statement_t *statement)
  *
  * @param storage_class   the storage class
  */
-static void print_storage_class(unsigned storage_class)
+static void print_storage_class(storage_class_tag_t storage_class)
 {
-       switch((storage_class_tag_t) storage_class) {
+       switch(storage_class) {
        case STORAGE_CLASS_ENUM_ENTRY:
        case STORAGE_CLASS_NONE:
                break;
@@ -1099,23 +1187,118 @@ static void print_storage_class(unsigned storage_class)
  */
 void print_initializer(const initializer_t *initializer)
 {
-       if(initializer->kind == INITIALIZER_VALUE) {
+       if(initializer == NULL) {
+               fputs("{}", out);
+               return;
+       }
+
+       switch(initializer->kind) {
+       case INITIALIZER_VALUE: {
                const initializer_value_t *value = &initializer->value;
                print_expression(value->value);
                return;
        }
+       case INITIALIZER_LIST: {
+               assert(initializer->kind == INITIALIZER_LIST);
+               fputs("{ ", out);
+               const initializer_list_t *list = &initializer->list;
+
+               for(size_t i = 0 ; i < list->len; ++i) {
+                       const initializer_t *sub_init = list->initializers[i];
+                       print_initializer(list->initializers[i]);
+                       if(i < list->len-1) {
+                               if(sub_init == NULL || sub_init->kind != INITIALIZER_DESIGNATOR)
+                                       fputs(", ", out);
+                       }
+               }
+               fputs(" }", out);
+               return;
+       }
+       case INITIALIZER_STRING:
+               print_quoted_string(&initializer->string.string, '"');
+               return;
+       case INITIALIZER_WIDE_STRING:
+               print_quoted_wide_string(&initializer->wide_string.string, '"');
+               return;
+       case INITIALIZER_DESIGNATOR:
+               print_designator(initializer->designator.designator);
+               fputs(" = ", out);
+               return;
+       }
 
-       assert(initializer->kind == INITIALIZER_LIST);
-       fputs("{ ", out);
-       const initializer_list_t *list = &initializer->list;
+       panic("invalid initializer kind found");
+}
 
-       for(size_t i = 0 ; i < list->len; ++i) {
-               if(i > 0) {
-                       fputs(", ", out);
+/**
+ * Print microsoft extended declaration modifiers.
+ */
+static void print_ms_modifiers(const declaration_t *declaration) {
+       if((c_mode & _MS) == 0)
+               return;
+
+       decl_modifiers_t modifiers = declaration->modifiers;
+
+       /* DM_FORCEINLINE handled outside. */
+       if((modifiers & ~DM_FORCEINLINE) != 0 ||
+           declaration->alignment != 0 || declaration->deprecated != 0 ||
+           declaration->get_property_sym != NULL || declaration->put_property_sym != NULL) {
+               char *next = "(";
+
+               fputs("__declspec", out);
+               if(modifiers & DM_DLLIMPORT) {
+                       fputs(next, out); next = ", "; fputs("dllimport", out);
+               }
+               if(modifiers & DM_DLLEXPORT) {
+                       fputs(next, out); next = ", "; fputs("dllexport", out);
                }
-               print_initializer(list->initializers[i]);
+               if(modifiers & DM_THREAD) {
+                       fputs(next, out); next = ", "; fputs("thread", out);
+               }
+               if(modifiers & DM_NAKED) {
+                       fputs(next, out); next = ", "; fputs("naked", out);
+               }
+               if(modifiers & DM_THREAD) {
+                       fputs(next, out); next = ", "; fputs("thread", out);
+               }
+               if(modifiers & DM_SELECTANY) {
+                       fputs(next, out); next = ", "; fputs("selectany", out);
+               }
+               if(modifiers & DM_NOTHROW) {
+                       fputs(next, out); next = ", "; fputs("nothrow", out);
+               }
+               if(modifiers & DM_NORETURN) {
+                       fputs(next, out); next = ", "; fputs("noreturn", out);
+               }
+               if(modifiers & DM_NOINLINE) {
+                       fputs(next, out); next = ", "; fputs("noinline", out);
+               }
+               if(declaration->deprecated != 0) {
+                       fputs(next, out); next = ", "; fputs("deprecated", out);
+                       if(declaration->deprecated_string != NULL)
+                               fprintf(out, "(\"%s\")", declaration->deprecated_string);
+               }
+               if(declaration->alignment != 0) {
+                       fputs(next, out); next = ", "; fprintf(out, "align(%u)", declaration->alignment);
+               }
+               if(modifiers & DM_RESTRICT) {
+                       fputs(next, out); next = ", "; fputs("restrict", out);
+               }
+               if(modifiers & DM_NOALIAS) {
+                       fputs(next, out); next = ", "; fputs("noalias", out);
+               }
+           if(declaration->get_property_sym != NULL || declaration->put_property_sym != NULL) {
+               char *comma = "";
+                       fputs(next, out); next = ", "; fprintf(out, "property(");
+               if(declaration->get_property_sym != NULL) {
+                       fprintf(out, "get=%s", declaration->get_property_sym->string);
+                       comma = ", ";
+                       }
+               if(declaration->put_property_sym != NULL)
+                       fprintf(out, "%sput=%s", comma, declaration->put_property_sym->string);
+                       fputc(')', out);
+               }
+               fputs(") ", out);
        }
-       fputs("}", out);
 }
 
 /**
@@ -1125,13 +1308,18 @@ void print_initializer(const initializer_t *initializer)
  */
 static void print_normal_declaration(const declaration_t *declaration)
 {
-       print_storage_class(declaration->storage_class);
+       print_storage_class((storage_class_tag_t) declaration->declared_storage_class);
        if(declaration->is_inline) {
-               if (declaration->modifiers & DM_FORCEINLINE)
+               if(declaration->modifiers & DM_FORCEINLINE)
                        fputs("__forceinline ", out);
-               else
-                       fputs("inline ", out);
+               else {
+                       if(declaration->modifiers & DM_MICROSOFT_INLINE)
+                               fputs("__inline ", out);
+                       else
+                               fputs("inline ", out);
+               }
        }
+       print_ms_modifiers(declaration);
        print_type_ext(declaration->type, declaration->symbol,
                       &declaration->scope);
 
@@ -1219,23 +1407,125 @@ void print_ast(const translation_unit_t *unit)
        }
 }
 
-/**
- * Returns true if a given expression is a compile time
- * constant.
- *
- * @param expression  the expression to check
- */
+bool is_constant_initializer(const initializer_t *initializer)
+{
+       switch(initializer->kind) {
+       case INITIALIZER_STRING:
+       case INITIALIZER_WIDE_STRING:
+       case INITIALIZER_DESIGNATOR:
+               return true;
+
+       case INITIALIZER_VALUE:
+               return is_constant_expression(initializer->value.value);
+
+       case INITIALIZER_LIST:
+               for(size_t i = 0; i < initializer->list.len; ++i) {
+                       initializer_t *sub_initializer = initializer->list.initializers[i];
+                       if(!is_constant_initializer(sub_initializer))
+                               return false;
+               }
+               return true;
+       }
+       panic("invalid initializer kind found");
+}
+
+static bool is_object_with_constant_address(const expression_t *expression)
+{
+       switch(expression->kind) {
+       case EXPR_UNARY_DEREFERENCE:
+               return is_address_constant(expression->unary.value);
+
+       case EXPR_SELECT: {
+               if(is_type_pointer(expression->select.compound->base.type)) {
+                       /* it's a -> */
+                       return is_address_constant(expression->select.compound);
+               } else {
+                       return is_object_with_constant_address(expression->select.compound);
+               }
+       }
+
+       case EXPR_ARRAY_ACCESS:
+               return is_constant_expression(expression->array_access.index)
+                       && is_address_constant(expression->array_access.array_ref);
+
+       case EXPR_REFERENCE: {
+               declaration_t *declaration = expression->reference.declaration;
+               switch((storage_class_tag_t) declaration->storage_class) {
+               case STORAGE_CLASS_NONE:
+               case STORAGE_CLASS_EXTERN:
+               case STORAGE_CLASS_STATIC:
+                       return true;
+               default:
+                       return false;
+               }
+       }
+
+       default:
+               return false;
+       }
+}
+
+bool is_address_constant(const expression_t *expression)
+{
+       switch(expression->kind) {
+       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)
+                       || is_address_constant(expression->unary.value));
+
+       case EXPR_BINARY_ADD:
+       case EXPR_BINARY_SUB: {
+               expression_t *left  = expression->binary.left;
+               expression_t *right = expression->binary.right;
+
+               if(is_type_pointer(skip_typeref(left->base.type))) {
+                       return is_address_constant(left) && is_constant_expression(right);
+               } else if(is_type_pointer(skip_typeref(right->base.type))) {
+                       return is_constant_expression(left)     && is_address_constant(right);
+               }
+
+               return false;
+       }
+
+       case EXPR_REFERENCE: {
+               declaration_t *declaration = expression->reference.declaration;
+               type_t *type = skip_typeref(declaration->type);
+               if(is_type_function(type))
+                       return true;
+               if(is_type_array(type)) {
+                       return is_object_with_constant_address(expression);
+               }
+               return false;
+       }
+
+       default:
+               return false;
+       }
+}
+
 bool is_constant_expression(const expression_t *expression)
 {
        switch(expression->kind) {
 
        case EXPR_CONST:
+       case EXPR_CHARACTER_CONSTANT:
+       case EXPR_WIDE_CHARACTER_CONSTANT:
        case EXPR_STRING_LITERAL:
        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:
@@ -1254,6 +1544,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_TAKE_ADDRESS:
+       case EXPR_UNARY_DEREFERENCE:
        case EXPR_BINARY_ASSIGN:
        case EXPR_BINARY_MUL_ASSIGN:
        case EXPR_BINARY_DIV_ASSIGN:
@@ -1272,11 +1564,12 @@ bool is_constant_expression(const expression_t *expression)
        case EXPR_UNARY_PLUS:
        case EXPR_UNARY_BITWISE_NEGATE:
        case EXPR_UNARY_NOT:
-       case EXPR_UNARY_DEREFERENCE:
-       case EXPR_UNARY_TAKE_ADDRESS:
+               return is_constant_expression(expression->unary.value);
+
        case EXPR_UNARY_CAST:
        case EXPR_UNARY_CAST_IMPLICIT:
-               return is_constant_expression(expression->unary.value);
+               return is_type_arithmetic(skip_typeref(expression->base.type))
+                       && is_constant_expression(expression->unary.value);
 
        case EXPR_BINARY_ADD:
        case EXPR_BINARY_SUB:
@@ -1306,13 +1599,20 @@ bool is_constant_expression(const expression_t *expression)
                return is_constant_expression(expression->binary.left)
                        && is_constant_expression(expression->binary.right);
 
-       case EXPR_CONDITIONAL:
-               /* TODO: not correct, we only have to test expressions which are
-                * evaluated, which means either the true or false part might be not
-                * constant */
-               return is_constant_expression(expression->conditional.condition)
-                       && is_constant_expression(expression->conditional.true_expression)
-                       && is_constant_expression(expression->conditional.false_expression);
+       case EXPR_COMPOUND_LITERAL:
+               return is_constant_initializer(expression->compound_literal.initializer);
+
+       case EXPR_CONDITIONAL: {
+               expression_t *condition = expression->conditional.condition;
+               if(!is_constant_expression(condition))
+                       return false;
+
+               long val = fold_constant(condition);
+               if(val != 0)
+                       return is_constant_expression(expression->conditional.true_expression);
+               else
+                       return is_constant_expression(expression->conditional.false_expression);
+       }
 
        case EXPR_ARRAY_ACCESS:
                return is_constant_expression(expression->array_access.array_ref)
@@ -1326,8 +1626,10 @@ bool is_constant_expression(const expression_t *expression)
                return false;
        }
 
-       case EXPR_UNKNOWN:
        case EXPR_INVALID:
+               return true;
+
+       case EXPR_UNKNOWN:
                break;
        }
        panic("invalid expression found (is constant expression)");