X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast_t.h;h=15d87358dce61a24f02ab8b8b1d5c3f6e950f82d;hb=07b67a3196bfda09ac8d98f5b3b38eff6a2dcdbb;hp=e1611fbbd42f8654c51d1d8cc3c7938b6501307d;hpb=979fce13621246b706781035786b5d11a8e2f608;p=cparser

diff --git a/ast_t.h b/ast_t.h
index e1611fb..15d8735 100644
--- a/ast_t.h
+++ b/ast_t.h
@@ -66,9 +66,15 @@ typedef enum expression_kind_t {
 	EXPR_INVALID,
 	EXPR_REFERENCE,
 	EXPR_REFERENCE_ENUM_VALUE,
-	EXPR_CONST,
-	EXPR_CHARACTER_CONSTANT,
-	EXPR_WIDE_CHARACTER_CONSTANT,
+	EXPR_LITERAL_BOOLEAN,
+	EXPR_LITERAL_INTEGER,
+	EXPR_LITERAL_INTEGER_OCTAL,
+	EXPR_LITERAL_INTEGER_HEXADECIMAL,
+	EXPR_LITERAL_FLOATINGPOINT,
+	EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL,
+	EXPR_LITERAL_CHARACTER,
+	EXPR_LITERAL_WIDE_CHARACTER,
+	EXPR_LITERAL_MS_NOOP, /**< MS __noop extension */
 	EXPR_STRING_LITERAL,
 	EXPR_WIDE_STRING_LITERAL,
 	EXPR_COMPOUND_LITERAL,
@@ -226,6 +232,17 @@ typedef enum funcname_kind_t {
 	EXPR_UNARY_CASES_MANDATORY \
 	EXPR_UNARY_CASES_OPTIONAL
 
+#define EXPR_LITERAL_CASES                        \
+	case EXPR_LITERAL_BOOLEAN:                    \
+	case EXPR_LITERAL_INTEGER:                    \
+	case EXPR_LITERAL_INTEGER_OCTAL:              \
+	case EXPR_LITERAL_INTEGER_HEXADECIMAL:        \
+	case EXPR_LITERAL_FLOATINGPOINT:              \
+	case EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL:  \
+	case EXPR_LITERAL_CHARACTER:                  \
+	case EXPR_LITERAL_WIDE_CHARACTER:             \
+	case EXPR_LITERAL_MS_NOOP:
+
 /**
  * The base class of every expression.
  */
@@ -240,18 +257,15 @@ struct expression_base_t {
 };
 
 /**
- * A constant.
+ * integer/float constants, character and string literals
  */
-struct const_expression_t {
+struct literal_expression_t {
 	expression_base_t  base;
-	union {
-		long long      int_value;
-		long double    float_value;
-		string_t       character;
-		wide_string_t  wide_character;
-	} v;
-	bool               is_ms_noop;  /**< True, if this constant is the result
-	                                     of an microsoft __noop operator */
+	string_t           value;
+	symbol_t          *suffix;
+
+	/* ast2firm data */
+	ir_tarval         *target_value;
 };
 
 struct string_literal_expression_t {
@@ -265,11 +279,6 @@ struct funcname_expression_t {
 	string_t           value;     /**< the value once assigned. */
 };
 
-struct wide_string_literal_expression_t {
-	expression_base_t  base;
-	wide_string_t      value;
-};
-
 struct compound_literal_expression_t {
 	expression_base_t  base;
 	type_t            *type;
@@ -395,10 +404,9 @@ struct label_address_expression_t {
 union expression_t {
 	expression_kind_t                     kind;
 	expression_base_t                     base;
-	const_expression_t                    conste;
+	literal_expression_t                  literal;
+	string_literal_expression_t           string_literal;
 	funcname_expression_t                 funcname;
-	string_literal_expression_t           string;
-	wide_string_literal_expression_t      wide_string;
 	compound_literal_expression_t         compound_literal;
 	builtin_constant_expression_t         builtin_constant;
 	builtin_types_compatible_expression_t builtin_types_compatible;
@@ -449,7 +457,7 @@ struct initializer_string_t {
 
 struct initializer_wide_string_t {
 	initializer_base_t  base;
-	wide_string_t       string;
+	string_t            string;
 };
 
 struct initializer_designator_t {