condeval is called jump threading now
[cparser] / ast.c
diff --git a/ast.c b/ast.c
index f0946ef..73c05c0 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of cparser.
- * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ * Copyright (C) 2007-2009 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
@@ -114,13 +114,12 @@ static unsigned get_expression_precedence(expression_kind_t kind)
                [EXPR_ALIGNOF]                    = PREC_UNARY,
 
                [EXPR_FUNCNAME]                   = PREC_PRIMARY,
-               [EXPR_BUILTIN_SYMBOL]             = PREC_PRIMARY,
                [EXPR_BUILTIN_CONSTANT_P]         = PREC_PRIMARY,
                [EXPR_BUILTIN_TYPES_COMPATIBLE_P] = PREC_PRIMARY,
-               [EXPR_BUILTIN_PREFETCH]           = PREC_PRIMARY,
                [EXPR_OFFSETOF]                   = PREC_PRIMARY,
                [EXPR_VA_START]                   = PREC_PRIMARY,
                [EXPR_VA_ARG]                     = PREC_PRIMARY,
+               [EXPR_VA_COPY]                    = PREC_PRIMARY,
                [EXPR_STATEMENT]                  = PREC_PRIMARY,
                [EXPR_LABEL_ADDRESS]              = PREC_PRIMARY,
 
@@ -399,8 +398,7 @@ static void print_assignment_expression(const expression_t *const expr)
  */
 static void print_call_expression(const call_expression_t *call)
 {
-       unsigned prec = get_expression_precedence(call->base.kind);
-       print_expression_prec(call->function, prec);
+       print_expression_prec(call->function, PREC_POSTFIX);
        fputc('(', out);
        call_argument_t *argument = call->arguments;
        int              first    = 1;
@@ -548,14 +546,13 @@ static void print_label_address_expression(const label_address_expression_t *le)
  */
 static void print_array_expression(const array_access_expression_t *expression)
 {
-       unsigned prec = get_expression_precedence(expression->base.kind);
        if (!expression->flipped) {
-               print_expression_prec(expression->array_ref, prec);
+               print_expression_prec(expression->array_ref, PREC_POSTFIX);
                fputc('[', out);
                print_expression(expression->index);
                fputc(']', out);
        } else {
-               print_expression_prec(expression->index, prec);
+               print_expression_prec(expression->index, PREC_POSTFIX);
                fputc('[', out);
                print_expression(expression->array_ref);
                fputc(']', out);
@@ -576,10 +573,8 @@ static void print_typeprop_expression(const typeprop_expression_t *expression)
                fputs("__alignof__", out);
        }
        if (expression->tp_expression != NULL) {
-               /* always print the '()' here, sizeof x is right but unusual */
-               fputc('(', out);
-               print_expression(expression->tp_expression);
-               fputc(')', out);
+               /* PREC_TOP: always print the '()' here, sizeof x is right but unusual */
+               print_expression_prec(expression->tp_expression, PREC_TOP);
        } else {
                fputc('(', out);
                print_type(expression->type);
@@ -587,16 +582,6 @@ static void print_typeprop_expression(const typeprop_expression_t *expression)
        }
 }
 
-/**
- * Prints an builtin symbol.
- *
- * @param expression   the builtin symbol expression
- */
-static void print_builtin_symbol(const builtin_symbol_expression_t *expression)
-{
-       fputs(expression->symbol->string, out);
-}
-
 /**
  * Prints a builtin constant expression.
  *
@@ -624,26 +609,6 @@ static void print_builtin_types_compatible(
        fputc(')', out);
 }
 
-/**
- * Prints a builtin prefetch expression.
- *
- * @param expression   the builtin prefetch expression
- */
-static void print_builtin_prefetch(const builtin_prefetch_expression_t *expression)
-{
-       fputs("__builtin_prefetch(", out);
-       print_assignment_expression(expression->adr);
-       if (expression->rw) {
-               fputc(',', out);
-               print_assignment_expression(expression->rw);
-       }
-       if (expression->locality) {
-               fputc(',', out);
-               print_assignment_expression(expression->locality);
-       }
-       fputc(')', out);
-}
-
 /**
  * Prints a conditional expression.
  *
@@ -652,12 +617,12 @@ static void print_builtin_prefetch(const builtin_prefetch_expression_t *expressi
 static void print_conditional(const conditional_expression_t *expression)
 {
        print_expression_prec(expression->condition, PREC_LOGICAL_OR);
-       fputs(" ? ", out);
        if (expression->true_expression != NULL) {
+               fputs(" ? ", out);
                print_expression_prec(expression->true_expression, PREC_EXPRESSION);
                fputs(" : ", out);
        } else {
-               fputs(": ", out);
+               fputs(" ?: ", out);
        }
        precedence_t prec = c_mode & _CXX ? PREC_ASSIGNMENT : PREC_CONDITIONAL;
        print_expression_prec(expression->false_expression, prec);
@@ -691,6 +656,20 @@ static void print_va_arg(const va_arg_expression_t *expression)
        fputc(')', out);
 }
 
+/**
+ * Prints a va_copy expression.
+ *
+ * @param expression   the va_copy expression
+ */
+static void print_va_copy(const va_copy_expression_t *expression)
+{
+       fputs("__builtin_va_copy(", out);
+       print_assignment_expression(expression->dst);
+       fputs(", ", out);
+       print_assignment_expression(expression->src);
+       fputc(')', out);
+}
+
 /**
  * Prints a select expression (. or ->).
  *
@@ -698,8 +677,7 @@ static void print_va_arg(const va_arg_expression_t *expression)
  */
 static void print_select(const select_expression_t *expression)
 {
-       unsigned prec = get_expression_precedence(expression->base.kind);
-       print_expression_prec(expression->compound, prec);
+       print_expression_prec(expression->compound, PREC_POSTFIX);
        if (is_type_pointer(skip_typeref(expression->compound->base.type))) {
                fputs("->", out);
        } else {
@@ -747,8 +725,7 @@ static void print_designator(const designator_t *designator)
  */
 static void print_offsetof_expression(const offsetof_expression_t *expression)
 {
-       fputs("__builtin_offsetof", out);
-       fputc('(', out);
+       fputs("__builtin_offsetof(", out);
        print_type(expression->type);
        fputc(',', out);
        print_designator(expression->designator);
@@ -835,18 +812,12 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p
        case EXPR_ALIGNOF:
                print_typeprop_expression(&expression->typeprop);
                break;
-       case EXPR_BUILTIN_SYMBOL:
-               print_builtin_symbol(&expression->builtin_symbol);
-               break;
        case EXPR_BUILTIN_CONSTANT_P:
                print_builtin_constant(&expression->builtin_constant);
                break;
        case EXPR_BUILTIN_TYPES_COMPATIBLE_P:
                print_builtin_types_compatible(&expression->builtin_types_compatible);
                break;
-       case EXPR_BUILTIN_PREFETCH:
-               print_builtin_prefetch(&expression->builtin_prefetch);
-               break;
        case EXPR_CONDITIONAL:
                print_conditional(&expression->conditional);
                break;
@@ -856,6 +827,9 @@ static void print_expression_prec(const expression_t *expression, unsigned top_p
        case EXPR_VA_ARG:
                print_va_arg(&expression->va_arge);
                break;
+       case EXPR_VA_COPY:
+               print_va_copy(&expression->va_copye);
+               break;
        case EXPR_SELECT:
                print_select(&expression->select);
                break;
@@ -1111,22 +1085,17 @@ 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);
-       entity_t *entity = statement->scope.entities;
-       while (entity != NULL && is_generated_entity(entity))
-               entity = entity->base.next;
-
-       if (entity != NULL) {
-               assert(statement->initialisation == NULL);
-               assert(is_declaration(entity));
-               print_declaration(entity);
-               if (entity->base.next != NULL) {
-                       panic("multiple declarations in for statement not supported yet");
-               }
+       if (statement->initialisation != NULL) {
+               print_expression(statement->initialisation);
+               fputc(';', out);
        } else {
-               if (statement->initialisation) {
-                       print_expression(statement->initialisation);
+               entity_t const *entity = statement->scope.entities;
+               for (; entity != NULL; entity = entity->base.next) {
+                       if (is_generated_entity(entity))
+                               continue;
+                       /* FIXME display of multiple declarations is wrong */
+                       print_declaration(entity);
                }
-               fputc(';', out);
        }
        if (statement->condition != NULL) {
                fputc(' ', out);
@@ -1380,6 +1349,7 @@ void print_initializer(const initializer_t *initializer)
        panic("invalid initializer kind found");
 }
 
+#if 0
 /**
  * Print microsoft extended declaration modifiers.
  */
@@ -1471,6 +1441,7 @@ static void print_ms_modifiers(const declaration_t *declaration)
        if (ds_shown)
                fputs(") ", out);
 }
+#endif
 
 static void print_scope(const scope_t *scope)
 {
@@ -1521,7 +1492,7 @@ void print_declaration(const entity_t *entity)
                        }
                }
        }
-       print_ms_modifiers(declaration);
+       //print_ms_modifiers(declaration);
        switch (entity->kind) {
                case ENTITY_FUNCTION:
                        print_type_ext(entity->declaration.type, entity->base.symbol,
@@ -1582,6 +1553,12 @@ void print_entity(const entity_t *entity)
        case ENTITY_TYPEDEF:
                print_typedef(entity);
                return;
+       case ENTITY_CLASS:
+               /* TODO */
+               fputs("class ", out);
+               fputs(entity->base.symbol->string, out);
+               fputs("; /* TODO */\n", out);
+               return;
        case ENTITY_STRUCT:
                fputs("struct ", out);
                fputs(entity->base.symbol->string, out);
@@ -1629,8 +1606,6 @@ void print_entity(const entity_t *entity)
  */
 void print_ast(const translation_unit_t *unit)
 {
-       inc_type_visited();
-
        entity_t *entity = unit->scope.entities;
        for ( ; entity != NULL; entity = entity->base.next) {
                if (entity->kind == ENTITY_ENUM_VALUE)
@@ -1717,6 +1692,12 @@ static bool is_object_with_linker_constant_address(const expression_t *expressio
 bool is_address_constant(const expression_t *expression)
 {
        switch (expression->kind) {
+       case EXPR_STRING_LITERAL:
+       case EXPR_WIDE_STRING_LITERAL:
+       case EXPR_FUNCNAME:
+       case EXPR_LABEL_ADDRESS:
+               return true;
+
        case EXPR_UNARY_TAKE_ADDRESS:
                return is_object_with_linker_constant_address(expression->unary.value);
 
@@ -1783,32 +1764,50 @@ bool is_address_constant(const expression_t *expression)
                        is_address_constant(expression->array_access.array_ref);
        }
 
+       case EXPR_CONDITIONAL: {
+               expression_t *const c = expression->conditional.condition;
+               if (!is_constant_expression(c))
+                       return false;
+
+               if (fold_constant_to_bool(c)) {
+                       expression_t const *const t = expression->conditional.true_expression;
+                       return is_address_constant(t != NULL ? t : c);
+               } else {
+                       return is_address_constant(expression->conditional.false_expression);
+               }
+       }
+
        default:
                return false;
        }
 }
 
+/**
+ * Check if the given expression is a call to a builtin function
+ * returning a constant result.
+ */
 static bool is_builtin_const_call(const expression_t *expression)
 {
        expression_t *function = expression->call.function;
-       if (function->kind != EXPR_BUILTIN_SYMBOL) {
+       if (function->kind != EXPR_REFERENCE)
+               return false;
+       reference_expression_t *ref = &function->reference;
+       if (ref->entity->kind != ENTITY_FUNCTION)
                return false;
-       }
-
-       symbol_t *symbol = function->builtin_symbol.symbol;
 
-       switch (symbol->ID) {
-       case T___builtin_huge_val:
-       case T___builtin_inf:
-       case T___builtin_inff:
-       case T___builtin_infl:
-       case T___builtin_nan:
-       case T___builtin_nanf:
-       case T___builtin_nanl:
+       switch (ref->entity->function.btk) {
+       case bk_gnu_builtin_huge_val:
+       case bk_gnu_builtin_inf:
+       case bk_gnu_builtin_inff:
+       case bk_gnu_builtin_infl:
+       case bk_gnu_builtin_nan:
+       case bk_gnu_builtin_nanf:
+       case bk_gnu_builtin_nanl:
                return true;
+       default:
+               return false;
        }
 
-       return false;
 }
 
 static bool is_constant_pointer(const expression_t *expression)
@@ -1862,34 +1861,27 @@ bool is_constant_expression(const expression_t *expression)
        case EXPR_CONST:
        case EXPR_CHARACTER_CONSTANT:
        case EXPR_WIDE_CHARACTER_CONSTANT:
-       case EXPR_STRING_LITERAL:
-       case EXPR_WIDE_STRING_LITERAL:
        case EXPR_CLASSIFY_TYPE:
-       case EXPR_FUNCNAME:
        case EXPR_OFFSETOF:
        case EXPR_ALIGNOF:
        case EXPR_BUILTIN_CONSTANT_P:
        case EXPR_BUILTIN_TYPES_COMPATIBLE_P:
-       case EXPR_LABEL_ADDRESS:
        case EXPR_REFERENCE_ENUM_VALUE:
                return true;
 
        case EXPR_SIZEOF: {
-               type_t *type = expression->typeprop.type;
-               if (type == NULL)
-                       type = expression->typeprop.tp_expression->base.type;
-
-               type = skip_typeref(type);
-               if (is_type_array(type) && type->array.is_vla)
-                       return false;
-               return true;
+               type_t *const type = skip_typeref(expression->typeprop.type);
+               return !is_type_array(type) || !type->array.is_vla;
        }
 
-       case EXPR_BUILTIN_SYMBOL:
-       case EXPR_BUILTIN_PREFETCH:
+       case EXPR_STRING_LITERAL:
+       case EXPR_WIDE_STRING_LITERAL:
+       case EXPR_FUNCNAME:
+       case EXPR_LABEL_ADDRESS:
        case EXPR_SELECT:
        case EXPR_VA_START:
        case EXPR_VA_ARG:
+       case EXPR_VA_COPY:
        case EXPR_STATEMENT:
        case EXPR_REFERENCE:
        case EXPR_UNARY_POSTFIX_INCREMENT:
@@ -1962,7 +1954,7 @@ bool is_constant_expression(const expression_t *expression)
                expression_t const *const left = expression->binary.left;
                if (!is_constant_expression(left))
                        return false;
-               if (fold_constant(left) == 0)
+               if (fold_constant_to_bool(left) == false)
                        return true;
                return is_constant_expression(expression->binary.right);
        }
@@ -1971,7 +1963,7 @@ bool is_constant_expression(const expression_t *expression)
                expression_t const *const left = expression->binary.left;
                if (!is_constant_expression(left))
                        return false;
-               if (fold_constant(left) != 0)
+               if (fold_constant_to_bool(left) == true)
                        return true;
                return is_constant_expression(expression->binary.right);
        }
@@ -1984,8 +1976,7 @@ bool is_constant_expression(const expression_t *expression)
                if (!is_constant_expression(condition))
                        return false;
 
-               long val = fold_constant(condition);
-               if (val != 0) {
+               if (fold_constant_to_bool(condition) == true) {
                        expression_t const *const t = expression->conditional.true_expression;
                        return t == NULL || is_constant_expression(t);
                } else {