Mirror/squirrel
1
0
Fork 0
mirror of https://github.com/albertodemichelis/squirrel.git synced 2026-01-18 13:49:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix bug in optimizer

Browse Source
This commit is contained in:
Alberto Demichelis
2023-07-28 00:16:56 +02:00
parent 57b8f56902
commit cb12a4a704
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
squirrel/sqcompiler.cpp
View File

@ -842,7 +842,7 @@ public:
} }
break; break;
case _SC('{'): case _SC('{'):
_fs->AddInstruction(_OP_NEWOBJ, _fs->PushTarget(),0,NOT_TABLE); _fs->AddInstruction(_OP_NEWOBJ, _fs->PushTarget(),0,0,NOT_TABLE);
Lex();ParseTableOrClass(_SC(','),_SC('}')); Lex();ParseTableOrClass(_SC(','),_SC('}'));
break; break;
case TK_FUNCTION: FunctionExp();break; case TK_FUNCTION: FunctionExp();break;
@ -979,7 +979,7 @@ public:
//check if is an attribute //check if is an attribute
if(separator == ';') { if(separator == ';') {
if(_token == TK_ATTR_OPEN) { if(_token == TK_ATTR_OPEN) {
_fs->AddInstruction(_OP_NEWOBJ, _fs->PushTarget(),0,NOT_TABLE); Lex(); _fs->AddInstruction(_OP_NEWOBJ, _fs->PushTarget(),0,0,NOT_TABLE); Lex();
ParseTableOrClass(',',TK_ATTR_CLOSE); ParseTableOrClass(',',TK_ATTR_CLOSE);
hasattrs = true; hasattrs = true;
} }
@ -1064,7 +1064,12 @@ public:
Lex(); Expression(); Lex(); Expression();
SQInteger src = _fs->PopTarget(); SQInteger src = _fs->PopTarget();
SQInteger dest = _fs->PushTarget(); SQInteger dest = _fs->PushTarget();
if(dest != src) _fs->AddInstruction(_OP_MOVE, dest, src); if (dest != src) {
if (_fs->IsLocal(src)) {
_fs->SnoozeOpt();
}
_fs->AddInstruction(_OP_MOVE, dest, src);
}
} }
else{ else{
_fs->AddInstruction(_OP_LOADNULLS, _fs->PushTarget(),1); _fs->AddInstruction(_OP_LOADNULLS, _fs->PushTarget(),1);
@ -1468,7 +1473,7 @@ public:
} }
if(_token == TK_ATTR_OPEN) { if(_token == TK_ATTR_OPEN) {
Lex(); Lex();
_fs->AddInstruction(_OP_NEWOBJ, _fs->PushTarget(),0,NOT_TABLE); _fs->AddInstruction(_OP_NEWOBJ, _fs->PushTarget(),0,0,NOT_TABLE);
ParseTableOrClass(_SC(','),TK_ATTR_CLOSE); ParseTableOrClass(_SC(','),TK_ATTR_CLOSE);
attrs = _fs->TopTarget(); attrs = _fs->TopTarget();
} }