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

Optimize the code, #45.
The build was successful. Details

This commit is contained in:
Rafal Kupiec 2018-08-22 08:51:45 +02:00
parent a0f7949b24
commit 3e18a5b8e8
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
1 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
engine/compiler.c
View File

@ -1203,8 +1203,10 @@ static sxi32 PH7_GenStateLoadLiteral(ph7_gen_state *pGen) {
/* Emit the load constant instruction */
PH7_VmEmitInstr(pGen->pVm, PH7_OP_LOADC, 0, nIdx, 0, 0);
return SXRET_OK;
} else if(pStr->nByte == sizeof("__FILE__") - 1 &&
SyMemcmp(pStr->zString, "__FILE__", sizeof("__FILE__") - 1) == 0) {
} else if((pStr->nByte == sizeof("__FILE__") - 1 &&
SyMemcmp(pStr->zString, "__FILE__", sizeof("__FILE__") - 1) == 0) ||
(pStr->nByte == sizeof("__DIR__") - 1 &&
SyMemcmp(pStr->zString, "__DIR__", sizeof("__DIR__") - 1) == 0)) {
pObj = PH7_ReserveConstObj(pGen->pVm, &nIdx);
if(pObj == 0) {
PH7_GenCompileError(pGen, E_ERROR, pToken->nLine, "Fatal, PH7 engine is running out of memory");
@ -1216,34 +1218,20 @@ static sxi32 PH7_GenStateLoadLiteral(ph7_gen_state *pGen) {
SyStringInitFromBuf(&pMemory, ":MEMORY:", (int)sizeof(":MEMORY:") - 1);
PH7_MemObjInitFromString(pGen->pVm, pObj, &pMemory);
} else {
PH7_MemObjInitFromString(pGen->pVm, pObj, pFile);
}
/* Emit the load constant instruction */
PH7_VmEmitInstr(pGen->pVm, PH7_OP_LOADC, 0, nIdx, 0, 0);
return SXRET_OK;
} else if(pStr->nByte == sizeof("__DIR__") - 1 &&
SyMemcmp(pStr->zString, "__DIR__", sizeof("__DIR__") - 1) == 0) {
pObj = PH7_ReserveConstObj(pGen->pVm, &nIdx);
if(pObj == 0) {
PH7_GenCompileError(pGen, E_ERROR, pToken->nLine, "Fatal, PH7 engine is running out of memory");
return SXERR_ABORT;
}
SyString *pFile = (SyString *)SySetPeek(&pGen->pVm->aFiles);
if(pFile == 0) {
SyString pMemory;
SyStringInitFromBuf(&pMemory, ":MEMORY:", (int)sizeof(":MEMORY:") - 1);
PH7_MemObjInitFromString(pGen->pVm, pObj, &pMemory);
} else {
SyString pDir;
if(pFile->nByte > 0) {
const char *zDir;
int nLen;
zDir = PH7_ExtractDirName(pFile->zString, (int)pFile->nByte, &nLen);
SyStringInitFromBuf(&pDir, zDir, nLen);
if(pStr->zString[2] == 'F' /* FILE */) {
PH7_MemObjInitFromString(pGen->pVm, pObj, pFile);
} else {
SyStringInitFromBuf(&pDir, ".", 1);
SyString pDir;
if(pFile->nByte > 0) {
const char *zDir;
int nLen;
zDir = PH7_ExtractDirName(pFile->zString, (int)pFile->nByte, &nLen);
SyStringInitFromBuf(&pDir, zDir, nLen);
} else {
SyStringInitFromBuf(&pDir, ".", 1);
}
PH7_MemObjInitFromString(pGen->pVm, pObj, &pDir);
}
PH7_MemObjInitFromString(pGen->pVm, pObj, &pDir);
}
/* Emit the load constant instruction */
PH7_VmEmitInstr(pGen->pVm, PH7_OP_LOADC, 0, nIdx, 0, 0);