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 (OFFSET_REF, "offset_ref", "r", 2)
+DEFTREECODE (OFFSET_REF, "offset_ref", 'r', 2)
+
+/* For NEW_EXPR, operand 0 is the placement list.
+ Operand 1 is the new-declarator.
+ Operand 2 is the initializer. */
+DEFTREECODE (NEW_EXPR, "nw_expr", 'e', 3)
+DEFTREECODE (VEC_NEW_EXPR, "vec_nw_expr", 'e', 3)
/* For DELETE_EXPR, operand 0 is the store to be destroyed.
Operand 1 is the value to pass to the destroying function
saying whether the store should be deallocated as well. */
-DEFTREECODE (DELETE_EXPR, "dl_expr", "e", 2)
-DEFTREECODE (VEC_DELETE_EXPR, "vec_dl_expr", "e", 2)
+DEFTREECODE (DELETE_EXPR, "dl_expr", 'e', 2)
+DEFTREECODE (VEC_DELETE_EXPR, "vec_dl_expr", 'e', 2)
/* 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).
The COMPLEXITY field holds the class level (usually 0). */
-DEFTREECODE (SCOPE_REF, "scope_ref", "r", 2)
+DEFTREECODE (SCOPE_REF, "scope_ref", 'r', 2)
/* When composing an object with a member, this is the result.
Operand 0 is the object. Operand 1 is the member (usually
a dereferenced pointer to member). */
-DEFTREECODE (MEMBER_REF, "member_ref", "r", 2)
+DEFTREECODE (MEMBER_REF, "member_ref", 'r', 2)
/* Type conversion operator in C++. TREE_TYPE is type that this
operator converts to. Operand is expression to be converted. */
-DEFTREECODE (TYPE_EXPR, "type_expr", "e", 1)
+DEFTREECODE (TYPE_EXPR, "type_expr", 'e', 1)
-/* For NEW_EXPR, operand 0 is function which performs initialization,
+/* For AGGR_INIT_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)
-DEFTREECODE (VEC_NEW_EXPR, "vec_nw_expr", "e", 3)
+DEFTREECODE (AGGR_INIT_EXPR, "aggr_init_expr", 'e', 3)
/* A throw expression. operand 0 is the expression, if there was one,
else it is NULL_TREE. */
-DEFTREECODE (THROW_EXPR, "throw_expr", "e", 1)
+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)
+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
DECL_RESULT decl for object to be created
(e.g., FUNCTION_DECL with tmpl parms used)
*/
-DEFTREECODE (TEMPLATE_DECL, "template_decl", "d", 0)
+DEFTREECODE (TEMPLATE_DECL, "template_decl", 'd', 0)
+
+/* Index into a template parameter list. This parameter must be a type.
+ Use TYPE_FIELDS to find parmlist and index. */
+DEFTREECODE (TEMPLATE_TYPE_PARM, "template_type_parm", 't', 0)
/* Index into a template parameter list. This parameter must be a type.
+ If it is used in signature of a template, TEMPLATE_INFO is NULL_TREE.
+ Otherwise it is used to declare a type like TT<int>.
Use TYPE_FIELDS to find parmlist and index. */
-DEFTREECODE (TEMPLATE_TYPE_PARM, "template_type_parm", "t", 0)
+DEFTREECODE (TEMPLATE_TEMPLATE_PARM, "template_template_parm", 't', 0)
/* A type designated by 'typename T::t'. */
-DEFTREECODE (TYPENAME_TYPE, "typename_type", "t", 0)
+DEFTREECODE (TYPENAME_TYPE, "typename_type", 't', 0)
/* Index into a template parameter list. This parameter must not be a
type. */
-DEFTREECODE (TEMPLATE_CONST_PARM, "template_const_parm", "c", 2)
+DEFTREECODE (TEMPLATE_CONST_PARM, "template_const_parm", 'c', 3)
/* A thunk is a stub function.
(which is an ADDR_EXPR whose operand is a FUNCTION_DECL).
Other kinds of thunks may be defined later. */
-DEFTREECODE (THUNK_DECL, "thunk_decl", "d", 0)
+DEFTREECODE (THUNK_DECL, "thunk_decl", 'd', 0)
/* A namespace declaration. */
-DEFTREECODE (NAMESPACE_DECL, "namespace_decl", "d", 0)
+DEFTREECODE (NAMESPACE_DECL, "namespace_decl", 'd', 0)
/* A using declaration. DECL_INITIAL contains the specified scope.
This is not an alias, but is later expanded into multiple aliases. */
-DEFTREECODE (USING_DECL, "using_decl", "d", 0)
-
-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 (EXPR_STMT, "expr_stmt", "e", 1)
-DEFTREECODE (COMPOUND_STMT, "compound_stmt", "e", 1)
-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)
-DEFTREECODE (DO_STMT, "do_stmt", "e", 2)
-DEFTREECODE (RETURN_STMT, "return_stmt", "e", 1)
-DEFTREECODE (BREAK_STMT, "break_stmt", "e", 0)
-DEFTREECODE (CONTINUE_STMT, "continue_stmt", "e", 0)
-DEFTREECODE (SWITCH_STMT, "switch_stmt", "e", 2)
-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)
+DEFTREECODE (USING_DECL, "using_decl", 'd', 0)
+
+/* An un-parsed default argument. Looks like an IDENTIFIER_NODE. */
+DEFTREECODE (DEFAULT_ARG, "default_arg", 'c', 2)
+
+/* A template-id, like foo<int>. The first operand is the template.
+ The second is the list of explicitly specified arguments. The
+ template will be a FUNCTION_DECL, TEMPLATE_DECL, or a list of
+ overloaded functions and templates if the template-id refers to
+ a global template. If the template-id refers to a member template,
+ the template will will be an IDENTIFIER_NODE. */
+DEFTREECODE (TEMPLATE_ID_EXPR, "template_id_expr", 'e', 2)
+
+/* A whole bunch of tree codes for the initial, superficial parsing of
+ templates. */
+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 (ALIGNOF_EXPR, "alignof_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', 3)
+DEFTREECODE (IF_STMT, "if_stmt", 'e', 3)
+DEFTREECODE (FOR_STMT, "for_stmt", 'e', 4)
+DEFTREECODE (WHILE_STMT, "while_stmt", 'e', 2)
+DEFTREECODE (DO_STMT, "do_stmt", 'e', 2)
+DEFTREECODE (RETURN_STMT, "return_stmt", 'e', 1)
+DEFTREECODE (BREAK_STMT, "break_stmt", 'e', 0)
+DEFTREECODE (CONTINUE_STMT, "continue_stmt", 'e', 0)
+DEFTREECODE (SWITCH_STMT, "switch_stmt", 'e', 2)
+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 (TRY_BLOCK, "try_stmt", 'e', 2)
+DEFTREECODE (HANDLER, "catch_stmt", '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)
+
+DEFTREECODE (TAG_DEFN, "tag_defn", 'e', 0)