From 9b8ea3d5007f8c9ba7f45585c2b3825581660ff6 Mon Sep 17 00:00:00 2001
From: Matt Pharr <matt.pharr@intel.com>
Date: Tue, 18 Oct 2011 16:44:14 -0400
Subject: [PATCH] Fix parser/lexer to more carefully check the "C" part of
 'extern "C"' declarations.

---
 lex.ll   |  1 +
 parse.yy | 11 +++--------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/lex.ll b/lex.ll
index e752dc8d..d083de47 100644
--- a/lex.ll
+++ b/lex.ll
@@ -126,6 +126,7 @@ unsigned { return TOKEN_UNSIGNED; }
 varying { return TOKEN_VARYING; }
 void { return TOKEN_VOID; }
 while { return TOKEN_WHILE; }
+\"C\" { return TOKEN_STRING_C_LITERAL; }
 
 L?\"(\\.|[^\\"])*\" { lStringConst(yylval, yylloc); return TOKEN_STRING_LITERAL; }
 
diff --git a/parse.yy b/parse.yy
index 12fb3fdf..b9b1c6e4 100644
--- a/parse.yy
+++ b/parse.yy
@@ -144,7 +144,7 @@ static const char *lParamListTokens[] = {
 
 
 %token TOKEN_INT32_CONSTANT TOKEN_UINT32_CONSTANT TOKEN_INT64_CONSTANT
-%token TOKEN_UINT64_CONSTANT TOKEN_FLOAT_CONSTANT
+%token TOKEN_UINT64_CONSTANT TOKEN_FLOAT_CONSTANT TOKEN_STRING_C_LITERAL
 %token TOKEN_IDENTIFIER TOKEN_STRING_LITERAL TOKEN_TYPE_NAME
 %token TOKEN_PTR_OP TOKEN_INC_OP TOKEN_DEC_OP TOKEN_LEFT_OP TOKEN_RIGHT_OP 
 %token TOKEN_LE_OP TOKEN_GE_OP TOKEN_EQ_OP TOKEN_NE_OP
@@ -577,12 +577,7 @@ init_declarator
 storage_class_specifier
     : TOKEN_TYPEDEF { $$ = SC_TYPEDEF; }
     | TOKEN_EXTERN { $$ = SC_EXTERN; }
-    | TOKEN_EXTERN TOKEN_STRING_LITERAL  { 
-          if (*(yylval.stringVal) != "C")
-              Error(@2, "String constant \"%s\" illegal after \"extern\" qualifier.  "
-                    "(Expected \"C\".)", yylval.stringVal->c_str());
-          $$ = SC_EXTERN_C; 
-      }
+    | TOKEN_EXTERN TOKEN_STRING_C_LITERAL  { $$ = SC_EXTERN_C; }
     | TOKEN_EXPORT { $$ = SC_EXPORT; }
     | TOKEN_STATIC { $$ = SC_STATIC; }
     ;
@@ -1224,7 +1219,7 @@ translation_unit
 
 external_declaration
     : function_definition
-    | TOKEN_EXTERN TOKEN_STRING_LITERAL '{' declaration '}' // FIXME: make sure string=="C"
+    | TOKEN_EXTERN TOKEN_STRING_C_LITERAL '{' declaration '}'
     | declaration 
     { 
         if ($1 != NULL)