From d20b71735eef2ea807d74252f78bba10f93b268c Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Thu, 7 May 2020 08:41:54 -0400 Subject: [PATCH] c++: Fix spelling of non-static I was looking at DR 296 and noticed that we say "nonstatic" instead of "non-static", which is the version the standard uses. So this patch fixes the spelling throughout the front end. Did not check e.g. non-dependent or any other. * decl.c (grok_op_properties): Fix spelling of non-static. * typeck.c (build_class_member_access_expr): Likewise. * g++.dg/other/operator1.C: Adjust expected message. * g++.dg/overload/operator2.C: Likewise. * g++.dg/template/error30.C: Likewise. * g++.old-deja/g++.jason/operator.C: Likewise. --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/call.c | 2 +- gcc/cp/class.c | 8 ++++---- gcc/cp/cxx-pretty-print.c | 2 +- gcc/cp/decl.c | 2 +- gcc/cp/init.c | 10 +++++----- gcc/cp/search.c | 6 +++--- gcc/cp/typeck.c | 2 +- gcc/testsuite/ChangeLog | 7 +++++++ gcc/testsuite/g++.dg/other/operator1.C | 2 +- gcc/testsuite/g++.dg/overload/operator2.C | 4 ++-- gcc/testsuite/g++.dg/template/error30.C | 2 +- gcc/testsuite/g++.old-deja/g++.jason/operator.C | 4 ++-- 13 files changed, 34 insertions(+), 22 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 19da17a39c3..c60b8bf01b6 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2020-05-07 Marek Polacek + + * decl.c (grok_op_properties): Fix spelling of non-static. + * typeck.c (build_class_member_access_expr): Likewise. + 2020-05-07 Richard Biener PR middle-end/94703 diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 8345997ccf9..dbce3866fd8 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -8697,7 +8697,7 @@ build_over_call (struct z_candidate *cand, int flags, tsubst_flags_t complain) (DECL_CONTEXT (fn), BINFO_TYPE (cand->conversion_path)))) flags |= LOOKUP_NONVIRTUAL; - /* [class.mfct.nonstatic]: If a nonstatic member function of a class + /* [class.mfct.non-static]: If a non-static member function of a class X is called for an object that is not of type X, or of a type derived from X, the behavior is undefined. diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 1f524a31917..b66b8d4725d 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -3661,7 +3661,7 @@ check_field_decls (tree t, tree *access_decls, { /* ARM $12.6.2: [A member initializer list] (or, for an aggregate, initialization by a brace-enclosed list) is the - only way to initialize nonstatic const and reference + only way to initialize non-static const and reference members. */ TYPE_HAS_COMPLEX_COPY_ASSIGN (t) = 1; TYPE_HAS_COMPLEX_MOVE_ASSIGN (t) = 1; @@ -3784,7 +3784,7 @@ check_field_decls (tree t, tree *access_decls, { /* ARM $12.6.2: [A member initializer list] (or, for an aggregate, initialization by a brace-enclosed list) is the - only way to initialize nonstatic const and reference + only way to initialize non-static const and reference members. */ TYPE_HAS_COMPLEX_COPY_ASSIGN (t) = 1; TYPE_HAS_COMPLEX_MOVE_ASSIGN (t) = 1; @@ -3799,7 +3799,7 @@ check_field_decls (tree t, tree *access_decls, | CLASSTYPE_READONLY_FIELDS_NEED_INIT (type)); } - /* Core issue 80: A nonstatic data member is required to have a + /* Core issue 80: A non-static data member is required to have a different name from the class iff the class has a user-declared constructor. */ if (constructor_name_p (DECL_NAME (field), t) @@ -8106,7 +8106,7 @@ resolve_address_of_overloaded_function (tree target_type, member functions match targets of type "pointer-to-member function;" the function type of the pointer to member is used to select the member function from the set of overloaded member - functions. If a nonstatic member function is selected, the + functions. If a non-static member function is selected, the reference to the overloaded function name is required to have the form of a pointer to member as described in 5.3.1. diff --git a/gcc/cp/cxx-pretty-print.c b/gcc/cp/cxx-pretty-print.c index a26291eee0f..188462a79e7 100644 --- a/gcc/cp/cxx-pretty-print.c +++ b/gcc/cp/cxx-pretty-print.c @@ -1534,7 +1534,7 @@ pp_cxx_parameter_declaration_clause (cxx_pretty_printer *pp, tree t) } bool first = true; - /* Skip artificial parameter for nonstatic member functions. */ + /* Skip artificial parameter for non-static member functions. */ if (TREE_CODE (t) == METHOD_TYPE) types = TREE_CHAIN (types); diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 232d7ed4a14..cc12e005154 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -14391,7 +14391,7 @@ grok_op_properties (tree decl, bool complain) || operator_code == ARRAY_REF || operator_code == NOP_EXPR) { - error_at (loc, "%qD must be a nonstatic member function", decl); + error_at (loc, "%qD must be a non-static member function", decl); return false; } diff --git a/gcc/cp/init.c b/gcc/cp/init.c index c7ae9404e04..e2e547afd96 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -160,7 +160,7 @@ build_zero_init_1 (tree type, tree nelts, bool static_storage_p, -- if T is a scalar type, the storage is set to the value of zero converted to T. - -- if T is a non-union class type, the storage for each nonstatic + -- if T is a non-union class type, the storage for each non-static data member and each base-class subobject is zero-initialized. -- if T is a union type, the storage for its first data member is @@ -2221,8 +2221,8 @@ build_offset_ref (tree type, tree member, bool address_p, /* If MEMBER is non-static, then the program has fallen afoul of [expr.prim]: - An id-expression that denotes a nonstatic data member or - nonstatic member function of a class can only be used: + An id-expression that denotes a non-static data member or + non-static member function of a class can only be used: -- as part of a class member access (_expr.ref_) in which the object-expression refers to the member's class or a class @@ -2230,8 +2230,8 @@ build_offset_ref (tree type, tree member, bool address_p, -- to form a pointer to member (_expr.unary.op_), or - -- in the body of a nonstatic member function of that class or - of a class derived from that class (_class.mfct.nonstatic_), or + -- in the body of a non-static member function of that class or + of a class derived from that class (_class.mfct.non-static_), or -- in a mem-initializer for a constructor for that class or for a class derived from that class (_class.base.init_). */ diff --git a/gcc/cp/search.c b/gcc/cp/search.c index 6eada2d3788..d9a2d748428 100644 --- a/gcc/cp/search.c +++ b/gcc/cp/search.c @@ -631,7 +631,7 @@ protected_accessible_p (tree decl, tree derived, tree type, tree otype) /* [class.protected] When a friend or a member function of a derived class references - a protected nonstatic member of a base class, an access check + a protected non-static member of a base class, an access check applies in addition to those described earlier in clause _class.access_) Except when forming a pointer to member (_expr.unary.op_), the access must be through a pointer to, @@ -921,11 +921,11 @@ struct lookup_field_info { of that class. [class.member.lookup]:If the resulting set of declarations are not all - from sub-objects of the same type, or the set has a nonstatic member + from sub-objects of the same type, or the set has a non-static member and includes members from distinct sub-objects, there is an ambiguity and the program is ill-formed. - This function checks that T contains no nonstatic members. */ + This function checks that T contains no non-static members. */ int shared_member_p (tree t) diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 13d9602c32b..39f5187a7f4 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -2512,7 +2512,7 @@ build_class_member_access_expr (cp_expr object, tree member, if (complain & tf_error) { if (TREE_CODE (member) == FIELD_DECL) - error ("invalid use of nonstatic data member %qE", member); + error ("invalid use of non-static data member %qE", member); else error ("%qD is not a member of %qT", member, object_type); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 511c5820073..f7c018853ca 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2020-05-07 Marek Polacek + + * g++.dg/other/operator1.C: Adjust expected message. + * g++.dg/overload/operator2.C: Likewise. + * g++.dg/template/error30.C: Likewise. + * g++.old-deja/g++.jason/operator.C: Likewise. + 2020-05-07 Richard Biener PR middle-end/94703 diff --git a/gcc/testsuite/g++.dg/other/operator1.C b/gcc/testsuite/g++.dg/other/operator1.C index d0b0cb25f8c..121c106ad18 100644 --- a/gcc/testsuite/g++.dg/other/operator1.C +++ b/gcc/testsuite/g++.dg/other/operator1.C @@ -1,7 +1,7 @@ // PR c++/27547 // { dg-do compile } -int operator=(int); // { dg-error "5:.int operator=\\(int\\). must be a nonstatic member function" } +int operator=(int); // { dg-error "5:.int operator=\\(int\\). must be a non-static member function" } void foo() { diff --git a/gcc/testsuite/g++.dg/overload/operator2.C b/gcc/testsuite/g++.dg/overload/operator2.C index b60c629744e..64640b6cfe0 100644 --- a/gcc/testsuite/g++.dg/overload/operator2.C +++ b/gcc/testsuite/g++.dg/overload/operator2.C @@ -3,7 +3,7 @@ struct A { - static operator int(); // { dg-error "10:.static A::operator int\\(\\). must be a nonstatic member function" } + static operator int(); // { dg-error "10:.static A::operator int\\(\\). must be a non-static member function" } }; struct B @@ -11,4 +11,4 @@ struct B static int operator*(); // { dg-error "14:.static int B::operator\\*\\(\\). must be either a non-static member function or a non-member function" } }; -static operator int(); // { dg-error "8:.operator int\\(\\). must be a nonstatic member function" } +static operator int(); // { dg-error "8:.operator int\\(\\). must be a non-static member function" } diff --git a/gcc/testsuite/g++.dg/template/error30.C b/gcc/testsuite/g++.dg/template/error30.C index e1706af0b7a..3a87872d526 100644 --- a/gcc/testsuite/g++.dg/template/error30.C +++ b/gcc/testsuite/g++.dg/template/error30.C @@ -2,4 +2,4 @@ template struct A; -template class B> A::x> operator() (); // { dg-error "51:.A::x> operator\\(\\)\\(\\). must be a nonstatic member function" } +template class B> A::x> operator() (); // { dg-error "51:.A::x> operator\\(\\)\\(\\). must be a non-static member function" } diff --git a/gcc/testsuite/g++.old-deja/g++.jason/operator.C b/gcc/testsuite/g++.old-deja/g++.jason/operator.C index 69a41cf2448..79c1932a353 100644 --- a/gcc/testsuite/g++.old-deja/g++.jason/operator.C +++ b/gcc/testsuite/g++.old-deja/g++.jason/operator.C @@ -6,7 +6,7 @@ typedef __SIZE_TYPE__ size_t; struct A { int operator?:(int a, int b); // { dg-error "prohibits overloading" } - static int operator()(int a); // { dg-error "14:.static int A::operator\\(\\)\\(int\\). must be a nonstatic member function" } + static int operator()(int a); // { dg-error "14:.static int A::operator\\(\\)\\(int\\). must be a non-static member function" } static int operator+(A,A); // { dg-error "14:.static int A::operator\\+\\(A, A\\). must be either a non-static member function or a non-member function" } int operator+(int a, int b = 1); // { dg-error "7:.int A::operator\\+\\(int, int\\). must have either zero or one argument" } int operator++(char); // { dg-error "7:postfix .int A::operator\\+\\+\\(char\\). must have .int. as its argument" } @@ -29,4 +29,4 @@ void * operator new (A a); // { dg-error ".operator new. takes type .size_t." } void operator delete (A a); // { dg-error ".operator delete. takes type .void\\*. as first parameter" } char * operator char * (int); // { dg-error "return type" "ret" } -// { dg-error "8:.operator char\\*\\*\\(int\\). must be a nonstatic member function" "mem" { target *-*-* } .-1 } +// { dg-error "8:.operator char\\*\\*\\(int\\). must be a non-static member function" "mem" { target *-*-* } .-1 } -- 2.30.2