aerscript/Aer
0
5
Fork 0
程式碼 問題 6 合併請求 版本發布 2 Wiki 動態

Allow non-static methods inside static (final virtual) classes to be called statically.
已通過所有檢查
The build was successful.
詳情

瀏覽代碼
This commit is contained in:
Rafal Kupiec 2019-05-30 12:43:54 +02:00
父節點 ba1c840009
當前提交 a3a2c8b619
簽署人: belliash
GPG 金鑰 ID: 4E829243E0CFE6B4
共有 1 個檔案被更改，包括 1 行新增 和 1 行删除
顯示統計資料 下載 Patch 檔 下載差異檔 展開所有檔案 折疊所有檔案

2
engine/vm.c
查看文件

@ -4333,7 +4333,7 @@ static sxi32 VmByteCodeExec(
VmPopOperand(&pTos, 1); VmPopOperand(&pTos, 1);
} }
PH7_MemObjRelease(pTos); PH7_MemObjRelease(pTos);
} else if((pMeth->iFlags & PH7_CLASS_ATTR_STATIC) == 0) { } else if((pMeth->iFlags & PH7_CLASS_ATTR_STATIC) == 0 && ((pClass->iFlags & PH7_CLASS_FINAL) == 0 || (pClass->iFlags & PH7_CLASS_VIRTUAL) == 0)) {
PH7_VmThrowError(&(*pVm), PH7_CTX_ERR, "Attempt to call statically a non-static method '%z::%z()'", PH7_VmThrowError(&(*pVm), PH7_CTX_ERR, "Attempt to call statically a non-static method '%z::%z()'",
&pClass->sName, &sName); &pClass->sName, &sName);
} else if(!VmClassMemberAccess(&(*pVm), pClass, pMeth->iProtection)) { } else if(!VmClassMemberAccess(&(*pVm), pClass, pMeth->iProtection)) {