Revised wording for diagnostics in r208299

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@208401 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Basic/DiagnosticParseKinds.td b/include/clang/Basic/DiagnosticParseKinds.td
index 70e16ceca1c5c7b63ca4a74da936134239e41c1f..ddf69e915e8a368591687245439e56c016543b4e 100644 (file)
--- a/include/clang/Basic/DiagnosticParseKinds.td
+++ b/include/clang/Basic/DiagnosticParseKinds.td
@@ -205,7 +205,7 @@ def err_expected_semi_after_static_assert : Error<
   "expected ';' after static_assert">;
 def err_expected_semi_for : Error<"expected ';' in 'for' statement specifier">;
 def err_single_decl_assign_in_for_range : Error<
-  "range based for statement requires ':' after range declaration">;
+  "range-based 'for' statement uses ':', not '='">;
 def warn_missing_selector_name : Warning<
   "%0 used as the name of the previous parameter rather than as part "
   "of the selector">,

diff --git a/test/Parser/cxx0x-for-range.cpp b/test/Parser/cxx0x-for-range.cpp
index f75b67c486f5a428c547078583dcadd23fa4cc44..c3276ebeaabbcd1769ced2672b424392c331c553 100644 (file)
--- a/test/Parser/cxx0x-for-range.cpp
+++ b/test/Parser/cxx0x-for-range.cpp
@@ -44,18 +44,18 @@ struct Vector {
 void f() {
   Vector v;
   int a[] = {1, 2, 3, 4};
-  for (auto foo   =     a) // expected-error {{range based for statement requires ':' after range declaration}}
+  for (auto foo   =     a) // expected-error {{range-based 'for' statement uses ':', not '='}}
     // CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:19-[[@LINE-1]]:20}:":"
     (void)foo;
   for (auto i
       =
-      v) // expected-error@-1 {{range based for statement requires ':' after range declaration}}
+      v) // expected-error@-1 {{range-based 'for' statement uses ':', not '='}}
     // CHECK: fix-it:"{{.*}}":{[[@LINE-2]]:7-[[@LINE-2]]:8}:":"
     (void)i;
 #define FORRANGE(v, a) for (DECLVARWITHINIT(v) a)  // expected-note {{expanded from macro}}
 #define DECLAUTOVAR(v) auto v
 #define DECLVARWITHINIT(v) DECLAUTOVAR(v) =  // expected-note {{expanded from macro}}
-  FORRANGE(i, a) {  // expected-error {{range based for statement requires ':' after range declaration}}
+  FORRANGE(i, a) {  // expected-error {{range-based 'for' statement uses ':', not '='}}
 
   }
 }