From 39f698476fe58dcd2e21a451511ac9a13a7eec0e Mon Sep 17 00:00:00 2001
From: belliash <belliash@codingworkshop.eu.org>
Date: Fri, 5 Apr 2019 12:30:38 +0200
Subject: [PATCH] This is not the right way to go - revert 465336b23b.

---
 engine/memobj.c | 72 ++++++++++++++++++++++++++-----------------------
 1 file changed, 39 insertions(+), 33 deletions(-)

diff --git a/engine/memobj.c b/engine/memobj.c
index 693457f..9b549d9 100644
--- a/engine/memobj.c
+++ b/engine/memobj.c
@@ -491,7 +491,7 @@ PH7_PRIVATE sxi32 PH7_MemObjToChar(ph7_value *pObj) {
 PH7_PRIVATE sxi32 PH7_MemObjToVoid(ph7_value *pObj) {
 	if((pObj->iFlags & MEMOBJ_VOID) == 0) {
 		PH7_MemObjRelease(pObj);
-		MemObjSetType(pObj, MEMOBJ_VOID | MEMOBJ_NULL);
+		MemObjSetType(pObj, MEMOBJ_VOID);
 	}
 	return SXRET_OK;
 }
@@ -786,7 +786,7 @@ PH7_PRIVATE sxi32 PH7_MemObjInitFromVoid(ph7_vm *pVm, ph7_value *pObj, ph7_real
 	pObj->pVm = pVm;
 	SyBlobInit(&pObj->sBlob, &pVm->sAllocator);
 	/* Set the desired type */
-	pObj->iFlags = MEMOBJ_VOID | MEMOBJ_NULL;
+	pObj->iFlags = MEMOBJ_VOID;
 	return SXRET_OK;
 }/*
  * Initialize a ph7_value to the array type.
@@ -1212,6 +1212,9 @@ PH7_PRIVATE sxi32 PH7_MemObjAdd(ph7_value *pObj1, ph7_value *pObj2, int bAddStor
  */
 PH7_PRIVATE const char *PH7_MemObjTypeDump(ph7_value *pVal) {
 	const char *zType = "";
+	if(pVal->iFlags & MEMOBJ_NULL) {
+		zType = "NULL";
+	} else {
 	if(pVal->iFlags & MEMOBJ_HASHMAP) {
 		if(pVal->iFlags & MEMOBJ_MIXED) {
 			zType = "array(mixed, ";
@@ -1231,7 +1234,7 @@ PH7_PRIVATE const char *PH7_MemObjTypeDump(ph7_value *pVal) {
 			zType = "array(resource, ";
 		} else if(pVal->iFlags & MEMOBJ_CALL) {
 			zType = "array(callback, ";
-		} else if(pVal->iFlags & (MEMOBJ_VOID | MEMOBJ_NULL)) {
+		} else if(pVal->iFlags & MEMOBJ_VOID) {
 			zType = "array(void, ";
 		}
 	} else if(pVal->iFlags & MEMOBJ_OBJ) {
@@ -1250,9 +1253,10 @@ PH7_PRIVATE const char *PH7_MemObjTypeDump(ph7_value *pVal) {
 		zType = "resource";
 	} else if(pVal->iFlags & MEMOBJ_CALL) {
 		zType = "callback";
-	} else if(pVal->iFlags & (MEMOBJ_VOID | MEMOBJ_NULL)) {
+	} else if(pVal->iFlags & MEMOBJ_VOID) {
 		zType = "void";
 	}
+	}
 	return zType;
 }
 /*
@@ -1277,38 +1281,40 @@ PH7_PRIVATE sxi32 PH7_MemObjDump(
 		zType = PH7_MemObjTypeDump(pObj);
 		SyBlobAppend(&(*pOut), zType, SyStrlen(zType));
 	}
-	if(ShowType && (pObj->iFlags & MEMOBJ_HASHMAP) == 0) {
-		SyBlobAppend(&(*pOut), "(", sizeof(char));
-	}
-	if(pObj->iFlags & MEMOBJ_HASHMAP) {
-		/* Dump hashmap entries */
-		rc = PH7_HashmapDump(&(*pOut), (ph7_hashmap *)pObj->x.pOther, ShowType, nTab + 1, nDepth + 1);
-	} else if(pObj->iFlags & MEMOBJ_OBJ) {
-		/* Dump class instance attributes */
-		rc = PH7_ClassInstanceDump(&(*pOut), (ph7_class_instance *)pObj->x.pOther, ShowType, nTab + 1, nDepth + 1);
-	} else if(pObj->iFlags & (MEMOBJ_VOID | MEMOBJ_NULL)) {
-		SyBlobAppend(&(*pOut), "NULL", sizeof("NULL"));
-	} else {
-		SyBlob *pContents = &pObj->sBlob;
-		/* Get a printable representation of the contents */
-		if((pObj->iFlags & (MEMOBJ_STRING | MEMOBJ_CALL)) == 0) {
-			MemObjStringValue(&(*pOut), &(*pObj), FALSE);
+	if((pObj->iFlags & MEMOBJ_NULL) == 0) {
+		if(ShowType && (pObj->iFlags & MEMOBJ_HASHMAP) == 0) {
+			SyBlobAppend(&(*pOut), "(", sizeof(char));
+		}
+		if(pObj->iFlags & MEMOBJ_HASHMAP) {
+			/* Dump hashmap entries */
+			rc = PH7_HashmapDump(&(*pOut), (ph7_hashmap *)pObj->x.pOther, ShowType, nTab + 1, nDepth + 1);
+		} else if(pObj->iFlags & MEMOBJ_OBJ) {
+			/* Dump class instance attributes */
+			rc = PH7_ClassInstanceDump(&(*pOut), (ph7_class_instance *)pObj->x.pOther, ShowType, nTab + 1, nDepth + 1);
+		} else if(pObj->iFlags & MEMOBJ_VOID) {
+			SyBlobAppend(&(*pOut), "NULL", sizeof("NULL"));
 		} else {
-			/* Append length first */
-			if(ShowType) {
-				SyBlobFormat(&(*pOut), "%u '", SyBlobLength(&pObj->sBlob));
-			}
-			if(SyBlobLength(pContents) > 0) {
-				SyBlobAppend(&(*pOut), SyBlobData(pContents), SyBlobLength(pContents));
-			}
-			if(ShowType) {
-				SyBlobAppend(&(*pOut), "'", sizeof(char));
+			SyBlob *pContents = &pObj->sBlob;
+			/* Get a printable representation of the contents */
+			if((pObj->iFlags & (MEMOBJ_STRING | MEMOBJ_CALL)) == 0) {
+				MemObjStringValue(&(*pOut), &(*pObj), FALSE);
+			} else {
+				/* Append length first */
+				if(ShowType) {
+					SyBlobFormat(&(*pOut), "%u '", SyBlobLength(&pObj->sBlob));
+				}
+				if(SyBlobLength(pContents) > 0) {
+					SyBlobAppend(&(*pOut), SyBlobData(pContents), SyBlobLength(pContents));
+				}
+				if(ShowType) {
+					SyBlobAppend(&(*pOut), "'", sizeof(char));
+				}
 			}
 		}
-	}
-	if(ShowType) {
-		if((pObj->iFlags & (MEMOBJ_HASHMAP | MEMOBJ_OBJ)) == 0) {
-			SyBlobAppend(&(*pOut), ")", sizeof(char));
+		if(ShowType) {
+			if((pObj->iFlags & (MEMOBJ_HASHMAP | MEMOBJ_OBJ)) == 0) {
+				SyBlobAppend(&(*pOut), ")", sizeof(char));
+			}
 		}
 	}
 #ifdef __WINNT__