From f9b52d5f63d0258b2a911c8a9720ef47a18c9490 Mon Sep 17 00:00:00 2001 From: Fariborz Jahanian Date: Fri, 23 Apr 2010 17:52:02 +0000 Subject: [PATCH] Improve on my previous diagnostics: per Doug's comment. llvm-svn: 102190 --- clang/include/clang/Basic/DiagnosticSemaKinds.td | 2 +- clang/test/SemaObjC/continuation-class-err.m | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index f61cd2179556..435880fdca16 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -324,7 +324,7 @@ def warn_atomic_property_rule : Warning< "with a user defined setter/getter">; def err_use_continuation_class : Error< "illegal declaration of property in continuation class %0" - " - attribute must be readwrite, while its primary must be readonly">; + ": attribute must be readwrite, while its primary must be readonly">; def err_continuation_class : Error<"continuation class has no primary class">; def err_property_type : Error<"property cannot have array or function type %0">; def error_missing_property_context : Error< diff --git a/clang/test/SemaObjC/continuation-class-err.m b/clang/test/SemaObjC/continuation-class-err.m index 9c14d37cedc8..252518239f16 100644 --- a/clang/test/SemaObjC/continuation-class-err.m +++ b/clang/test/SemaObjC/continuation-class-err.m @@ -12,7 +12,7 @@ @interface ReadOnly () @property(readwrite, copy) id object; // expected-warning {{property attribute in continuation class does not match the primary class}} -@property(readonly) id object1; // expected-error {{illegal declaration of property in continuation class 'ReadOnly' - attribute must be}} +@property(readonly) id object1; // expected-error {{illegal declaration of property in continuation class 'ReadOnly': attribute must be}} @property (readwrite, assign) int indentLevel; // OK. assign the the default in any case. @end @@ -31,8 +31,8 @@ @end @interface Bar () -@property (copy) id foo; // expected-error {{illegal declaration of property in continuation class 'Bar' - attribute must be}} -@property (copy) id fee; // expected-error {{illegal declaration of property in continuation class 'Bar' - attribute must be}} +@property (copy) id foo; // expected-error {{illegal declaration of property in continuation class 'Bar': attribute must be}} +@property (copy) id fee; // expected-error {{illegal declaration of property in continuation class 'Bar': attribute must be}} @end @implementation Bar