Skip to content

R
riscv-gcc-1
Commit 2a13a625 by Gabriel Dos Reis Committed by Gabriel Dos Reis
Options

Convert diagnostics to use quoting flag q 4/n 

        Convert diagnostics to use quoting flag q 4/n
        * parser.c (cp_parser_name_lookup_error,
        cp_parser_diagnose_invalid_type_name,
        cp_parser_primary_expression, cp_parser_unqualified_id,
        cp_parser_nested_name_specifier_opt,
        cp_parser_labeled_statement,
        cp_parser_jump_statement, cp_parser_simple_declaration,
        cp_parser_decl_specifier_seq, cp_parser_mem_initializer_id,
        cp_parser_type_parameter, cp_parser_template_id,
        cp_parser_template_name, cp_parser_direct_declarator,
        cp_parser_parameter_declaration_list, cp_parser_class_head,
        cp_parser_base_specifier, cp_parser_lookup_name,
        cp_parser_late_parsing_default_args,
        cp_parser_optional_template_keyword
        cp_parser_elaborated_type_specifier,
        cp_parser_check_class_key,
        cp_parser_check_access_in_redeclaration): Use quoting marks.

        * name-lookup.c (supplement_binding, pushdecl,
        check_for_out_of_scope_variable,
        validate_nonmember_using_decl,
        do_nonmember_using_decl, lookup_tag, set_decl_namespace,
        push_namespace, do_namespace_alias, do_using_directive,
        ambiguous_decl, lookup_namespace_name, add_function):
        Likewise.

        * method.c (use_thunk): Likewise.

        * lex.c (unqualified_name_lookup_error,
        unqualified_fn_lookup_error): Likewise.

testsuite/
merlin[1:17]% cd build
~
merlin[1:17]% ls
~/build
3  4  4.0.0  c++0x  r  tree
merlin[1:17]% cd 4.0.0
~/build
merlin[1:17]% cd gcc
~/build/4.0.0
merlin[1:17]% make check-g++
~/build/4.0.0/gcc
(rootme=`${PWDCMD-pwd}`; export rootme; \
srcdir=`cd /home/gdr/redhat/egcs/gcc; ${PWDCMD-pwd}` ; export srcdir ;
\
cd testsuite; \
EXPECT=`if [ -f ${rootme}/../expect/expect ] ; then echo
${rootme}/../expect/expect ; else echo expect ; fi` ; export EXPECT ;
\
if [ -f ${rootme}/../expect/expect ] ; then  \
   TCL_LIBRARY=`cd .. ; cd /home/gdr/redhat/egcs/gcc/../tcl/library ;
   ${PWDCMD-pwd}` ; \
    export TCL_LIBRARY ; fi ; \
`if [ -f ${srcdir}/../dejagnu/runtest ] ; then echo
${srcdir}/../dejagnu/runtest ; else echo runtest; fi` --tool g++ )
Test Run By gdr on Tue Oct  5 01:18:04 2004
Native configuration is i686-pc-linux-gnu

                === g++ tests ===

Schedule of variations:
    unix

Running target unix
Using /usr/share/dejagnu/baseboards/unix.exp as board description file
for target.
Using /usr/share/dejagnu/config/unix.exp as generic interface file for
target.
Using /home/gdr/redhat/egcs/gcc/testsuite/config/default.exp as
tool-and-target-specific interface file.
Running /home/gdr/redhat/egcs/gcc/testsuite/g++.dg/bprob/bprob.exp ...
Running /home/gdr/redhat/egcs/gcc/testsuite/g++.dg/charset/charset.exp
...Running /home/gdr/redhat/egcs/gcc/testsuite/g++.dg/compat/compat.exp
...Running /home/gdr/redhat/egcs/gcc/testsuite/g++.dg/debug/debug.exp ...
Running /home/gdr/redhat/egcs/gcc/testsuite/g++.dg/dg.exp ...
FAIL: g++.dg/other/classkey1.C  (test for errors, line 9)
FAIL: g++.dg/other/classkey1.C  (test for errors, line 11)
FAIL: g++.dg/other/classkey1.C  (test for errors, line 14)
FAIL: g++.dg/other/classkey1.C  (test for errors, line 17)
FAIL: g++.dg/other/classkey1.C (test for excess errors)
FAIL: g++.dg/parse/error15.C  (test for errors, line 13)
FAIL: g++.dg/parse/error15.C  (test for errors, line 14)
FAIL: g++.dg/parse/error15.C  (test for errors, line 15)
FAIL: g++.dg/parse/error15.C  (test for errors, line 21)
FAIL: g++.dg/parse/error15.C  (test for errors, line 22)
FAIL: g++.dg/parse/error15.C  (test for errors, line 23)
FAIL: g++.dg/parse/error15.C  (test for errors, line 31)
FAIL: g++.dg/parse/error15.C  (test for errors, line 32)
FAIL: g++.dg/parse/error15.C  (test for errors, line 33)
FAIL: g++.dg/parse/error15.C (test for excess errors)
XPASS: g++.dg/rtti/tinfo1.C scan-assembler _ZTIP9CTemplateIhE:
XPASS: g++.dg/rtti/tinfo1.C scan-assembler-not .globl[
\t]+_ZTIP9CTemplateIhE
XPASS: g++.dg/rtti/tinfo1.C scan-assembler-not
.section[^\n\r]*_ZTIP9CTemplateIhE[^\n\r]*FAIL: g++.dg/template/meminit2.C  (test for errors, line 10)
FAIL: g++.dg/template/meminit2.C  (test for errors, line 11)
FAIL: g++.dg/template/meminit2.C (test for excess errors)
Running /home/gdr/redhat/egcs/gcc/testsuite/g++.dg/gcov/gcov.exp ...
FAIL: 102:is -:should be 1
FAIL: g++.dg/gcov/gcov-1.C gcov: 1 failures in line counts, 0 in
branch percentamerlin[1:27]% make check-g++
~/build/4.0.0/gcc
(rootme=`${PWDCMD-pwd}`; export rootme; \
srcdir=`cd /home/gdr/redhat/egcs/gcc; ${PWDCMD-pwd}` ; export srcdir ;
\
cd testsuite; \
EXPECT=`if [ -f ${rootme}/../expect/expect ] ; then echo
${rootme}/../expect/expect ; else echo expect ; fi` ; export EXPECT ;
\
if [ -f ${rootme}/../expect/expect ] ; then  \
   TCL_LIBRARY=`cd .. ; cd /home/gdr/redhat/egcs/gcc/../tcl/library ;
   ${PWDCMD-pwd}` ; \
    export TCL_LIBRARY ; fi ; \
`if [ -f ${srcdir}/../dejagnu/runtest ] ; then echo
${srcdir}/../dejagnu/runtest ; else echo runtest; fi` --tool g++ )
Test Run By gdr on Tue Oct  5 01:27:39 2004
Native configuration is i686-pc-linux-gnu

                === g++ tests ===

Schedule of variations:
    unix

Running target unix
Using /usr/share/dejagnu/baseboards/unix.exp as board description file
for target.
Using /usr/share/dejagnu/config/unix.exp as generic interface file for
tar       method.c
cfns.gperf           cxx-pretty-print.c  method.c.~1.315.~
cfns.h               cxx-pretty-print.h  name-lookup.c
ChangeLog            decl2.c             name-lookup.c.~1.85.~
ChangeLog.1          decl.c              name-lookup.h
ChangeLog.~1.4404.~  decl.h              NEWS
ChangeLog.2          dump.c              operators.def
ChangeLog.3          error.c             optimize.c
ChangeLog.egcs       except.c            parser.c
ChangeLog.tree-ssa   expr.c              parser.c.~1.258.~
class.c              friend.c            pt.c
config-lang.in       g++spec.c           ptree.c
cp-gimplify.c        init.c              repo.c
cp-lang.c            init.c.~1.396.~     rtti.c
cp-objcp-common.c    lang-specs.h        search.c
cp-objcp-common.h    lex.c               semantics.c
cp-tree.def          lex.c.~1.349.~      tree.c
cp-tree.h            Make-lang.in        typeck2.c
CVS                  mangle.c            typeck.c
merlin[7:37]% cvs -z9 diff -p > ~/d-5.patch
~/redhat/egcs/gcc/cp
Enter passphrase for RSA key '/home/gdr/.ssh/identity': cvs [diff
aborted]: received interrupt signal

merlin[7:37]% cvs -z9 diff -p > ~/d-5.patch
~/redhat/egcs/gcc/cp
Warning: Remote host denied X11 forwarding.
Warning: Remote host denied authentication agent forwarding.
cvs diff: Diffing .
merlin[7:38]% l ~/d-5.patch
~/redhat/egcs/gcc/cp
merlin[7:39]% cvs -z9 diff -p > ~/d-5.patch
~/redhat/egcs/gcc/cp
Warning: Remote host denied X11 forwarding.
Warning: Remote host denied authentication agent forwarding.
cvs diff: Diffing .
merlin[7:40]% l ~/d-5.patch
~/redhat/egcs/gcc/cp
You have new mail.
merlin[8:21]% cvs -z9 commit
~/redhat/egcs/gcc/cp
merlin[8:21]% cd .
~/redhat/egcs/gcc/cp
merlin[8:21]% cvs -z9 commit cp testsuite
~/redhat/egcs/gcc/cp
cvs commit: nothing known about `cp'
cvs commit: nothing known about `testsuite'
cvs [commit aborted]: correct above errors first!
merlin[8:21]% cd ..
~/redhat/egcs/gcc/cp
merlin[8:21]% cvs -z9 commit cp testsuite
~/redhat/egcs/gcc
cvs commit: Examining cp
cvs commit: Examining testsuite
cvs commit: Examining testsuite/ada
cvs commit: Examining testsuite/ada/acats
cvs commit: Examining testsuite/ada/acats/support
cvs commit: Examining testsuite/ada/acats/tests
cvs commit: Examining testsuite/ada/acats/tests/a
cvs commit: Examining testsuite/ada/acats/tests/c2
cvs commit: Examining testsuite/ada/acats/tests/c3
cvs commit: Examining testsuite/ada/acats/tests/c4
cvs commit: Examining testsuite/ada/acats/tests/c5
cvs commit: Examining testsuite/ada/acats/tests/c6
cvs commit: Examining testsuite/ada/acats/tests/c7
cvs commit: Examining testsuite/ada/acats/tests/c8
cvs commit: Examining testsuite/ada/acats/tests/c9
cvs commit: Examining testsuite/ada/acats/tests/ca
cvs commit: Examining testsuite/ada/acats/tests/cb
cvs commit: Examining testsuite/ada/acats/tests/cc
cvs commit: Examining testsuite/ada/acats/tests/cd
cvs commit: Examining testsuite/ada/acats/tests/ce
cvs commit: Examining testsuite/ada/acats/tests/cxa
cvs commit: Examining testsuite/ada/acats/tests/cxb
cvs commit: Examining testsuite/ada/acats/tests/cxf
cvs commit: Examining testsuite/ada/acats/tests/cxg
cvs commit: Examining testsuite/ada/acats/tests/cxh
cvs commit: Examining testsuite/ada/acats/tests/cz
cvs commit: Examining testsuite/ada/acats/tests/d
cvs commit: Examining testsuite/ada/acats/tests/e
cvs commit: Examining testsuite/ada/acats/tests/gcc
cvs commit: Examining testsuite/ada/acats/tests/l
cvs commit: Examining testsuite/config
cvs commit: Examining testsuite/consistency.vlad
cvs commit: Examining testsuite/consistency.vlad/layout
cvs commit: Examining
testsuite/consistency.vlad/layout/i960-97r2-results
cvs commit: Examining testsuite/g++.dg
cvs commit: Examining testsuite/g++.dg/abi
cvs commit: Examining testsuite/g++.dg/bprob
cvs commit: Examining testsuite/g++.dg/charset
cvs commit: Examining testsuite/g++.dg/compat
cvs commit: Examining testsuite/g++.dg/compat/abi
cvs commit: Examinin

From-SVN: r88552
parent c4ad648e
Showing with 59 additions and 22 deletions
gcc/cp/ChangeLog
2004-10-04 Gabriel Dos Reis <gdr@integrable-solutions.net> 2004-10-04 Gabriel Dos Reis <gdr@integrable-solutions.net>
Convert diagnostics to use quoting flag q 4/n Convert diagnostics to use quoting flag q 4/n
* parser.c (cp_parser_name_lookup_error,
cp_parser_diagnose_invalid_type_name,
cp_parser_primary_expression, cp_parser_unqualified_id,
cp_parser_nested_name_specifier_opt, cp_parser_labeled_statement,
cp_parser_jump_statement, cp_parser_simple_declaration,
cp_parser_decl_specifier_seq, cp_parser_mem_initializer_id,
cp_parser_type_parameter, cp_parser_template_id,
cp_parser_template_name, cp_parser_direct_declarator,
cp_parser_parameter_declaration_list, cp_parser_class_head,
cp_parser_base_specifier, cp_parser_lookup_name,
cp_parser_late_parsing_default_args,
cp_parser_optional_template_keyword
cp_parser_elaborated_type_specifier, cp_parser_check_class_key,
cp_parser_check_access_in_redeclaration): Use quoting marks.
* name-lookup.c (supplement_binding, pushdecl,
check_for_out_of_scope_variable, validate_nonmember_using_decl,
do_nonmember_using_decl, lookup_tag, set_decl_namespace,
push_namespace, do_namespace_alias, do_using_directive,
ambiguous_decl, lookup_namespace_name, add_function): Likewise.
* method.c (use_thunk): Likewise.
* lex.c (unqualified_name_lookup_error,
unqualified_fn_lookup_error): Likewise.
2004-10-04 Gabriel Dos Reis <gdr@integrable-solutions.net>
Convert diagnostics to use quoting flag q 4/n
* except.c (decl_is_java_type, build_throw, * except.c (decl_is_java_type, build_throw,
is_admissible_throw_operand, check_handlers_1, check_handlers): is_admissible_throw_operand, check_handlers_1, check_handlers):
Use quoting formats. Use quoting formats.
......
gcc/cp/lex.c
...@@ -566,11 +566,11 @@ unqualified_name_lookup_error (tree name) ...@@ -566,11 +566,11 @@ unqualified_name_lookup_error (tree name)
if (IDENTIFIER_OPNAME_P (name)) if (IDENTIFIER_OPNAME_P (name))
{ {
if (name != ansi_opname (ERROR_MARK)) if (name != ansi_opname (ERROR_MARK))
error ("`%D' not defined", name); error ("%qD not defined", name);
} }
else else
{ {
error ("`%D' was not declared in this scope", name); error ("%qD was not declared in this scope", name);
/* Prevent repeated error messages by creating a VAR_DECL with /* Prevent repeated error messages by creating a VAR_DECL with
this NAME in the innermost block scope. */ this NAME in the innermost block scope. */
if (current_function_decl) if (current_function_decl)
...@@ -607,8 +607,8 @@ unqualified_fn_lookup_error (tree name) ...@@ -607,8 +607,8 @@ unqualified_fn_lookup_error (tree name)
Note that we have the exact wording of the following message in Note that we have the exact wording of the following message in
the manual (trouble.texi, node "Name lookup"), so they need to the manual (trouble.texi, node "Name lookup"), so they need to
be kept in synch. */ be kept in synch. */
pedwarn ("there are no arguments to `%D' that depend on a template " pedwarn ("there are no arguments to %qD that depend on a template "
"parameter, so a declaration of `%D' must be available", "parameter, so a declaration of %qD must be available",
name, name); name, name);
if (!flag_permissive) if (!flag_permissive)
......
gcc/cp/method.c
...@@ -440,7 +440,7 @@ use_thunk (tree thunk_fndecl, bool emit_p) ...@@ -440,7 +440,7 @@ use_thunk (tree thunk_fndecl, bool emit_p)
doesn't work for varargs. */ doesn't work for varargs. */
if (varargs_function_p (function)) if (varargs_function_p (function))
error ("generic thunk code fails for method `%#D' which uses `...'", error ("generic thunk code fails for method %q#D which uses %<...%>",
function); function);
DECL_RESULT (thunk_fndecl) = NULL_TREE; DECL_RESULT (thunk_fndecl) = NULL_TREE;
...@@ -649,12 +649,14 @@ do_build_assign_ref (tree fndecl) ...@@ -649,12 +649,14 @@ do_build_assign_ref (tree fndecl)
if (CP_TYPE_CONST_P (TREE_TYPE (field))) if (CP_TYPE_CONST_P (TREE_TYPE (field)))
{ {
error ("non-static const member `%#D', can't use default assignment operator", field); error ("non-static const member %q#D, can't use default "
"assignment operator", field);
continue; continue;
} }
else if (TREE_CODE (TREE_TYPE (field)) == REFERENCE_TYPE) else if (TREE_CODE (TREE_TYPE (field)) == REFERENCE_TYPE)
{ {
error ("non-static reference member `%#D', can't use default assignment operator", field); error ("non-static reference member %q#D, can't use "
"default assignment operator", field);
continue; continue;
} }
......
gcc/testsuite/ChangeLog
2004-10-05 Gabriel Dos Reis <gdr@integrable-solutions.net>
* g++.dg/other/classkey1.C: Adjust quoting marks.
* g++.dg/parse/error15.C: Likewise.
* g++.dg/template/meminit2.C (int>): Likewise.
2004-10-04 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> 2004-10-04 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de>
PR fortran/17283 PR fortran/17283
......
gcc/testsuite/g++.dg/other/classkey1.C
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
// PR 775. Some mismatches which were broken. // PR 775. Some mismatches which were broken.
template <class T> struct A {}; template <class T> struct A {};
union A<int> a; // { dg-error "`union' tag" "" } union A<int> a; // { dg-error "'union' tag" "" }
template <> union A<float> {}; // { dg-error "`union' tag" "" } template <> union A<float> {}; // { dg-error "'union' tag" "" }
struct B {}; struct B {};
union B b; // { dg-error "`union' tag" "" } union B b; // { dg-error "'union' tag" "" }
union C {}; union C {};
class C c; // { dg-error "`class' tag" "" } class C c; // { dg-error "'class' tag" "" }
gcc/testsuite/g++.dg/parse/error15.C
...@@ -10,17 +10,17 @@ namespace N ...@@ -10,17 +10,17 @@ namespace N
} }
N::A f2; // { dg-error "without an argument list" } N::A f2; // { dg-error "without an argument list" }
N::INVALID f3; // { dg-error "in namespace `N' does not name a type" } N::INVALID f3; // { dg-error "in namespace 'N' does not name a type" }
N::C::INVALID f4; // { dg-error "in class `N::C' does not name a type" } N::C::INVALID f4; // { dg-error "in class 'N::C' does not name a type" }
N::K f6; // { dg-error "in namespace `N' does not name a type" } N::K f6; // { dg-error "in namespace 'N' does not name a type" }
typename N::A f7; // { dg-error "without an argument list|outside of template" } typename N::A f7; // { dg-error "without an argument list|outside of template" }
struct B struct B
{ {
N::A f2; // { dg-error "without an argument list" } N::A f2; // { dg-error "without an argument list" }
N::INVALID f3; // { dg-error "in namespace `N' does not name a type" } N::INVALID f3; // { dg-error "in namespace 'N' does not name a type" }
N::C::INVALID f4; // { dg-error "in class `N::C' does not name a type" } N::C::INVALID f4; // { dg-error "in class 'N::C' does not name a type" }
N::K f6; // { dg-error "in namespace `N' does not name a type" } N::K f6; // { dg-error "in namespace 'N' does not name a type" }
typename N::A f7; // { dg-error "without an argument list|outside of template" } typename N::A f7; // { dg-error "without an argument list|outside of template" }
}; };
...@@ -28,9 +28,9 @@ template <int> ...@@ -28,9 +28,9 @@ template <int>
struct C struct C
{ {
N::A f2; // { dg-error "without an argument list" } N::A f2; // { dg-error "without an argument list" }
N::INVALID f3; // { dg-error "in namespace `N' does not name a type" } N::INVALID f3; // { dg-error "in namespace 'N' does not name a type" }
N::C::INVALID f4; // { dg-error "in class `N::C' does not name a type" } N::C::INVALID f4; // { dg-error "in class 'N::C' does not name a type" }
N::K f6; // { dg-error "in namespace `N' does not name a type" } N::K f6; // { dg-error "in namespace 'N' does not name a type" }
typename N::A f7; // { dg-error "without an argument list" } typename N::A f7; // { dg-error "without an argument list" }
}; };
......
gcc/testsuite/g++.dg/template/meminit2.C
...@@ -7,8 +7,8 @@ template <typename K1> struct O { ...@@ -7,8 +7,8 @@ template <typename K1> struct O {
}; };
template <typename T> template <typename T>
struct A : typename O<T>::template I<int> { // { dg-error "keyword `typename' not allowed" } struct A : typename O<T>::template I<int> { // { dg-error "keyword 'typename' not allowed" }
A() : typename O<T>::template I<int>() // { dg-error "keyword `typename' not allowed" } A() : typename O<T>::template I<int>() // { dg-error "keyword 'typename' not allowed" }
{}; {};
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment