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

Improvements to constant int parsing.

Browse Source 
Accept 'u' and 'l' suffixes to force the constants to be corresponding types.
Just carry around a single 64-bit int value in yylval rather than having both
32- and 64-bit variants.
This commit is contained in:
Matt Pharr
2011-12-14 15:36:01 -08:00
parent b6af5c16c6
commit 1fa6520cb6
2 changed files with 29 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
parse.yy
View File

@@ -134,9 +134,8 @@ struct ForeachDimension {
%}
%union {
int32_t int32Val;
double floatVal;
int64_t int64Val;
int64_t intVal;
float floatVal;
std::string *stringVal;
const char *constCharPtr;
@@ -226,7 +225,7 @@ struct ForeachDimension {
%type <stringVal> string_constant
%type <constCharPtr> struct_or_union_name enum_identifier
%type <int32Val> int_constant soa_width_specifier
%type <intVal> int_constant soa_width_specifier
%type <foreachDimension> foreach_dimension_specifier
%type <foreachDimensionList> foreach_dimension_list
@@ -259,16 +258,16 @@ primary_expression
}
}
| TOKEN_INT32_CONSTANT {
$$ = new ConstExpr(AtomicType::UniformConstInt32, yylval.int32Val, @1);
$$ = new ConstExpr(AtomicType::UniformConstInt32, (int32_t)yylval.intVal, @1);
}
| TOKEN_UINT32_CONSTANT {
$$ = new ConstExpr(AtomicType::UniformConstUInt32, (uint32_t)yylval.int32Val, @1);
$$ = new ConstExpr(AtomicType::UniformConstUInt32, (uint32_t)yylval.intVal, @1);
}
| TOKEN_INT64_CONSTANT {
$$ = new ConstExpr(AtomicType::UniformConstInt64, yylval.int64Val, @1);
$$ = new ConstExpr(AtomicType::UniformConstInt64, (int64_t)yylval.intVal, @1);
}
| TOKEN_UINT64_CONSTANT {
$$ = new ConstExpr(AtomicType::UniformConstUInt64, (uint64_t)yylval.int64Val, @1);
$$ = new ConstExpr(AtomicType::UniformConstUInt64, (uint64_t)yylval.intVal, @1);
}
| TOKEN_FLOAT_CONSTANT {
$$ = new ConstExpr(AtomicType::UniformConstFloat, (float)yylval.floatVal, @1);
@@ -930,7 +929,7 @@ declarator
;
int_constant
: TOKEN_INT32_CONSTANT { $$ = yylval.int32Val; }
: TOKEN_INT32_CONSTANT { $$ = yylval.intVal; }
;
direct_declarator