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

Generally speaking ... this is working.

Browse Source 
This commit partially fixes #5, however it still needs some work. TODO:
 * remove debugging printf calls,
 * some tuning, to consume less memory,
 * implement similar solution for interfaces
This commit is contained in:
Rafal Kupiec
2018-07-27 17:42:12 +02:00
parent af2c23d3b2
commit 9e885b3196
3 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
engine/vm.c
View File

@@ -4516,14 +4516,14 @@ static sxi32 VmByteCodeExec(
case PH7_OP_CLASS_INIT:
{
ph7_class *pClassInfo = (ph7_class *)pInstr->p3;
ph7_class *pClass = PH7_VmExtractClass(pVm, pClassInfo->sName.zString, pClassInfo->sName.nByte, FALSE, 0);
ph7_class *pBase = 0;
ph7_class *pClass;
printf("Called by class: '%s'\n", pClassInfo->sName);
printf("Called by class: '%s'\n", pClass->sName.zString);
if(pInstr->iP1) {
/* This class inherits from other classes */
SyString *apExtends;
while(SySetGetNextEntry(&pClassInfo->sExtends, (void **)&apExtends) == SXRET_OK) {
printf("Class '%s' inherits from '%s'\n", pClassInfo->sName.zString, apExtends->zString);
printf("Class '%s' inherits from '%s'\n", pClass->sName.zString, apExtends->zString);
pBase = PH7_VmExtractClass(pVm, apExtends->zString, apExtends->nByte, FALSE, 0);
if(pBase == 0) {
/* Non-existent base class */
@@ -4535,13 +4535,17 @@ static sxi32 VmByteCodeExec(
/* Trying to inherit from final class */
PH7_VmThrowError(pVm, 0, PH7_CTX_ERR, "Class cannot inherit from final class");
}
rc = PH7_ClassInherit(pClass, pBase);
if(rc != SXRET_OK) {
break;
}
}
}
if(pInstr->iP2) {
/* This class implements some interfaces */
SyString *apImplements;
while(SySetGetNextEntry(&pClassInfo->sImplements, (void **)&apImplements) == SXRET_OK) {
printf("Class '%s' implements '%s'\n", pClassInfo->sName.zString, apImplements->zString);
printf("Class '%s' implements '%s'\n", pClass->sName.zString, apImplements->zString);
pBase = PH7_VmExtractClass(pVm, apImplements->zString, apImplements->nByte, FALSE, 0);
if(pBase == 0) {
/* Non-existent interface */
@@ -4550,6 +4554,10 @@ static sxi32 VmByteCodeExec(
/* Trying to extend a class */
PH7_VmThrowError(pVm, 0, PH7_CTX_ERR, "Interface cannot inherit from a class");
}
rc = PH7_ClassImplement(pClass, pBase);
if(rc != SXRET_OK) {
break;
}
}
}
break;