diff options
Diffstat (limited to 'clang-tools-extra/test/clang-tidy/checkers/modernize/use-override.cpp')
-rw-r--r-- | clang-tools-extra/test/clang-tidy/checkers/modernize/use-override.cpp | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override.cpp index c5745e3..809e435 100644 --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override.cpp @@ -54,182 +54,182 @@ struct SimpleCases : public Base { public: virtual ~SimpleCases(); // CHECK-MESSAGES: :[[@LINE-1]]:11: warning: prefer using 'override' or (rarely) 'final' instead of 'virtual' - // CHECK-FIXES: {{^}} ~SimpleCases() override; + // CHECK-FIXES: ~SimpleCases() override; void a(); // CHECK-MESSAGES: :[[@LINE-1]]:8: warning: annotate this - // CHECK-FIXES: {{^}} void a() override; + // CHECK-FIXES: void a() override; void b() override; // CHECK-MESSAGES-NOT: warning: - // CHECK-FIXES: {{^}} void b() override; + // CHECK-FIXES: void b() override; virtual void c(); // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: prefer using - // CHECK-FIXES: {{^}} void c() override; + // CHECK-FIXES: void c() override; virtual void d() override; // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: 'virtual' is redundant since the function is already declared 'override' - // CHECK-FIXES: {{^}} void d() override; + // CHECK-FIXES: void d() override; virtual void d2() final; // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: 'virtual' is redundant since the function is already declared 'final' - // CHECK-FIXES: {{^}} void d2() final; + // CHECK-FIXES: void d2() final; virtual void e() = 0; // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: prefer using - // CHECK-FIXES: {{^}} void e() override = 0; + // CHECK-FIXES: void e() override = 0; virtual void f()=0; // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: prefer using - // CHECK-FIXES: {{^}} void f() override =0; + // CHECK-FIXES: void f() override =0; virtual void f2() const=0; // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: prefer using - // CHECK-FIXES: {{^}} void f2() const override =0; + // CHECK-FIXES: void f2() const override =0; virtual void g() ABSTRACT; // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: prefer using - // CHECK-FIXES: {{^}} void g() override ABSTRACT; + // CHECK-FIXES: void g() override ABSTRACT; virtual void j() const; // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: prefer using - // CHECK-FIXES: {{^}} void j() const override; + // CHECK-FIXES: void j() const override; virtual MustUseResultObject k(); // Has an implicit attribute. // CHECK-MESSAGES: :[[@LINE-1]]:31: warning: prefer using - // CHECK-FIXES: {{^}} MustUseResultObject k() override; + // CHECK-FIXES: MustUseResultObject k() override; virtual bool l() MUST_USE_RESULT UNUSED; // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: prefer using - // CHECK-FIXES: {{^}} bool l() override MUST_USE_RESULT UNUSED; + // CHECK-FIXES: bool l() override MUST_USE_RESULT UNUSED; virtual bool n() UNUSED MUST_USE_RESULT; // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: prefer using - // CHECK-FIXES: {{^}} bool n() override UNUSED MUST_USE_RESULT; + // CHECK-FIXES: bool n() override UNUSED MUST_USE_RESULT; void m() override final; // CHECK-MESSAGES: :[[@LINE-1]]:8: warning: 'override' is redundant since the function is already declared 'final' - // CHECK-FIXES: {{^}} void m() final; + // CHECK-FIXES: void m() final; virtual void m2() override final; // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: 'virtual' and 'override' are redundant since the function is already declared 'final' - // CHECK-FIXES: {{^}} void m2() final; + // CHECK-FIXES: void m2() final; virtual void o() __attribute__((unused)); // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: prefer using - // CHECK-FIXES: {{^}} void o() override __attribute__((unused)); + // CHECK-FIXES: void o() override __attribute__((unused)); virtual void ne() noexcept(false); // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: prefer using - // CHECK-FIXES: {{^}} void ne() noexcept(false) override; + // CHECK-FIXES: void ne() noexcept(false) override; virtual void t() throw(); // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: prefer using - // CHECK-FIXES: {{^}} void t() throw() override; + // CHECK-FIXES: void t() throw() override; virtual /* */ void g2(); // CHECK-MESSAGES: :[[@LINE-1]]:33: warning: prefer using 'override' or (rarely) 'final' instead of 'virtual' - // CHECK-FIXES: {{^}} /* */ void g2() override; + // CHECK-FIXES: /* */ void g2() override; }; // CHECK-MESSAGES-NOT: warning: void SimpleCases::c() {} -// CHECK-FIXES: {{^}}void SimpleCases::c() {} +// CHECK-FIXES: void SimpleCases::c() {} SimpleCases::~SimpleCases() {} -// CHECK-FIXES: {{^}}SimpleCases::~SimpleCases() {} +// CHECK-FIXES: SimpleCases::~SimpleCases() {} struct DefaultedDestructor : public Base { DefaultedDestructor() {} virtual ~DefaultedDestructor() = default; // CHECK-MESSAGES: :[[@LINE-1]]:11: warning: prefer using - // CHECK-FIXES: {{^}} ~DefaultedDestructor() override = default; + // CHECK-FIXES: ~DefaultedDestructor() override = default; }; struct FinalSpecified : public Base { public: virtual ~FinalSpecified() final; // CHECK-MESSAGES: :[[@LINE-1]]:11: warning: 'virtual' is redundant since the function is already declared 'final' - // CHECK-FIXES: {{^}} ~FinalSpecified() final; + // CHECK-FIXES: ~FinalSpecified() final; void b() final; // CHECK-MESSAGES-NOT: warning: - // CHECK-FIXES: {{^}} void b() final; + // CHECK-FIXES: void b() final; virtual void d() final; // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: 'virtual' is redundant - // CHECK-FIXES: {{^}} void d() final; + // CHECK-FIXES: void d() final; virtual void e() final = 0; // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: 'virtual' is redundant - // CHECK-FIXES: {{^}} void e() final = 0; + // CHECK-FIXES: void e() final = 0; virtual void j() const final; // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: 'virtual' is redundant - // CHECK-FIXES: {{^}} void j() const final; + // CHECK-FIXES: void j() const final; virtual bool l() final MUST_USE_RESULT UNUSED; // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: 'virtual' is redundant - // CHECK-FIXES: {{^}} bool l() final MUST_USE_RESULT UNUSED; + // CHECK-FIXES: bool l() final MUST_USE_RESULT UNUSED; }; struct InlineDefinitions : public Base { public: virtual ~InlineDefinitions() {} // CHECK-MESSAGES: :[[@LINE-1]]:11: warning: prefer using - // CHECK-FIXES: {{^}} ~InlineDefinitions() override {} + // CHECK-FIXES: ~InlineDefinitions() override {} void a() {} // CHECK-MESSAGES: :[[@LINE-1]]:8: warning: annotate this - // CHECK-FIXES: {{^}} void a() override {} + // CHECK-FIXES: void a() override {} void b() override {} // CHECK-MESSAGES-NOT: warning: - // CHECK-FIXES: {{^}} void b() override {} + // CHECK-FIXES: void b() override {} virtual void c() {} // CHECK-MESSAGES: :[[@LINE-2]]:16: warning: prefer using - // CHECK-FIXES: {{^}} void c() override + // CHECK-FIXES: void c() override virtual void d() override {} // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: 'virtual' is redundant - // CHECK-FIXES: {{^}} void d() override {} + // CHECK-FIXES: void d() override {} virtual void j() const {} // CHECK-MESSAGES: :[[@LINE-2]]:16: warning: prefer using - // CHECK-FIXES: {{^}} void j() const override + // CHECK-FIXES: void j() const override virtual MustUseResultObject k(); // Has an implicit attribute. // CHECK-MESSAGES: :[[@LINE-1]]:31: warning: prefer using - // CHECK-FIXES: {{^}} MustUseResultObject k() override; + // CHECK-FIXES: MustUseResultObject k() override; virtual bool l() MUST_USE_RESULT UNUSED; // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: prefer using - // CHECK-FIXES: {{^}} bool l() override MUST_USE_RESULT UNUSED; + // CHECK-FIXES: bool l() override MUST_USE_RESULT UNUSED; virtual void r() & {} // CHECK-MESSAGES: :[[@LINE-2]]:16: warning: prefer using - // CHECK-FIXES: {{^}} void r() & override + // CHECK-FIXES: void r() & override virtual void rr() && {} // CHECK-MESSAGES: :[[@LINE-2]]:16: warning: prefer using - // CHECK-FIXES: {{^}} void rr() && override + // CHECK-FIXES: void rr() && override virtual void cv() const volatile {} // CHECK-MESSAGES: :[[@LINE-2]]:16: warning: prefer using - // CHECK-FIXES: {{^}} void cv() const volatile override + // CHECK-FIXES: void cv() const volatile override virtual void cv2() const volatile // some comment {} // CHECK-MESSAGES: :[[@LINE-2]]:16: warning: prefer using - // CHECK-FIXES: {{^}} void cv2() const volatile override // some comment + // CHECK-FIXES: void cv2() const volatile override // some comment }; struct DefaultArguments : public Base { @@ -237,7 +237,7 @@ struct DefaultArguments : public Base { // Make sure the override fix is placed after the argument list. void il(IntPair p = {1, (2 + (3))}) {} // CHECK-MESSAGES: :[[@LINE-1]]:8: warning: annotate this - // CHECK-FIXES: {{^}} void il(IntPair p = {1, (2 + (3))}) override {} + // CHECK-FIXES: void il(IntPair p = {1, (2 + (3))}) override {} }; struct Macros : public Base { @@ -245,31 +245,31 @@ struct Macros : public Base { // give up for now. NOT_VIRTUAL void a() NOT_OVERRIDE; // CHECK-MESSAGES: :[[@LINE-1]]:20: warning: annotate this - // CHECK-FIXES: {{^}} NOT_VIRTUAL void a() override NOT_OVERRIDE; + // CHECK-FIXES: NOT_VIRTUAL void a() override NOT_OVERRIDE; VIRTUAL void b() NOT_OVERRIDE; // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: prefer using - // CHECK-FIXES: {{^}} VIRTUAL void b() override NOT_OVERRIDE; + // CHECK-FIXES: VIRTUAL void b() override NOT_OVERRIDE; NOT_VIRTUAL void c() OVERRIDE; // CHECK-MESSAGES-NOT: warning: - // CHECK-FIXES: {{^}} NOT_VIRTUAL void c() OVERRIDE; + // CHECK-FIXES: NOT_VIRTUAL void c() OVERRIDE; VIRTUAL void d() OVERRIDE; // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: 'virtual' is redundant - // CHECK-FIXES: {{^}} VIRTUAL void d() OVERRIDE; + // CHECK-FIXES: VIRTUAL void d() OVERRIDE; #define FUNC(return_type, name) return_type name() FUNC(void, e); - // CHECK-FIXES: {{^}} FUNC(void, e); + // CHECK-FIXES: FUNC(void, e); #define F virtual void f(); F - // CHECK-FIXES: {{^}} F + // CHECK-FIXES: F VIRTUAL void g() OVERRIDE final; // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: 'virtual' and 'override' are redundant - // CHECK-FIXES: {{^}} VIRTUAL void g() final; + // CHECK-FIXES: VIRTUAL void g() final; }; // Tests for templates. @@ -280,7 +280,7 @@ template <typename T> struct TemplateBase { template <typename T> struct DerivedFromTemplate : public TemplateBase<T> { virtual void f(T t); // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: prefer using - // CHECK-FIXES: {{^}} void f(T t) override; + // CHECK-FIXES: void f(T t) override; }; void f() { DerivedFromTemplate<int>().f(2); } @@ -288,7 +288,7 @@ template <class C> struct UnusedMemberInstantiation : public C { virtual ~UnusedMemberInstantiation() {} // CHECK-MESSAGES: :[[@LINE-1]]:11: warning: prefer using - // CHECK-FIXES: {{^}} ~UnusedMemberInstantiation() override {} + // CHECK-FIXES: ~UnusedMemberInstantiation() override {} }; struct IntantiateWithoutUse : public UnusedMemberInstantiation<Base> {}; @@ -303,7 +303,7 @@ template <int I> struct MembersOfSpecializations : public Base2 { void a() override; // CHECK-MESSAGES-NOT: warning: - // CHECK-FIXES: {{^}} void a() override; + // CHECK-FIXES: void a() override; }; template <> void MembersOfSpecializations<3>::a() {} void ff() { MembersOfSpecializations<3>().a(); }; @@ -313,11 +313,11 @@ void ff() { MembersOfSpecializations<3>().a(); }; struct TryStmtAsBody : public Base { void a() try // CHECK-MESSAGES: :[[@LINE-1]]:8: warning: annotate this - // CHECK-FIXES: {{^}} void a() override try + // CHECK-FIXES: void a() override try { b(); } catch(...) { c(); } virtual void d() try // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: prefer using - // CHECK-FIXES: {{^}} void d() override try + // CHECK-FIXES: void d() override try { e(); } catch(...) { f(); } }; |