Remove the unnecessary distinction between EXPR_LITERAL_FLOATINGPOINT and EXPR_LITERA...

Just keep EXPR_LITERAL_FLOATINGPOINT.

diff --git a/ast.c b/ast.c
index 945e085..617f636 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -101,89 +101,88 @@ static int right_to_left(unsigned precedence)
 static unsigned get_expression_precedence(expression_kind_t kind)
 {
        static const unsigned prec[] = {
-               [EXPR_ERROR]                             = PREC_PRIMARY,
-               [EXPR_REFERENCE]                         = PREC_PRIMARY,
-               [EXPR_ENUM_CONSTANT]                     = PREC_PRIMARY,
-               [EXPR_LITERAL_INTEGER]                   = PREC_PRIMARY,
-               [EXPR_LITERAL_FLOATINGPOINT]             = PREC_PRIMARY,
-               [EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL] = PREC_PRIMARY,
-               [EXPR_LITERAL_CHARACTER]                 = PREC_PRIMARY,
-               [EXPR_LITERAL_WIDE_CHARACTER]            = PREC_PRIMARY,
-               [EXPR_LITERAL_MS_NOOP]                   = PREC_PRIMARY,
-               [EXPR_STRING_LITERAL]                    = PREC_PRIMARY,
-               [EXPR_WIDE_STRING_LITERAL]               = PREC_PRIMARY,
-               [EXPR_COMPOUND_LITERAL]                  = PREC_UNARY,
-               [EXPR_CALL]                              = PREC_POSTFIX,
-               [EXPR_CONDITIONAL]                       = PREC_CONDITIONAL,
-               [EXPR_SELECT]                            = PREC_POSTFIX,
-               [EXPR_ARRAY_ACCESS]                      = PREC_POSTFIX,
-               [EXPR_SIZEOF]                            = PREC_UNARY,
-               [EXPR_CLASSIFY_TYPE]                     = PREC_UNARY,
-               [EXPR_ALIGNOF]                           = PREC_UNARY,
-
-               [EXPR_FUNCNAME]                          = PREC_PRIMARY,
-               [EXPR_BUILTIN_CONSTANT_P]                = PREC_PRIMARY,
-               [EXPR_BUILTIN_TYPES_COMPATIBLE_P]        = 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,
-
-               [EXPR_UNARY_NEGATE]                      = PREC_UNARY,
-               [EXPR_UNARY_PLUS]                        = PREC_UNARY,
-               [EXPR_UNARY_BITWISE_NEGATE]              = PREC_UNARY,
-               [EXPR_UNARY_NOT]                         = PREC_UNARY,
-               [EXPR_UNARY_DEREFERENCE]                 = PREC_UNARY,
-               [EXPR_UNARY_TAKE_ADDRESS]                = PREC_UNARY,
-               [EXPR_UNARY_POSTFIX_INCREMENT]           = PREC_POSTFIX,
-               [EXPR_UNARY_POSTFIX_DECREMENT]           = PREC_POSTFIX,
-               [EXPR_UNARY_PREFIX_INCREMENT]            = PREC_UNARY,
-               [EXPR_UNARY_PREFIX_DECREMENT]            = PREC_UNARY,
-               [EXPR_UNARY_CAST]                        = PREC_UNARY,
-               [EXPR_UNARY_ASSUME]                      = PREC_PRIMARY,
-               [EXPR_UNARY_DELETE]                      = PREC_UNARY,
-               [EXPR_UNARY_DELETE_ARRAY]                = PREC_UNARY,
-               [EXPR_UNARY_THROW]                       = PREC_ASSIGNMENT,
-
-               [EXPR_BINARY_ADD]                        = PREC_ADDITIVE,
-               [EXPR_BINARY_SUB]                        = PREC_ADDITIVE,
-               [EXPR_BINARY_MUL]                        = PREC_MULTIPLICATIVE,
-               [EXPR_BINARY_DIV]                        = PREC_MULTIPLICATIVE,
-               [EXPR_BINARY_MOD]                        = PREC_MULTIPLICATIVE,
-               [EXPR_BINARY_EQUAL]                      = PREC_EQUALITY,
-               [EXPR_BINARY_NOTEQUAL]                   = PREC_EQUALITY,
-               [EXPR_BINARY_LESS]                       = PREC_RELATIONAL,
-               [EXPR_BINARY_LESSEQUAL]                  = PREC_RELATIONAL,
-               [EXPR_BINARY_GREATER]                    = PREC_RELATIONAL,
-               [EXPR_BINARY_GREATEREQUAL]               = PREC_RELATIONAL,
-               [EXPR_BINARY_BITWISE_AND]                = PREC_AND,
-               [EXPR_BINARY_BITWISE_OR]                 = PREC_OR,
-               [EXPR_BINARY_BITWISE_XOR]                = PREC_XOR,
-               [EXPR_BINARY_LOGICAL_AND]                = PREC_LOGICAL_AND,
-               [EXPR_BINARY_LOGICAL_OR]                 = PREC_LOGICAL_OR,
-               [EXPR_BINARY_SHIFTLEFT]                  = PREC_SHIFT,
-               [EXPR_BINARY_SHIFTRIGHT]                 = PREC_SHIFT,
-               [EXPR_BINARY_ASSIGN]                     = PREC_ASSIGNMENT,
-               [EXPR_BINARY_MUL_ASSIGN]                 = PREC_ASSIGNMENT,
-               [EXPR_BINARY_DIV_ASSIGN]                 = PREC_ASSIGNMENT,
-               [EXPR_BINARY_MOD_ASSIGN]                 = PREC_ASSIGNMENT,
-               [EXPR_BINARY_ADD_ASSIGN]                 = PREC_ASSIGNMENT,
-               [EXPR_BINARY_SUB_ASSIGN]                 = PREC_ASSIGNMENT,
-               [EXPR_BINARY_SHIFTLEFT_ASSIGN]           = PREC_ASSIGNMENT,
-               [EXPR_BINARY_SHIFTRIGHT_ASSIGN]          = PREC_ASSIGNMENT,
-               [EXPR_BINARY_BITWISE_AND_ASSIGN]         = PREC_ASSIGNMENT,
-               [EXPR_BINARY_BITWISE_XOR_ASSIGN]         = PREC_ASSIGNMENT,
-               [EXPR_BINARY_BITWISE_OR_ASSIGN]          = PREC_ASSIGNMENT,
-               [EXPR_BINARY_COMMA]                      = PREC_EXPRESSION,
-
-               [EXPR_BINARY_ISGREATER]                  = PREC_PRIMARY,
-               [EXPR_BINARY_ISGREATEREQUAL]             = PREC_PRIMARY,
-               [EXPR_BINARY_ISLESS]                     = PREC_PRIMARY,
-               [EXPR_BINARY_ISLESSEQUAL]                = PREC_PRIMARY,
-               [EXPR_BINARY_ISLESSGREATER]              = PREC_PRIMARY,
-               [EXPR_BINARY_ISUNORDERED]                = PREC_PRIMARY
+               [EXPR_ERROR]                      = PREC_PRIMARY,
+               [EXPR_REFERENCE]                  = PREC_PRIMARY,
+               [EXPR_ENUM_CONSTANT]              = PREC_PRIMARY,
+               [EXPR_LITERAL_INTEGER]            = PREC_PRIMARY,
+               [EXPR_LITERAL_FLOATINGPOINT]      = PREC_PRIMARY,
+               [EXPR_LITERAL_CHARACTER]          = PREC_PRIMARY,
+               [EXPR_LITERAL_WIDE_CHARACTER]     = PREC_PRIMARY,
+               [EXPR_LITERAL_MS_NOOP]            = PREC_PRIMARY,
+               [EXPR_STRING_LITERAL]             = PREC_PRIMARY,
+               [EXPR_WIDE_STRING_LITERAL]        = PREC_PRIMARY,
+               [EXPR_COMPOUND_LITERAL]           = PREC_UNARY,
+               [EXPR_CALL]                       = PREC_POSTFIX,
+               [EXPR_CONDITIONAL]                = PREC_CONDITIONAL,
+               [EXPR_SELECT]                     = PREC_POSTFIX,
+               [EXPR_ARRAY_ACCESS]               = PREC_POSTFIX,
+               [EXPR_SIZEOF]                     = PREC_UNARY,
+               [EXPR_CLASSIFY_TYPE]              = PREC_UNARY,
+               [EXPR_ALIGNOF]                    = PREC_UNARY,
+
+               [EXPR_FUNCNAME]                   = PREC_PRIMARY,
+               [EXPR_BUILTIN_CONSTANT_P]         = PREC_PRIMARY,
+               [EXPR_BUILTIN_TYPES_COMPATIBLE_P] = 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,
+
+               [EXPR_UNARY_NEGATE]               = PREC_UNARY,
+               [EXPR_UNARY_PLUS]                 = PREC_UNARY,
+               [EXPR_UNARY_BITWISE_NEGATE]       = PREC_UNARY,
+               [EXPR_UNARY_NOT]                  = PREC_UNARY,
+               [EXPR_UNARY_DEREFERENCE]          = PREC_UNARY,
+               [EXPR_UNARY_TAKE_ADDRESS]         = PREC_UNARY,
+               [EXPR_UNARY_POSTFIX_INCREMENT]    = PREC_POSTFIX,
+               [EXPR_UNARY_POSTFIX_DECREMENT]    = PREC_POSTFIX,
+               [EXPR_UNARY_PREFIX_INCREMENT]     = PREC_UNARY,
+               [EXPR_UNARY_PREFIX_DECREMENT]     = PREC_UNARY,
+               [EXPR_UNARY_CAST]                 = PREC_UNARY,
+               [EXPR_UNARY_ASSUME]               = PREC_PRIMARY,
+               [EXPR_UNARY_DELETE]               = PREC_UNARY,
+               [EXPR_UNARY_DELETE_ARRAY]         = PREC_UNARY,
+               [EXPR_UNARY_THROW]                = PREC_ASSIGNMENT,
+
+               [EXPR_BINARY_ADD]                 = PREC_ADDITIVE,
+               [EXPR_BINARY_SUB]                 = PREC_ADDITIVE,
+               [EXPR_BINARY_MUL]                 = PREC_MULTIPLICATIVE,
+               [EXPR_BINARY_DIV]                 = PREC_MULTIPLICATIVE,
+               [EXPR_BINARY_MOD]                 = PREC_MULTIPLICATIVE,
+               [EXPR_BINARY_EQUAL]               = PREC_EQUALITY,
+               [EXPR_BINARY_NOTEQUAL]            = PREC_EQUALITY,
+               [EXPR_BINARY_LESS]                = PREC_RELATIONAL,
+               [EXPR_BINARY_LESSEQUAL]           = PREC_RELATIONAL,
+               [EXPR_BINARY_GREATER]             = PREC_RELATIONAL,
+               [EXPR_BINARY_GREATEREQUAL]        = PREC_RELATIONAL,
+               [EXPR_BINARY_BITWISE_AND]         = PREC_AND,
+               [EXPR_BINARY_BITWISE_OR]          = PREC_OR,
+               [EXPR_BINARY_BITWISE_XOR]         = PREC_XOR,
+               [EXPR_BINARY_LOGICAL_AND]         = PREC_LOGICAL_AND,
+               [EXPR_BINARY_LOGICAL_OR]          = PREC_LOGICAL_OR,
+               [EXPR_BINARY_SHIFTLEFT]           = PREC_SHIFT,
+               [EXPR_BINARY_SHIFTRIGHT]          = PREC_SHIFT,
+               [EXPR_BINARY_ASSIGN]              = PREC_ASSIGNMENT,
+               [EXPR_BINARY_MUL_ASSIGN]          = PREC_ASSIGNMENT,
+               [EXPR_BINARY_DIV_ASSIGN]          = PREC_ASSIGNMENT,
+               [EXPR_BINARY_MOD_ASSIGN]          = PREC_ASSIGNMENT,
+               [EXPR_BINARY_ADD_ASSIGN]          = PREC_ASSIGNMENT,
+               [EXPR_BINARY_SUB_ASSIGN]          = PREC_ASSIGNMENT,
+               [EXPR_BINARY_SHIFTLEFT_ASSIGN]    = PREC_ASSIGNMENT,
+               [EXPR_BINARY_SHIFTRIGHT_ASSIGN]   = PREC_ASSIGNMENT,
+               [EXPR_BINARY_BITWISE_AND_ASSIGN]  = PREC_ASSIGNMENT,
+               [EXPR_BINARY_BITWISE_XOR_ASSIGN]  = PREC_ASSIGNMENT,
+               [EXPR_BINARY_BITWISE_OR_ASSIGN]   = PREC_ASSIGNMENT,
+               [EXPR_BINARY_COMMA]               = PREC_EXPRESSION,
+
+               [EXPR_BINARY_ISGREATER]           = PREC_PRIMARY,
+               [EXPR_BINARY_ISGREATEREQUAL]      = PREC_PRIMARY,
+               [EXPR_BINARY_ISLESS]              = PREC_PRIMARY,
+               [EXPR_BINARY_ISLESSEQUAL]         = PREC_PRIMARY,
+               [EXPR_BINARY_ISLESSGREATER]       = PREC_PRIMARY,
+               [EXPR_BINARY_ISUNORDERED]         = PREC_PRIMARY
        };
        assert((size_t)kind < lengthof(prec));
        unsigned res = prec[kind];
@@ -253,7 +252,6 @@ static void print_literal(const literal_expression_t *literal)
 
        case EXPR_LITERAL_BOOLEAN:
        case EXPR_LITERAL_FLOATINGPOINT:
-       case EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL:
        case EXPR_LITERAL_INTEGER:
                print_stringrep(&literal->value);
                print_stringrep(&literal->suffix);

diff --git a/ast2firm.c b/ast2firm.c
index 0e9950a..eb490e5 100644 (file)
--- a/ast2firm.c
+++ b/ast2firm.c
@@ -1308,7 +1308,6 @@ static ir_node *literal_to_firm(const literal_expression_t *literal)
                break;
 
        case EXPR_LITERAL_FLOATINGPOINT:
-       case EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL:
                tv = new_tarval_from_str(string, size, mode);
                break;
 

diff --git a/ast_t.h b/ast_t.h
index a473ba1..58d6750 100644 (file)
--- a/ast_t.h
+++ b/ast_t.h
@@ -68,7 +68,6 @@ typedef enum expression_kind_t {
        EXPR_LITERAL_BOOLEAN,
        EXPR_LITERAL_INTEGER,
        EXPR_LITERAL_FLOATINGPOINT,
-       EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL,
        EXPR_LITERAL_CHARACTER,
        EXPR_LITERAL_WIDE_CHARACTER,
        EXPR_LITERAL_MS_NOOP, /**< MS __noop extension */
@@ -231,7 +230,6 @@ typedef enum funcname_kind_t {
             EXPR_LITERAL_BOOLEAN:                   \
        case EXPR_LITERAL_INTEGER:                   \
        case EXPR_LITERAL_FLOATINGPOINT:             \
-       case EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL: \
        case EXPR_LITERAL_CHARACTER:                 \
        case EXPR_LITERAL_WIDE_CHARACTER:            \
        case EXPR_LITERAL_MS_NOOP

diff --git a/parser.c b/parser.c
index 77a2772..6556b09 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -331,7 +331,6 @@ static size_t get_expression_struct_size(expression_kind_t kind)
                [EXPR_LITERAL_BOOLEAN]            = sizeof(literal_expression_t),
                [EXPR_LITERAL_INTEGER]            = sizeof(literal_expression_t),
                [EXPR_LITERAL_FLOATINGPOINT]      = sizeof(literal_expression_t),
-               [EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL] = sizeof(literal_expression_t),
                [EXPR_LITERAL_CHARACTER]          = sizeof(literal_expression_t),
                [EXPR_LITERAL_WIDE_CHARACTER]     = sizeof(literal_expression_t),
                [EXPR_STRING_LITERAL]             = sizeof(string_literal_expression_t),
@@ -5864,13 +5863,11 @@ static expression_t *parse_number_literal(void)
                break;
 
        case T_FLOATINGPOINT:
-               kind = EXPR_LITERAL_FLOATINGPOINT;
-               type = check_floatingpoint_suffix();
-               break;
        case T_FLOATINGPOINT_HEXADECIMAL:
-               kind = EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL;
+               kind = EXPR_LITERAL_FLOATINGPOINT;
                type = check_floatingpoint_suffix();
                break;
+
        default:
                panic("unexpected token type in parse_number_literal");
        }
@@ -8420,7 +8417,6 @@ static bool expression_has_effect(const expression_t *const expr)
                case EXPR_LITERAL_WIDE_CHARACTER:
                case EXPR_LITERAL_INTEGER:
                case EXPR_LITERAL_FLOATINGPOINT:
-               case EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL: return false;
                case EXPR_STRING_LITERAL:             return false;
                case EXPR_WIDE_STRING_LITERAL:        return false;