diff options
Diffstat (limited to 'gcc/cp/cp-tree.h')
| -rw-r--r-- | gcc/cp/cp-tree.h | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 1b65b6a..5f25f17 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -516,15 +516,6 @@ extern tree exception_throw_decl; enum cp_tree_index { - CPTI_JAVA_BYTE_TYPE, - CPTI_JAVA_SHORT_TYPE, - CPTI_JAVA_INT_TYPE, - CPTI_JAVA_LONG_TYPE, - CPTI_JAVA_FLOAT_TYPE, - CPTI_JAVA_DOUBLE_TYPE, - CPTI_JAVA_CHAR_TYPE, - CPTI_JAVA_BOOLEAN_TYPE, - CPTI_VOID_ZERO, CPTI_WCHAR_DECL, CPTI_VTABLE_ENTRY_TYPE, @@ -608,15 +599,6 @@ enum cp_tree_index extern tree cp_global_trees[CPTI_MAX]; -#define java_byte_type_node cp_global_trees[CPTI_JAVA_BYTE_TYPE] -#define java_short_type_node cp_global_trees[CPTI_JAVA_SHORT_TYPE] -#define java_int_type_node cp_global_trees[CPTI_JAVA_INT_TYPE] -#define java_long_type_node cp_global_trees[CPTI_JAVA_LONG_TYPE] -#define java_float_type_node cp_global_trees[CPTI_JAVA_FLOAT_TYPE] -#define java_double_type_node cp_global_trees[CPTI_JAVA_DOUBLE_TYPE] -#define java_char_type_node cp_global_trees[CPTI_JAVA_CHAR_TYPE] -#define java_boolean_type_node cp_global_trees[CPTI_JAVA_BOOLEAN_TYPE] - #define void_zero_node cp_global_trees[CPTI_VOID_ZERO] #define wchar_decl_node cp_global_trees[CPTI_WCHAR_DECL] #define vtable_entry_type cp_global_trees[CPTI_VTABLE_ENTRY_TYPE] @@ -746,6 +728,26 @@ extern tree cp_global_trees[CPTI_MAX]; destructors. */ #define vtt_parm_type cp_global_trees[CPTI_VTT_PARM_TYPE] +/* The various kinds of fundamental Java types. */ + +typedef enum java_fundamental_type_kind +{ + jtk_first, /* Must be first. */ + jtk_byte = jtk_first, + jtk_short, + jtk_int, + jtk_long, + jtk_float, + jtk_double, + jtk_char, + jtk_boolean, + jtk_last /* Must be last */ +} java_fundamental_type_kind; + +/* The fundamental Java types. */ + +extern tree java_fundamental_types[jtk_last]; + /* Global state. */ struct stmt_tree { |