some more testcases I had lying around here

[cparser] / ast.c

diff --git a/ast.c b/ast.c
index 7284a5b..690bec4 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -137,7 +137,6 @@ static unsigned get_expression_precedence(expression_kind_t kind)
                [EXPR_UNARY_CAST]                = PREC_UNARY,
                [EXPR_UNARY_CAST_IMPLICIT]       = PREC_UNARY,
                [EXPR_UNARY_ASSUME]              = PREC_PRIM,
-               [EXPR_UNARY_BITFIELD_EXTRACT]    = PREC_ACCESS,
 
                [EXPR_BINARY_ADD]                = PREC_PLUS,
                [EXPR_BINARY_SUB]                = PREC_PLUS,
@@ -455,10 +454,6 @@ static void print_unary_expression(const unary_expression_t *unexpr)
        case EXPR_UNARY_DEREFERENCE:      fputs("*", out);  break;
        case EXPR_UNARY_TAKE_ADDRESS:     fputs("&", out);  break;
 
-       case EXPR_UNARY_BITFIELD_EXTRACT:
-               print_expression_prec(unexpr->value, prec);
-               return;
-
        case EXPR_UNARY_POSTFIX_INCREMENT:
                print_expression_prec(unexpr->value, prec);
                fputs("++", out);
@@ -1551,6 +1546,26 @@ bool is_address_constant(const expression_t *expression)
        }
 }
 
+static bool is_builtin_const_call(const expression_t *expression)
+{
+       expression_t *function = expression->call.function;
+       if (function->kind != EXPR_BUILTIN_SYMBOL) {
+               return false;
+       }
+
+       symbol_t *symbol = function->builtin_symbol.symbol;
+
+       switch (symbol->ID) {
+       case T___builtin_huge_val:
+       case T___builtin_nan:
+       case T___builtin_nanf:
+       case T___builtin_nand:
+               return true;
+       }
+
+       return false;
+}
+
 bool is_constant_expression(const expression_t *expression)
 {
        switch(expression->kind) {
@@ -1570,7 +1585,6 @@ bool is_constant_expression(const expression_t *expression)
 
        case EXPR_BUILTIN_SYMBOL:
        case EXPR_BUILTIN_PREFETCH:
-       case EXPR_CALL:
        case EXPR_SELECT:
        case EXPR_VA_START:
        case EXPR_VA_ARG:
@@ -1579,7 +1593,6 @@ bool is_constant_expression(const expression_t *expression)
        case EXPR_UNARY_POSTFIX_DECREMENT:
        case EXPR_UNARY_PREFIX_INCREMENT:
        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:
@@ -1597,6 +1610,9 @@ bool is_constant_expression(const expression_t *expression)
        case EXPR_BINARY_COMMA:
                return false;
 
+       case EXPR_CALL:
+               return is_builtin_const_call(expression);
+
        case EXPR_UNARY_NEGATE:
        case EXPR_UNARY_PLUS:
        case EXPR_UNARY_BITWISE_NEGATE: