aerscript/Aer
0
5
Fork 0
Code Issues 6 Pull Requests Releases 2 Wiki Activity

Typehinting merge #50

Merged
belliash merged 298 commits from typehinting into master 2019-04-17 11:27:52 +02:00
Conversation 0 Commits 298 Files Changed 98 +13 -25
1 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bd22425b46 - Show all commits

38
engine/compiler.c
View File

@ -1438,38 +1438,26 @@ static sxi32 PH7_CompileContinue(ph7_gen_state *pGen) {
pGen->pIn++; pGen->pIn++;
/* Point to the target loop */ /* Point to the target loop */
pLoop = PH7_GenStateFetchBlock(pGen->pCurrent, GEN_BLOCK_LOOP, 0); pLoop = PH7_GenStateFetchBlock(pGen->pCurrent, GEN_BLOCK_LOOP, 0);
if(pLoop == 0) { if(pLoop == 0 || pLoop->iFlags & GEN_BLOCK_SWITCH) {
/* Illegal continue */ /* Illegal continue */
rc = PH7_GenCompileError(pGen, E_ERROR, nLine, "A 'continue' statement may only be used within a loop or switch"); rc = PH7_GenCompileError(pGen, E_ERROR, nLine, "A 'continue' statement may only be used within a loop");
if(rc == SXERR_ABORT) { if(rc == SXERR_ABORT) {
/* Error count limit reached,abort immediately */ /* Error count limit reached,abort immediately */
return SXERR_ABORT; return SXERR_ABORT;
} }
} else { } else {
sxu32 nInstrIdx = 0; sxu32 nInstrIdx = 0;
if(pLoop->iFlags & GEN_BLOCK_SWITCH) { if(!pLoop->bPostContinue) {
/* /* Emit the OP_JMPLFE instruction to leave the loop frame */
* Note that unlike some other languages, the continue statement applies to switch PH7_VmEmitInstr(pGen->pVm, nLine, PH7_OP_JMPLFE, 0, 0, 0, 0);
* and acts similar to break. If you have a switch inside a loop and wish to continue }
* to the next iteration of the outer loop, use continue 2. PH7_VmEmitInstr(pGen->pVm, 0, PH7_OP_JMP, 0, pLoop->nFirstInstr, 0, &nInstrIdx);
*/ if(pLoop->bPostContinue) {
rc = PH7_VmEmitInstr(pGen->pVm, 0, PH7_OP_JMP, 0, 0, 0, &nInstrIdx); JumpFixup sJumpFix;
if(rc == SXRET_OK) { /* Post-continue */
PH7_GenStateNewJumpFixup(pLoop, PH7_OP_JMP, nInstrIdx); sJumpFix.nJumpType = PH7_OP_JMP;
} sJumpFix.nInstrIdx = nInstrIdx;
} else { SySetPut(&pLoop->aPostContFix, (const void *)&sJumpFix);
if(!pLoop->bPostContinue) {
/* Emit the OP_JMPLFE instruction to leave the loop frame */
PH7_VmEmitInstr(pGen->pVm, nLine, PH7_OP_JMPLFE, 0, 0, 0, 0);
}
PH7_VmEmitInstr(pGen->pVm, 0, PH7_OP_JMP, 0, pLoop->nFirstInstr, 0, &nInstrIdx);
if(pLoop->bPostContinue) {
JumpFixup sJumpFix;
/* Post-continue */
sJumpFix.nJumpType = PH7_OP_JMP;
sJumpFix.nInstrIdx = nInstrIdx;
SySetPut(&pLoop->aPostContFix, (const void *)&sJumpFix);
}
} }
} }
if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_SEMI) == 0) { if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_SEMI) == 0) {