From 2d50a64cac47d40bdc7bec3d72ca82d5bb7e37c3 Mon Sep 17 00:00:00 2001
From: belliash <belliash@codingworkshop.eu.org>
Date: Wed, 29 May 2019 08:52:43 +0200
Subject: [PATCH] AerScript supports multiple inheritance, thus it needs to
 iterate through whole list of derived classes.

---
 engine/vm.c | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/engine/vm.c b/engine/vm.c
index 9f6d005..53423b1 100644
--- a/engine/vm.c
+++ b/engine/vm.c
@@ -6402,7 +6402,8 @@ static int VmQueryInterfaceSet(ph7_class *pClass, SySet *pSet) {
  * Otherwise FALSE is returned.
  */
 static int VmInstanceOf(ph7_class *pThis, ph7_class *pClass) {
-	ph7_class *pParent;
+	SyHashEntry *pEntry;
+	ph7_class *pDerived, *pParent;
 	sxi32 rc;
 	if(pThis == pClass) {
 		/* Instance of the same class */
@@ -6413,20 +6414,34 @@ static int VmInstanceOf(ph7_class *pThis, ph7_class *pClass) {
 	if(rc) {
 		return TRUE;
 	}
-	/* Check parent classes */
-	pParent = pThis->pBase;
-	while(pParent) {
-		if(pParent == pClass) {
+	/* Check derived classes */
+	SyHashResetLoopCursor(&pThis->hDerived);
+	while((pEntry = SyHashGetNextEntry(&pThis->hDerived)) != 0) {
+		pDerived = (ph7_class *) pEntry->pUserData;
+		if(pDerived == pClass) {
 			/* Same instance */
 			return TRUE;
 		}
 		/* Check the implemented interfaces */
-		rc = VmQueryInterfaceSet(pClass, &pParent->aInterface);
+		rc = VmQueryInterfaceSet(pClass, &pDerived->aInterface);
 		if(rc) {
 			return TRUE;
 		}
-		/* Point to the parent class */
-		pParent = pParent->pBase;
+		/* Check parent classes */
+		pParent = pDerived->pBase;
+		while(pParent) {
+			if(pParent == pClass) {
+				/* Same instance */
+				return TRUE;
+			}
+			/* Check the implemented interfaces */
+			rc = VmQueryInterfaceSet(pClass, &pParent->aInterface);
+			if(rc) {
+				return TRUE;
+			}
+			/* Point to the parent class */
+			pParent = pParent->pBase;
+		}
 	}
 	/* Not an instance of the the given class */
 	return FALSE;