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

Added pre/post inc/dec operators for pointers.

Browse source 
git-svn-id: http://picoc.googlecode.com/svn/trunk@270 21eae674-98b7-11dd-bd71-f92a316d2d60
This commit is contained in:
zik.saleeba 2009-04-26 11:39:16 +00:00
parent 4ea76ea5b3
commit 647cc90999
1 changed files with 55 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
expression.c
View file

@ -297,14 +297,35 @@ void ExpressionPrefixOperator(struct ParseState *Parser, struct ExpressionStack
} }
} }
#endif #endif
#if 0 else if (TopValue->Typ->Base == TypePointer)
XXX - finish this
else
{ {
/* pointer prefix arithmetic */ /* pointer prefix arithmetic */
int TopInt = COERCE_INTEGER(TopValue); int Size = TypeSize(TopValue->Typ->FromType, 0);
int OrigOffset = TopValue->Val->Pointer.Offset;
struct Value *StackValue;
if (TopValue->Val->Pointer.Segment == NULL)
ProgramFail(Parser, "invalid use of a NULL pointer");
if (!TopValue->IsLValue)
ProgramFail(Parser, "can't assign to this");
switch (Op)
{
case TokenIncrement: TopValue->Val->Pointer.Offset += Size; break;
case TokenDecrement: TopValue->Val->Pointer.Offset -= Size; break;
default: ProgramFail(Parser, "invalid operation"); break;
} }
#endif
/* check pointer bounds */
if (TopValue->Val->Pointer.Offset < 0 || TopValue->Val->Pointer.Offset > TypeLastAccessibleOffset(TopValue->Val->Pointer.Segment))
TopValue->Val->Pointer.Offset = OrigOffset;
StackValue = ExpressionStackPushValueByType(Parser, StackTop, TopValue->Typ);
StackValue->Val->Pointer = TopValue->Val->Pointer;
}
else
ProgramFail(Parser, "invalid operation");
break; break;
} }
} }
@ -335,6 +356,35 @@ void ExpressionPostfixOperator(struct ParseState *Parser, struct ExpressionStack
ExpressionPushInt(Parser, StackTop, ResultInt); ExpressionPushInt(Parser, StackTop, ResultInt);
} }
else if (TopValue->Typ->Base == TypePointer)
{
/* pointer postfix arithmetic */
int Size = TypeSize(TopValue->Typ->FromType, 0);
int OrigOffset = TopValue->Val->Pointer.Offset;
struct Value *StackValue;
if (TopValue->Val->Pointer.Segment == NULL)
ProgramFail(Parser, "invalid use of a NULL pointer");
if (!TopValue->IsLValue)
ProgramFail(Parser, "can't assign to this");
StackValue = ExpressionStackPushValueByType(Parser, StackTop, TopValue->Typ);
StackValue->Val->Pointer = TopValue->Val->Pointer;
switch (Op)
{
case TokenIncrement: TopValue->Val->Pointer.Offset += Size; break;
case TokenDecrement: TopValue->Val->Pointer.Offset -= Size; break;
default: ProgramFail(Parser, "invalid operation"); break;
}
/* check pointer bounds */
if (TopValue->Val->Pointer.Offset < 0 || TopValue->Val->Pointer.Offset > TypeLastAccessibleOffset(TopValue->Val->Pointer.Segment))
TopValue->Val->Pointer.Offset = OrigOffset;
}
else
ProgramFail(Parser, "invalid operation");
} }
/* evaluate an infix operator */ /* evaluate an infix operator */