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

Properly look for method in all classes.
The build was successful. Details

This commit is contained in:
Rafal Kupiec 2019-05-29 06:12:49 +02:00
parent 26333360b0
commit 675f3596a1
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
engine/vm.c
View File

@ -4149,7 +4149,7 @@ static sxi32 VmByteCodeExec(
if(!pNos->x.pOther) { if(!pNos->x.pOther) {
PH7_VmThrowError(&(*pVm), PH7_CTX_ERR, "Call to non-instantiated object '$%z'", &sName); PH7_VmThrowError(&(*pVm), PH7_CTX_ERR, "Call to non-instantiated object '$%z'", &sName);
} }
ph7_class *pClass; ph7_class *pClass, *pDerived;
/* Class already instantiated */ /* Class already instantiated */
pThis = (ph7_class_instance *)pNos->x.pOther; pThis = (ph7_class_instance *)pNos->x.pOther;
/* Point to the instantiated class */ /* Point to the instantiated class */
@ -4170,14 +4170,30 @@ static sxi32 VmByteCodeExec(
ph7_class_method *pMeth = 0; ph7_class_method *pMeth = 0;
if(sName.nByte > 0) { if(sName.nByte > 0) {
/* Extract the target method */ /* Extract the target method */
pMeth = PH7_ClassExtractMethod(pClass, sName.zString, sName.nByte); if(pNos->iFlags != MEMOBJ_PARENTOBJ) {
pMeth = PH7_ClassExtractMethod(pClass, sName.zString, sName.nByte);
}
if(pMeth == 0 && pNos->iFlags != MEMOBJ_BASEOBJ) {
/* Browse hashtable from the beginning */
SyHashResetLoopCursor(&pClass->hDerived);
/* Search for appropriate class member */
SyHashEntry *pEntry;
while((pEntry = SyHashGetNextEntry(&pClass->hDerived)) != 0) {
pDerived = (ph7_class *) pEntry->pUserData;
pMeth = PH7_ClassExtractMethod(pDerived, sName.zString, sName.nByte);
if(pMeth) {
pClass = pDerived;
break;
}
}
}
} }
if(pMeth == 0) { if(pMeth == 0) {
PH7_VmThrowError(&(*pVm), PH7_CTX_ERR, "Call to undefined method '%z->%z()'", PH7_VmThrowError(&(*pVm), PH7_CTX_ERR, "Call to undefined method '%z->%z()'",
&pClass->sName, &sName &pClass->sName, &sName
); );
} else { } else {
if(pNos->iFlags == MEMOBJ_PARENTOBJ && pMeth->iProtection == PH7_CLASS_PROT_PRIVATE) { if(pMeth->iProtection == PH7_CLASS_PROT_PRIVATE && (pNos->iFlags == MEMOBJ_BASEOBJ || pNos->iFlags == MEMOBJ_PARENTOBJ)) {
PH7_VmThrowError(&(*pVm), PH7_CTX_ERR, PH7_VmThrowError(&(*pVm), PH7_CTX_ERR,
"Access to the class method '%z->%z()' is forbidden", &pClass->sName, &sName); "Access to the class method '%z->%z()' is forbidden", &pClass->sName, &sName);
} }

4
tests/entry_point.aer
View File

@ -14,12 +14,12 @@ class Test2 extends Test1 {
public void __construct() { public void __construct() {
print("Test2::__construct() called.\n"); print("Test2::__construct() called.\n");
$base->__construct(); $parent->__construct();
} }
public void __destruct() { public void __destruct() {
print("Test2::__destruct() called.\n"); print("Test2::__destruct() called.\n");
$base->__destruct(); $parent->__destruct();
} }
} }