gered/picoc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed problems with struct references in functions

Browse source 
git-svn-id: http://picoc.googlecode.com/svn/trunk@409 21eae674-98b7-11dd-bd71-f92a316d2d60
This commit is contained in:
zik.saleeba 2010-02-28 14:16:21 +00:00
parent f596c5aea4
commit cd4bea4903
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
type.c
View file

@ -183,9 +183,6 @@ void TypeParseStruct(struct ParseState *Parser, struct ValueType **Typ, int IsSt
enum LexToken Token; enum LexToken Token;
int AlignBoundary; int AlignBoundary;
if (TopStackFrame != NULL)
ProgramFail(Parser, "struct/union definitions can only be globals");
if (LexGetToken(Parser, &LexValue, TRUE) != TokenIdentifier) if (LexGetToken(Parser, &LexValue, TRUE) != TokenIdentifier)
ProgramFail(Parser, "struct/union name required"); ProgramFail(Parser, "struct/union name required");
@ -193,13 +190,17 @@ void TypeParseStruct(struct ParseState *Parser, struct ValueType **Typ, int IsSt
Token = LexGetToken(Parser, NULL, FALSE); Token = LexGetToken(Parser, NULL, FALSE);
if (Token != TokenLeftBrace) if (Token != TokenLeftBrace)
{ /* use the already defined structure */ {
/* use the already defined structure */
if ((*Typ)->Members == NULL) if ((*Typ)->Members == NULL)
ProgramFail(Parser, "structure '%s' isn't defined", LexValue->Val->Identifier); ProgramFail(Parser, "structure '%s' isn't defined", LexValue->Val->Identifier);
return; return;
} }
if (TopStackFrame != NULL)
ProgramFail(Parser, "struct/union definitions can only be globals");
LexGetToken(Parser, NULL, TRUE); LexGetToken(Parser, NULL, TRUE);
(*Typ)->Members = VariableAlloc(Parser, sizeof(struct Table) + STRUCT_TABLE_SIZE * sizeof(struct TableEntry), TRUE); (*Typ)->Members = VariableAlloc(Parser, sizeof(struct Table) + STRUCT_TABLE_SIZE * sizeof(struct TableEntry), TRUE);
(*Typ)->Members->HashTable = (struct TableEntry **)((char *)(*Typ)->Members + sizeof(struct Table)); (*Typ)->Members->HashTable = (struct TableEntry **)((char *)(*Typ)->Members + sizeof(struct Table));
@ -251,9 +252,6 @@ void TypeParseEnum(struct ParseState *Parser, struct ValueType **Typ)
int EnumValue = 0; int EnumValue = 0;
char *EnumIdentifier; char *EnumIdentifier;
if (TopStackFrame != NULL)
ProgramFail(Parser, "enum definitions can only be globals");
if (LexGetToken(Parser, &LexValue, TRUE) != TokenIdentifier) if (LexGetToken(Parser, &LexValue, TRUE) != TokenIdentifier)
ProgramFail(Parser, "enum name required"); ProgramFail(Parser, "enum name required");
@ -261,13 +259,17 @@ void TypeParseEnum(struct ParseState *Parser, struct ValueType **Typ)
EnumType = TypeGetMatching(Parser, &UberType, TypeEnum, 0, LexValue->Val->Identifier); EnumType = TypeGetMatching(Parser, &UberType, TypeEnum, 0, LexValue->Val->Identifier);
Token = LexGetToken(Parser, NULL, FALSE); Token = LexGetToken(Parser, NULL, FALSE);
if (Token != TokenLeftBrace) if (Token != TokenLeftBrace)
{ /* use the already defined enum */ {
/* use the already defined enum */
if ((*Typ)->Members == NULL) if ((*Typ)->Members == NULL)
ProgramFail(Parser, "enum '%s' isn't defined", LexValue->Val->Identifier); ProgramFail(Parser, "enum '%s' isn't defined", LexValue->Val->Identifier);
return; return;
} }
if (TopStackFrame != NULL)
ProgramFail(Parser, "enum definitions can only be globals");
LexGetToken(Parser, NULL, TRUE); LexGetToken(Parser, NULL, TRUE);
(*Typ)->Members = &GlobalTable; (*Typ)->Members = &GlobalTable;
memset((void *)&InitValue, '\0', sizeof(struct Value)); memset((void *)&InitValue, '\0', sizeof(struct Value));
@ -401,7 +403,8 @@ void TypeParseIdentPart(struct ParseState *Parser, struct ValueType *BasicTyp, s
ProgramFail(Parser, "bad type declaration"); ProgramFail(Parser, "bad type declaration");
if (*Identifier != StrEmpty) if (*Identifier != StrEmpty)
{ /* parse stuff after the identifier */ {
/* parse stuff after the identifier */
Done = FALSE; Done = FALSE;
while (!Done) while (!Done)
{ {