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

Fixed regression in array initialisers with trailing commas.

Browse source 
git-svn-id: http://picoc.googlecode.com/svn/trunk@579 21eae674-98b7-11dd-bd71-f92a316d2d60
This commit is contained in:
zik.saleeba 2012-09-06 12:07:57 +00:00
parent 83de73dc45
commit 29d15395ba
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
parse.c
View file

@ -181,8 +181,8 @@ struct Value *ParseFunctionDefinition(struct ParseState *Parser, struct ValueTyp
/* parse an array initialiser and assign to a variable */ /* parse an array initialiser and assign to a variable */
int ParseArrayInitialiser(struct ParseState *Parser, struct Value *NewVariable, int DoAssignment) int ParseArrayInitialiser(struct ParseState *Parser, struct Value *NewVariable, int DoAssignment)
{ {
int ArrayIndex; int ArrayIndex = 0;
enum LexToken Token = TokenComma; enum LexToken Token;
struct Value *CValue; struct Value *CValue;
/* count the number of elements in the array */ /* count the number of elements in the array */
@ -201,13 +201,11 @@ int ParseArrayInitialiser(struct ParseState *Parser, struct Value *NewVariable,
} }
/* parse the array initialiser */ /* parse the array initialiser */
for (ArrayIndex = 0; Token == TokenComma; ArrayIndex++) Token = LexGetToken(Parser, NULL, FALSE);
while (Token != TokenRightBrace)
{ {
struct Value *ArrayElement = NULL; struct Value *ArrayElement = NULL;
if (Token != TokenComma)
ProgramFail(Parser, "comma expected");
if (Parser->Mode == RunModeRun && DoAssignment) if (Parser->Mode == RunModeRun && DoAssignment)
ArrayElement = VariableAllocValueFromExistingData(Parser, NewVariable->Typ->FromType, (union AnyValue *)(&NewVariable->Val->ArrayMem[0] + TypeSize(NewVariable->Typ->FromType, 0, TRUE) * ArrayIndex), TRUE, NewVariable); ArrayElement = VariableAllocValueFromExistingData(Parser, NewVariable->Typ->FromType, (union AnyValue *)(&NewVariable->Val->ArrayMem[0] + TypeSize(NewVariable->Typ->FromType, 0, TRUE) * ArrayIndex), TRUE, NewVariable);
@ -221,13 +219,21 @@ int ParseArrayInitialiser(struct ParseState *Parser, struct Value *NewVariable,
VariableStackPop(Parser, ArrayElement); VariableStackPop(Parser, ArrayElement);
} }
Token = LexGetToken(Parser, NULL, TRUE); ArrayIndex++;
Token = LexGetToken(Parser, NULL, FALSE);
if (Token == TokenComma)
{
LexGetToken(Parser, NULL, TRUE);
Token = LexGetToken(Parser, NULL, FALSE);
}
else if (Token != TokenRightBrace)
ProgramFail(Parser, "comma expected");
} }
if (Token == TokenComma) if (Token == TokenRightBrace)
Token = LexGetToken(Parser, NULL, TRUE); LexGetToken(Parser, NULL, TRUE);
else
if (Token != TokenRightBrace)
ProgramFail(Parser, "'}' expected"); ProgramFail(Parser, "'}' expected");
return ArrayIndex; return ArrayIndex;

3
tests/Makefile
View file

@ -48,7 +48,8 @@ TESTS= 00_assignment.test \
50_logical_second_arg.test \ 50_logical_second_arg.test \
51_static.test \ 51_static.test \
52_unnamed_enum.test \ 52_unnamed_enum.test \
54_goto.test 54_goto.test \
55_array_initialiser.test
%.test: %.expect %.c %.test: %.expect %.c
@echo Test: $*... @echo Test: $*...