89th Cygnus<->FSF quick merge

[pf3gnuchains/gcc-fork.git] / gcc / cp / cp-tree.def

diff --git a/gcc/cp/cp-tree.def b/gcc/cp/cp-tree.def
index d965783..ab271ea 100644 (file)
--- a/gcc/cp/cp-tree.def
+++ b/gcc/cp/cp-tree.def
@@ -27,7 +27,7 @@ Boston, MA 02111-1307, USA.  */
    Operand 0 is the object within which the offset is taken.
    Operand 1 is the offset.  The language independent OFFSET_REF
    just won't work for us.  */
-DEFTREECODE (CP_OFFSET_REF, "cp_offset_ref", "r", 2)
+DEFTREECODE (OFFSET_REF, "offset_ref", "r", 2)
 
 /* For DELETE_EXPR, operand 0 is the store to be destroyed.
    Operand 1 is the value to pass to the destroying function
@@ -35,15 +35,6 @@ DEFTREECODE (CP_OFFSET_REF, "cp_offset_ref", "r", 2)
 DEFTREECODE (DELETE_EXPR, "dl_expr", "e", 2)
 DEFTREECODE (VEC_DELETE_EXPR, "vec_dl_expr", "e", 2)
 
-/* For a UNSAVE_EXPR, operand 0 is the value to unsave.  By unsave, we
-   mean that all _EXPRs such as TARGET_EXPRs, SAVE_EXPRs,
-   CALL_EXPRs and RTL_EXPRs, that are protected
-   from being evaluated more than once should be reset so that a new
-   expand_expr call of this expr will cause those to be re-evaluated.
-   This is useful when we want to reuse a tree in different places,
-   but where we must re-expand.  */
-DEFTREECODE (UNSAVE_EXPR, "unsave_expr", "e", 1)
-
 /* Value is reference to particular overloaded class method.
    Operand 0 is the class name (an IDENTIFIER_NODE);
    operand 1 is the field (also an IDENTIFIER_NODE).
@@ -59,7 +50,7 @@ DEFTREECODE (MEMBER_REF, "member_ref", "r", 2)
    operator converts to.  Operand is expression to be converted.  */
 DEFTREECODE (TYPE_EXPR, "type_expr", "e", 1)
 
-/* For CPLUS_NEW_EXPR, operand 0 is function which performs initialization,
+/* For NEW_EXPR, operand 0 is function which performs initialization,
    operand 1 is argument list to initialization function,
    and operand 2 is the slot which was allocated for this expression.  */
 DEFTREECODE (NEW_EXPR, "nw_expr", "e", 3)
@@ -69,6 +60,11 @@ DEFTREECODE (VEC_NEW_EXPR, "vec_nw_expr", "e", 3)
    else it is NULL_TREE.  */
 DEFTREECODE (THROW_EXPR, "throw_expr", "e", 1)
 
+/* Initialization of a vector, used in build_new.  Operand 0 is the target
+   of the initialization, operand 1 is the initializer, and operand 2 is
+   the number of elements.  */
+DEFTREECODE (VEC_INIT_EXPR, "vec_init_expr", "e", 3)
+
 /* Template definition.  The following fields have the specified uses,
    although there are other macros in cp-tree.h that should be used for
    accessing this data.
@@ -118,13 +114,17 @@ DEFTREECODE (LOOKUP_EXPR, "lookup_expr", "e", 2)
 DEFTREECODE (MODOP_EXPR, "modop_expr", "e", 3)
 DEFTREECODE (CAST_EXPR, "cast_expr", "1", 1)
 DEFTREECODE (REINTERPRET_CAST_EXPR, "reinterpret_cast_expr", "1", 1)
+DEFTREECODE (CONST_CAST_EXPR, "const_cast_expr", "1", 1)
+DEFTREECODE (STATIC_CAST_EXPR, "static_cast_expr", "1", 1)
+DEFTREECODE (DYNAMIC_CAST_EXPR, "dynamic_cast_expr", "1", 1)
 DEFTREECODE (SIZEOF_EXPR, "sizeof_expr", "1", 1)
 DEFTREECODE (ARROW_EXPR, "arrow_expr", "e", 1)
 DEFTREECODE (DOTSTAR_EXPR, "dotstar_expr", "e", 2)
+DEFTREECODE (TYPEID_EXPR, "typeid_expr", "e", 1)
 
 DEFTREECODE (EXPR_STMT, "expr_stmt", "e", 1)
 DEFTREECODE (COMPOUND_STMT, "compound_stmt", "e", 1)
-DEFTREECODE (DECL_STMT, "decl_stmt", "e", 4)
+DEFTREECODE (DECL_STMT, "decl_stmt", "e", 3)
 DEFTREECODE (IF_STMT, "if_stmt", "e", 3)
 DEFTREECODE (FOR_STMT, "for_stmt", "e", 4)
 DEFTREECODE (WHILE_STMT, "while_stmt", "e", 2)
@@ -137,3 +137,16 @@ DEFTREECODE (GOTO_STMT, "goto_stmt", "e", 1)
 
 DEFTREECODE (CTOR_INITIALIZER, "ctor_initializer", "e", 2)
 DEFTREECODE (CASE_LABEL, "case_label", "e", 2)
+DEFTREECODE (RETURN_INIT, "return_init", "e", 2)
+
+DEFTREECODE (IDENTITY_CONV, "identity_conv", "e", 1)
+DEFTREECODE (LVALUE_CONV, "lvalue_conv", "e", 1)
+DEFTREECODE (QUAL_CONV, "qual_conv", "e", 1)
+DEFTREECODE (STD_CONV, "std_conv", "e", 1)
+DEFTREECODE (PTR_CONV, "ptr_conv", "e", 1)
+DEFTREECODE (PMEM_CONV, "pmem_conv", "e", 1)
+DEFTREECODE (BASE_CONV, "base_conv", "e", 1)
+DEFTREECODE (REF_BIND, "ref_bind", "e", 1)
+DEFTREECODE (USER_CONV, "user_conv", "e", 4)
+DEFTREECODE (AMBIG_CONV, "ambig_conv", "e", 1)
+DEFTREECODE (RVALUE_CONV, "rvalue_conv", "e", 1)