From aa213f41291c1a7bc0b793873d1bb69b47152063 Mon Sep 17 00:00:00 2001 From: "zik.saleeba" Date: Tue, 24 Feb 2009 08:00:53 +0000 Subject: [PATCH] Fixed local conflicts git-svn-id: http://picoc.googlecode.com/svn/trunk@108 21eae674-98b7-11dd-bd71-f92a316d2d60 --- parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parse.c b/parse.c index 1cf46e8..5c0fea7 100644 --- a/parse.c +++ b/parse.c @@ -222,7 +222,7 @@ int ParseValue(struct ParseState *Parser, struct Value **Result) ProgramFail(Parser, "illegal array index"); VariableStackPop(Parser, *Result); - *Result = VariableAllocValueFromExistingData(Parser, (*Result)->Typ->FromType, (union AnyValue *)((*Result)->Val->Array.Data + TypeSize((*Result)->Typ->FromType, 0) * IntValue), TRUE); + *Result = VariableAllocValueFromExistingData(Parser, (*Result)->Typ->FromType, (union AnyValue *)((*Result)->Val->Array.Data + TypeSize((*Result)->Typ->FromType, 0) * IntValue), (*Result)->IsLValue); } } }