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

Get rid of variable variables. AerScript does not support it.
All checks were successful
The build was successful.
Details

Browse Source
This commit is contained in:
Rafal Kupiec 2019-04-22 12:01:11 +02:00
parent aa64a5eeb2
commit 555234e381
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
1 changed files with 21 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
engine/compiler.c
View File

@ -981,15 +981,11 @@ PH7_PRIVATE sxi32 PH7_CompileLangConstruct(ph7_gen_state *pGen, sxi32 iCompileFl
*/ */
PH7_PRIVATE sxi32 PH7_CompileVariable(ph7_gen_state *pGen, sxi32 iCompileFlag) { PH7_PRIVATE sxi32 PH7_CompileVariable(ph7_gen_state *pGen, sxi32 iCompileFlag) {
sxu32 nLine = pGen->pIn->nLine; sxu32 nLine = pGen->pIn->nLine;
sxi32 iVv;
void *p3; void *p3;
sxi32 rc; sxi32 rc;
iVv = -1; /* Variable variable counter */ /* Jump the dollar sign */
while(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_DOLLAR)) { pGen->pIn++;
pGen->pIn++; if(pGen->pIn >= pGen->pEnd || (pGen->pIn->nType & (PH7_TK_ID | PH7_TK_KEYWORD)) == 0) {
iVv++;
}
if(pGen->pIn >= pGen->pEnd || (pGen->pIn->nType & (PH7_TK_ID | PH7_TK_KEYWORD | PH7_TK_OCB/*'{'*/)) == 0) {
/* Invalid variable name */ /* Invalid variable name */
rc = PH7_GenCompileError(pGen, E_ERROR, nLine, "Invalid variable name"); rc = PH7_GenCompileError(pGen, E_ERROR, nLine, "Invalid variable name");
if(rc == SXERR_ABORT) { if(rc == SXERR_ABORT) {
@ -999,53 +995,30 @@ PH7_PRIVATE sxi32 PH7_CompileVariable(ph7_gen_state *pGen, sxi32 iCompileFlag) {
return SXRET_OK; return SXRET_OK;
} }
p3 = 0; p3 = 0;
if(pGen->pIn->nType & PH7_TK_OCB/*'{'*/) { SyHashEntry *pEntry;
/* Dynamic variable creation */ SyString *pName;
pGen->pIn++; /* Jump the open curly */ char *zName = 0;
pGen->pEnd--; /* Ignore the trailing curly */ /* Extract variable name */
if(pGen->pIn >= pGen->pEnd) { pName = &pGen->pIn->sData;
/* Empty expression */ /* Advance the stream cursor */
PH7_GenCompileError(&(*pGen), E_ERROR, nLine, "Invalid variable name"); pGen->pIn++;
return SXRET_OK; pEntry = SyHashGet(&pGen->hVar, (const void *)pName->zString, pName->nByte);
} if(pEntry == 0) {
/* Compile the expression holding the variable name */ /* Duplicate name */
rc = PH7_CompileExpr(&(*pGen), 0, 0); zName = SyMemBackendStrDup(&pGen->pVm->sAllocator, pName->zString, pName->nByte);
if(rc == SXERR_ABORT) { if(zName == 0) {
PH7_GenCompileError(pGen, E_ERROR, nLine, "Fatal, PH7 engine is running out of memory");
return SXERR_ABORT; return SXERR_ABORT;
} else if(rc == SXERR_EMPTY) {
PH7_GenCompileError(&(*pGen), E_ERROR, nLine, "Missing variable name");
return SXRET_OK;
} }
/* Install in the hashtable */
SyHashInsert(&pGen->hVar, zName, pName->nByte, zName);
} else { } else {
SyHashEntry *pEntry; /* Name already available */
SyString *pName; zName = (char *)pEntry->pUserData;
char *zName = 0;
/* Extract variable name */
pName = &pGen->pIn->sData;
/* Advance the stream cursor */
pGen->pIn++;
pEntry = SyHashGet(&pGen->hVar, (const void *)pName->zString, pName->nByte);
if(pEntry == 0) {
/* Duplicate name */
zName = SyMemBackendStrDup(&pGen->pVm->sAllocator, pName->zString, pName->nByte);
if(zName == 0) {
PH7_GenCompileError(pGen, E_ERROR, nLine, "Fatal, PH7 engine is running out of memory");
return SXERR_ABORT;
}
/* Install in the hashtable */
SyHashInsert(&pGen->hVar, zName, pName->nByte, zName);
} else {
/* Name already available */
zName = (char *)pEntry->pUserData;
}
p3 = (void *)zName;
} }
p3 = (void *)zName;
/* Emit the load instruction */ /* Emit the load instruction */
PH7_VmEmitInstr(pGen->pVm, 0, PH7_OP_LOAD, 0, 0, p3, 0); PH7_VmEmitInstr(pGen->pVm, 0, PH7_OP_LOAD, 0, 0, p3, 0);
while(iVv > 0) {
PH7_VmEmitInstr(pGen->pVm, 0, PH7_OP_LOAD, 0, 0, 0, 0);
iVv--;
}
/* Node successfully compiled */ /* Node successfully compiled */
return SXRET_OK; return SXRET_OK;
} }