TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 11:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix bugs with certain properties (and .x .y .z accessors) and add tests.

Browse source
This commit is contained in:
Jeff Hutchinson 2021-08-16 22:02:24 -04:00
parent a449fadde2
commit 6ec40e86da
4 changed files with 125 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Engine/source/console/astNodes.cpp
View file

@ -1262,9 +1262,10 @@ U32 SlotAccessNode::compile(CodeStream& codeStream, U32 ip, TypeReq type)
codeStream.emit(OP_SETCUROBJECT);
codeStream.emit(OP_SETCURFIELD);
codeStream.emitSTE(slotName);
codeStream.emit(OP_POP_STK);
if (arrayExpr)
{
codeStream.emit(OP_SETCURFIELD_ARRAY);
@ -1307,6 +1308,8 @@ U32 InternalSlotAccessNode::compile(CodeStream& codeStream, U32 ip, TypeReq type
codeStream.emit(OP_SETCUROBJECT_INTERNAL);
codeStream.emit(recurse);
codeStream.emit(OP_POP_STK);
return codeStream.tell();
}
@ -1319,34 +1322,6 @@ TypeReq InternalSlotAccessNode::getPreferredType()
U32 SlotAssignNode::compile(CodeStream& codeStream, U32 ip, TypeReq type)
{
// first eval the expression TypeReqString
// if it's an array:
// if OP_ADVANCE_STR 1
// eval array
// OP_ADVANCE_STR 1
// evaluate object expr
// OP_SETCUROBJECT 1
// OP_SETCURFIELD 1
// fieldName 1
// OP_TERMINATE_REWIND_STR 1
// OP_SETCURFIELDARRAY 1
// OP_TERMINATE_REWIND_STR 1
// else
// OP_ADVANCE_STR
// evaluate object expr
// OP_SETCUROBJECT
// OP_SETCURFIELD
// fieldName
// OP_TERMINATE_REWIND_STR
// OP_SAVEFIELD
// convert to return type if necessary.
precompileIdent(slotName);
ip = valueExpr->compile(codeStream, ip, TypeReqString);
@ -1364,6 +1339,13 @@ U32 SlotAssignNode::compile(CodeStream& codeStream, U32 ip, TypeReq type)
codeStream.emit(OP_SETCURFIELD);
codeStream.emitSTE(slotName);
if (objectExpr)
{
// Don't pop unless we are assigning a field to an object
// (For initializer fields, we don't wanna pop)
codeStream.emit(OP_POP_STK);
}
if (arrayExpr)
{
codeStream.emit(OP_SETCURFIELD_ARRAY);
@ -1429,6 +1411,8 @@ U32 SlotAssignOpNode::compile(CodeStream& codeStream, U32 ip, TypeReq type)
codeStream.emit(OP_SETCURFIELD);
codeStream.emitSTE(slotName);
codeStream.emit(OP_POP_STK);
if (arrayExpr)
{
codeStream.emit(OP_SETCURFIELD_ARRAY);