Convert the lexer and start converting the PP over to using canonical Diag methods.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59511 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Lex/Pragma.cpp b/lib/Lex/Pragma.cpp
index cc224dd..dd5f144 100644
--- a/lib/Lex/Pragma.cpp
+++ b/lib/Lex/Pragma.cpp
@@ -102,13 +102,17 @@
// Read the '('.
Lex(Tok);
- if (Tok.isNot(tok::l_paren))
- return Diag(PragmaLoc, diag::err__Pragma_malformed);
+ if (Tok.isNot(tok::l_paren)) {
+ Diag(PragmaLoc, diag::err__Pragma_malformed);
+ return;
+ }
// Read the '"..."'.
Lex(Tok);
- if (Tok.isNot(tok::string_literal) && Tok.isNot(tok::wide_string_literal))
- return Diag(PragmaLoc, diag::err__Pragma_malformed);
+ if (Tok.isNot(tok::string_literal) && Tok.isNot(tok::wide_string_literal)) {
+ Diag(PragmaLoc, diag::err__Pragma_malformed);
+ return;
+ }
// Remember the string.
std::string StrVal = getSpelling(Tok);
@@ -116,8 +120,10 @@
// Read the ')'.
Lex(Tok);
- if (Tok.isNot(tok::r_paren))
- return Diag(PragmaLoc, diag::err__Pragma_malformed);
+ if (Tok.isNot(tok::r_paren)) {
+ Diag(PragmaLoc, diag::err__Pragma_malformed);
+ return;
+ }
// The _Pragma is lexically sound. Destringize according to C99 6.10.9.1.
if (StrVal[0] == 'L') // Remove L prefix.