diff options
| author | gdr <gdr@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-12-02 01:31:42 +0000 |
|---|---|---|
| committer | gdr <gdr@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-12-02 01:31:42 +0000 |
| commit | c31fdaf6c04044990088f65f9316c458793feb44 (patch) | |
| tree | e36fa951f2adada32792fa62b70b56b41215e112 | |
| parent | b118a35b7ae367b9618f01ae991029edaf631562 (diff) | |
| download | gcc-c31fdaf6c04044990088f65f9316c458793feb44.tar.gz | |
* parser.c (cp_parser_make_typename_type): Call make_typename_type
with tf_none instead of magic value 0.
(cp_parser_explicit_instantiation): Call do_type_instantiation
with tf_error instead of magic value 1.
(cp_parser_elaborated_type_specifier): Call make_typename_type
with tf_error instead of magic value 1.
(cp_parser_class_name): Likewise.
(cp_parser_lookup_name): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@107855 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 11 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 14 |
2 files changed, 19 insertions, 6 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 80c24ddb06b..209f403bcb8 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,16 @@ 2005-12-01 Gabriel Dos Reis <gdr@integrable-solutions.net> + * parser.c (cp_parser_make_typename_type): Call make_typename_type + with tf_none instead of magic value 0. + (cp_parser_explicit_instantiation): Call do_type_instantiation + with tf_error instead of magic value 1. + (cp_parser_elaborated_type_specifier): Call make_typename_type + with tf_error instead of magic value 1. + (cp_parser_class_name): Likewise. + (cp_parser_lookup_name): Likewise. + +2005-12-01 Gabriel Dos Reis <gdr@integrable-solutions.net> + * parser.c (cp_parser_declaration): Set token2.type to CPP_EOF, not RID_MAX. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index daec37d896e..e5b43b0d4af 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -2417,7 +2417,7 @@ cp_parser_make_typename_type (cp_parser *parser, tree scope, tree id) if (TREE_CODE (id) == IDENTIFIER_NODE) { result = make_typename_type (scope, id, typename_type, - /*complain=*/0); + /*complain=*/tf_none); if (result == error_mark_node) cp_parser_diagnose_invalid_type_name (parser, scope, id); return result; @@ -9243,7 +9243,8 @@ cp_parser_explicit_instantiation (cp_parser* parser) template instantiation. */ pop_deferring_access_checks (); if (type) - do_type_instantiation (type, extension_specifier, /*complain=*/1); + do_type_instantiation (type, extension_specifier, + /*complain=*/tf_error); } else { @@ -9953,7 +9954,7 @@ cp_parser_elaborated_type_specifier (cp_parser* parser, && tag_type == typename_type) type = make_typename_type (parser->scope, decl, typename_type, - /*complain=*/1); + /*complain=*/tf_error); else type = TREE_TYPE (decl); } @@ -12588,7 +12589,8 @@ cp_parser_class_name (cp_parser *parser, /* If this is a typename, create a TYPENAME_TYPE. */ if (typename_p && decl != error_mark_node) { - decl = make_typename_type (scope, decl, typename_type, /*complain=*/1); + decl = make_typename_type (scope, decl, typename_type, + /*complain=*/tf_error); if (decl != error_mark_node) decl = TYPE_NAME (decl); } @@ -14609,7 +14611,7 @@ cp_parser_lookup_name (cp_parser *parser, tree name, A::B' should be considered a type-name, even if `A' is dependent. */ type = make_typename_type (parser->scope, name, tag_type, - /*complain=*/1); + /*complain=*/tf_error); decl = TYPE_NAME (type); } else if (is_template @@ -14618,7 +14620,7 @@ cp_parser_lookup_name (cp_parser *parser, tree name, CPP_CLOSE_PAREN))) decl = make_unbound_class_template (parser->scope, name, NULL_TREE, - /*complain=*/1); + /*complain=*/tf_error); else decl = build_qualified_name (/*type=*/NULL_TREE, parser->scope, name, |