commit f4ea4fd843acd4eacbc89973fedf8bcf692fe73c
author Stephen Hines <srhines@google.com> Tue Mar 27 08:41:11 2012 -0700
committer Stephen Hines <srhines@google.com> Tue Mar 27 08:41:11 2012 -0700
tree fb51ab05843226d940a4ce6c52f3b28d36421255
parent e2597ac5a8ba7a45a1d5f342973cd43a3a1932cf

Fix up pragma handling.

BUG=4540719

This change allows us to handle pragmas with only keys (no values), like our
new rs_fp_relaxed/rs_fp_imprecise. It also cleans up some diagnostic issues
with pragmas in llvm-rs-cc.

Change-Id: Ide54208db96f1cea71c5db6b3729ac4d241deda4

slang_pragma_recorder.cpp

diff --git a/slang_pragma_recorder.cpp b/slang_pragma_recorder.cpp
index 8c49d2f..cfd31d1 100644
--- a/slang_pragma_recorder.cpp
+++ b/slang_pragma_recorder.cpp
@@ -61,7 +61,7 @@
   // Pragma in ACC should be a name/value pair
 
   if (GetPragmaNameFromToken(FirstToken, PragmaName)) {
-    // start parsing the value '(' PragmaValue ')'
+    // start parsing the value '(' PragmaValue ')', if we have one.
     const clang::Token* NextToken = &PP.LookAhead(0);
 
     if (NextToken->is(clang::tok::l_paren))
@@ -70,24 +70,44 @@
       goto end_parsing_pragma_value;
 
     NextToken = &PP.LookAhead(0);
-    if (GetPragmaValueFromToken(*NextToken, PragmaValue))
+    if (GetPragmaValueFromToken(*NextToken, PragmaValue)) {
       PP.Lex(CurrentToken);
-    else
-      goto end_parsing_pragma_value;
+    } else {
+      PP.LexUnexpandedToken(CurrentToken);
+      PP.Diag(NextToken->getLocation(),
+              PP.getDiagnostics().getCustomDiagID(
+                  clang::DiagnosticsEngine::Error,
+                  "expected value after '#pragma %0('")) << PragmaName;
+      return;
+    }
 
     if (!NextToken->is(clang::tok::r_paren)) {
       NextToken = &PP.LookAhead(0);
-      if (NextToken->is(clang::tok::r_paren))
+      if (NextToken->is(clang::tok::r_paren)) {
         PP.LexUnexpandedToken(CurrentToken);
-      else
-        goto end_parsing_pragma_value;
+      } else {
+        PP.LexUnexpandedToken(CurrentToken);
+        PP.Diag(NextToken->getLocation(),
+                PP.getDiagnostics().getCustomDiagID(
+                    clang::DiagnosticsEngine::Error,
+                    "missing ')' after '#pragma %0(%1'"))
+            << PragmaName << PragmaValue;
+        return;
+      }
     }
-
-    // Until now, we ensure that we have a pragma name/value pair
-    mPragmas->push_back(make_pair(PragmaName, PragmaValue));
+  } else {
+    PP.Diag(FirstToken.getLocation(),
+            PP.getDiagnostics().getCustomDiagID(
+                clang::DiagnosticsEngine::Error,
+                "no pragma name or value"));
+    return;
   }
 
  end_parsing_pragma_value:
+
+  // PragmaValue may be an empty string.
+  mPragmas->push_back(make_pair(PragmaName, PragmaValue));
+
   // Inform lex to eat the token
   PP.LexUnexpandedToken(CurrentToken);