aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix parser/lexer to more carefully check the "C" part of 'extern "C"' declarations.

Browse Source
This commit is contained in:
Matt Pharr
2011-10-18 16:44:14 -04:00
parent 290032f4f5
commit 9b8ea3d500
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lex.ll
View File

@@ -126,6 +126,7 @@ unsigned { return TOKEN_UNSIGNED; }
varying { return TOKEN_VARYING; } varying { return TOKEN_VARYING; }
void { return TOKEN_VOID; } void { return TOKEN_VOID; }
while { return TOKEN_WHILE; } while { return TOKEN_WHILE; }
\"C\" { return TOKEN_STRING_C_LITERAL; }
L?\"(\\.|[^\\"])*\" { lStringConst(yylval, yylloc); return TOKEN_STRING_LITERAL; } L?\"(\\.|[^\\"])*\" { lStringConst(yylval, yylloc); return TOKEN_STRING_LITERAL; }

11
parse.yy
View File

@@ -144,7 +144,7 @@ static const char *lParamListTokens[] = {
%token TOKEN_INT32_CONSTANT TOKEN_UINT32_CONSTANT TOKEN_INT64_CONSTANT %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_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_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 %token TOKEN_LE_OP TOKEN_GE_OP TOKEN_EQ_OP TOKEN_NE_OP
@@ -577,12 +577,7 @@ init_declarator
storage_class_specifier storage_class_specifier
: TOKEN_TYPEDEF { $$ = SC_TYPEDEF; } : TOKEN_TYPEDEF { $$ = SC_TYPEDEF; }
| TOKEN_EXTERN { $$ = SC_EXTERN; } | TOKEN_EXTERN { $$ = SC_EXTERN; }
| TOKEN_EXTERN TOKEN_STRING_LITERAL { | TOKEN_EXTERN TOKEN_STRING_C_LITERAL { $$ = SC_EXTERN_C; }
if (*(yylval.stringVal) != "C")
Error(@2, "String constant \"%s\" illegal after \"extern\" qualifier. "
"(Expected \"C\".)", yylval.stringVal->c_str());
$$ = SC_EXTERN_C;
}
| TOKEN_EXPORT { $$ = SC_EXPORT; } | TOKEN_EXPORT { $$ = SC_EXPORT; }
| TOKEN_STATIC { $$ = SC_STATIC; } | TOKEN_STATIC { $$ = SC_STATIC; }
; ;
@@ -1224,7 +1219,7 @@ translation_unit
external_declaration external_declaration
: function_definition : function_definition
| TOKEN_EXTERN TOKEN_STRING_LITERAL '{' declaration '}' // FIXME: make sure string=="C" | TOKEN_EXTERN TOKEN_STRING_C_LITERAL '{' declaration '}'
| declaration | declaration
{ {
if ($1 != NULL) if ($1 != NULL)