From 083712fbb710aaca155533df00799aaa6ebcbb71 Mon Sep 17 00:00:00 2001
From: Fariborz Jahanian <fjahanian@apple.com>
Date: Wed, 31 Mar 2010 20:22:35 +0000
Subject: [PATCH] Issue better syntax error when objc's messaging ares are not
 separated by ':' (radar 7030268).

llvm-svn: 100040
---
 clang/lib/Parse/ParseObjc.cpp            | 7 +++++--
 clang/test/Parser/objc-messaging-neg-1.m | 6 ++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/clang/lib/Parse/ParseObjc.cpp b/clang/lib/Parse/ParseObjc.cpp
index 2d43f15cba99..9a3473f042ed 100644
--- a/clang/lib/Parse/ParseObjc.cpp
+++ b/clang/lib/Parse/ParseObjc.cpp
@@ -1817,9 +1817,12 @@ Parser::ParseObjCMessageExpressionBody(SourceLocation LBracLoc,
     SkipUntil(tok::r_square);
     return ExprError();
   }
-
+    
   if (Tok.isNot(tok::r_square)) {
-    Diag(Tok, diag::err_expected_rsquare);
+    if (Tok.is(tok::identifier))
+      Diag(Tok, diag::err_expected_colon);
+    else
+      Diag(Tok, diag::err_expected_rsquare);
     // We must manually skip to a ']', otherwise the expression skipper will
     // stop at the ']' when it skips to the ';'.  We want it to skip beyond
     // the enclosing expression.
diff --git a/clang/test/Parser/objc-messaging-neg-1.m b/clang/test/Parser/objc-messaging-neg-1.m
index 0d0cb9d8d6fe..4ddadb816f0d 100644
--- a/clang/test/Parser/objc-messaging-neg-1.m
+++ b/clang/test/Parser/objc-messaging-neg-1.m
@@ -1,6 +1,12 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s
 
+@interface A
++(void) foo:(int) a;
+@end
+
 int main() {
   id a;
   [a bla:0 6:7]; // expected-error {{expected ']'}}
+  [A foo bar]; // expected-error {{expected ':'}}
+  [A foo bar bar1]; // expected-error {{expected ':'}}
 }