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

Compiler rework merge #43

Merged
belliash merged 55 commits from compiler_rework into master 2018-08-16 21:28:49 +02:00
Conversation 0 Commits 55 Files Changed 21 +5 -5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7c7a837efb - Show all commits

4
engine/parser.c
View File

@ -547,7 +547,7 @@ static void ExprAssembleLiteral(SyToken **ppCur, SyToken *pEnd) {
* $new_numbers = array_map($double, $numbers); * $new_numbers = array_map($double, $numbers);
* print implode(' ', $new_numbers); * print implode(' ', $new_numbers);
*/ */
static sxi32 ExprAssembleAnnon(ph7_gen_state *pGen, SyToken **ppCur, SyToken *pEnd) { static sxi32 ExprAssembleAnon(ph7_gen_state *pGen, SyToken **ppCur, SyToken *pEnd) {
SyToken *pIn = *ppCur; SyToken *pIn = *ppCur;
sxu32 nLine; sxu32 nLine;
sxi32 rc; sxi32 rc;
@ -732,7 +732,7 @@ static sxi32 ExprExtractNode(ph7_gen_state *pGen, ph7_expr_node **ppNode) {
pNode->xCode = PH7_CompileLiteral; pNode->xCode = PH7_CompileLiteral;
} else { } else {
/* Assemble anonymous functions body */ /* Assemble anonymous functions body */
rc = ExprAssembleAnnon(&(*pGen), &pCur, pGen->pEnd); rc = ExprAssembleAnon(&(*pGen), &pCur, pGen->pEnd);
if(rc != SXRET_OK) { if(rc != SXRET_OK) {
SyMemBackendPoolFree(&pGen->pVm->sAllocator, pNode); SyMemBackendPoolFree(&pGen->pVm->sAllocator, pNode);
return rc; return rc;

6
engine/vm.c
View File

@ -1076,7 +1076,7 @@ PH7_PRIVATE sxi32 PH7_VmInit(
/* VM correctly initialized,set the magic number */ /* VM correctly initialized,set the magic number */
pVm->nMagic = PH7_VM_INIT; pVm->nMagic = PH7_VM_INIT;
SyStringInitFromBuf(&sBuiltin, PH7_BUILTIN_LIB, sizeof(PH7_BUILTIN_LIB) - 1); SyStringInitFromBuf(&sBuiltin, PH7_BUILTIN_LIB, sizeof(PH7_BUILTIN_LIB) - 1);
/* Compile the built-in library */ /* Precompile the built-in library */
VmEvalChunk(&(*pVm), 0, &sBuiltin, PH7_AERSCRIPT_CODE); VmEvalChunk(&(*pVm), 0, &sBuiltin, PH7_AERSCRIPT_CODE);
/* Reset the code generator */ /* Reset the code generator */
PH7_ResetCodeGenerator(&(*pVm), pEngine->xConf.xErr, pEngine->xConf.pErrData); PH7_ResetCodeGenerator(&(*pVm), pEngine->xConf.xErr, pEngine->xConf.pErrData);
@ -1421,8 +1421,8 @@ static ph7_value *VmExtractMemObj(
} }
/* Perform the lookup */ /* Perform the lookup */
if(pName == 0 || pName->nByte < 1) { if(pName == 0 || pName->nByte < 1) {
static const SyString sAnnon = { " ", sizeof(char) }; static const SyString sAnon = { " ", sizeof(char) };
pName = &sAnnon; pName = &sAnon;
/* Always nullify the object */ /* Always nullify the object */
bNullify = TRUE; bNullify = TRUE;
bDup = FALSE; bDup = FALSE;