Fixed local conflicts

git-svn-id: http://picoc.googlecode.com/svn/trunk@108 21eae674-98b7-11dd-bd71-f92a316d2d60
This commit is contained in:
zik.saleeba 2009-02-24 08:00:53 +00:00
parent 7f5aa8e701
commit aa213f4129

View file

@ -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);
}
}
}