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

Multiple small fixes for better C conformance.

Browse Source 
Allow atomic types to be initialized with single-element expression lists:
  int x = { 5 };
Issue an error if a storage class is provided with a function parameter.
Issue an error if two members of a struct have the same name.
Issue an error on trying to assign to a struct with a const member, even if
  the struct itself isn't const.
Issue an error if a function is redefined.
Issue an error if a function overload is declared that differs only in return
  type from a previously-declared function.
Issue an error if "inline" or "task" qualifiers are used outside of function
  declarations.
Allow trailing ',' at the end of enumerator lists.
Multiple tests for all of the above.
This commit is contained in:
Matt Pharr
2011-11-25 17:52:23 -08:00
parent 975db80ef6
commit 867efc2bce
20 changed files with 218 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
parse.yy
View File

@@ -34,7 +34,7 @@
%locations
/* supress shift-reduces conflict message for dangling else */
/* one for 'if', one for 'uif' */
/* one for 'if', one for 'cif' */
%expect 2
%pure-parser
@@ -96,6 +96,8 @@ static void lAddThreadIndexCountToSymbolTable(SourcePos pos);
static std::string lGetAlternates(std::vector<std::string> &alternates);
static const char *lGetStorageClassString(StorageClass sc);
static bool lGetConstantInt(Expr *expr, int *value, SourcePos pos, const char *usage);
static EnumType *lCreateEnumType(const char *name, std::vector<Symbol *> *enums,
SourcePos pos);
static void lFinalizeEnumeratorSymbols(std::vector<Symbol *> &enums,
const EnumType *enumType);
@@ -732,9 +734,18 @@ specifier_qualifier_list
$$ = $2;
}
}
else {
UNIMPLEMENTED;
else if ($1 == TYPEQUAL_INLINE) {
Error(@1, "\"inline\" qualifier is illegal outside of "
"function declarations.");
$$ = $2;
}
else if ($1 == TYPEQUAL_TASK) {
Error(@1, "\"task\" qualifier is illegal outside of "
"function declarations.");
$$ = $2;
}
else
FATAL("Unhandled type qualifier in parser.");
}
else
$$ = NULL;
@@ -773,32 +784,19 @@ enum_identifier
enum_specifier
: TOKEN_ENUM '{' enumerator_list '}'
{
if ($3 != NULL) {
EnumType *enumType = new EnumType(@1);
lFinalizeEnumeratorSymbols(*$3, enumType);
for (unsigned int i = 0; i < $3->size(); ++i)
m->symbolTable->AddVariable((*$3)[i]);
enumType->SetEnumerators(*$3);
$$ = enumType;
}
else
$$ = NULL;
$$ = lCreateEnumType(NULL, $3, @1);
}
| TOKEN_ENUM enum_identifier '{' enumerator_list '}'
{
if ($4 != NULL) {
EnumType *enumType = new EnumType($2, $2);
m->symbolTable->AddType($2, enumType, @2);
lFinalizeEnumeratorSymbols(*$4, enumType);
for (unsigned int i = 0; i < $4->size(); ++i)
m->symbolTable->AddVariable((*$4)[i]);
enumType->SetEnumerators(*$4);
$$ = enumType;
}
else
$$ = NULL;
$$ = lCreateEnumType($2, $4, @2);
}
| TOKEN_ENUM '{' enumerator_list ',' '}'
{
$$ = lCreateEnumType(NULL, $3, @1);
}
| TOKEN_ENUM enum_identifier '{' enumerator_list ',' '}'
{
$$ = lCreateEnumType($2, $4, @2);
}
| TOKEN_ENUM enum_identifier
{
@@ -1579,6 +1577,23 @@ lGetConstantInt(Expr *expr, int *value, SourcePos pos, const char *usage) {
}
static EnumType *
lCreateEnumType(const char *name, std::vector<Symbol *> *enums, SourcePos pos) {
if (enums == NULL)
return NULL;
EnumType *enumType = name ? new EnumType(name, pos) : new EnumType(pos);
if (name != NULL)
m->symbolTable->AddType(name, enumType, pos);
lFinalizeEnumeratorSymbols(*enums, enumType);
for (unsigned int i = 0; i < enums->size(); ++i)
m->symbolTable->AddVariable((*enums)[i]);
enumType->SetEnumerators(*enums);
return enumType;
}
/** Given an array of enumerator symbols, make sure each of them has a
ConstExpr * in their Symbol::constValue member that stores their
unsigned integer value. Symbols that had values explicitly provided