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

Fix bugs with handling types of integer constants.

Browse Source 
We now follow the rule that the type of an integer constant is
the first of int32, uint32, int64, uint64, that can hold the
value.  (Unless 'u' or 'l' suffixes have been provided.)

Fixes issue #299.
This commit is contained in:
Matt Pharr
2012-07-08 08:43:03 -07:00
parent 0d534720bb
commit 080241b7d1
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lex.ll
View File

@@ -590,12 +590,25 @@ lParseInteger(bool dotdotdot) {
return us ? TOKEN_UINT64_CONSTANT : TOKEN_INT64_CONSTANT;
else if (ls == 1)
return us ? TOKEN_UINT32_CONSTANT : TOKEN_INT32_CONSTANT;
// See if we can fit this into a 32-bit integer...
if ((yylval.intVal & 0xffffffff) == yylval.intVal)
return us ? TOKEN_UINT32_CONSTANT : TOKEN_INT32_CONSTANT;
else
return us ? TOKEN_UINT64_CONSTANT : TOKEN_INT64_CONSTANT;
else if (us) {
// u suffix only
if (yylval.intVal <= 0xfffffffL)
return TOKEN_UINT32_CONSTANT;
else
return TOKEN_UINT64_CONSTANT;
}
else {
// No u or l suffix
// First, see if we can fit this into a 32-bit integer...
if (yylval.intVal <= 0x7fffffffLLU)
return TOKEN_INT32_CONSTANT;
else if (yylval.intVal <= 0xffffffffLLU)
return TOKEN_UINT32_CONSTANT;
else if (yylval.intVal <= 0x7fffffffffffffffLLU)
return TOKEN_INT64_CONSTANT;
else
return TOKEN_UINT64_CONSTANT;
}
}
}

2
parse.yy
View File

@@ -144,7 +144,7 @@ struct ForeachDimension {
%}
%union {
int64_t intVal;
uint64_t intVal;
float floatVal;
std::string *stringVal;
const char *constCharPtr;