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

Fix var_dump() for mixed arrays.
All checks were successful
The build was successful.
Details

Browse Source
This commit is contained in:
Rafal Kupiec 2018-11-13 20:24:55 +01:00
parent 7a34716298
commit e727453ccf
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engine/hashmap.c
View File

@ -5569,7 +5569,13 @@ PH7_PRIVATE sxi32 PH7_HashmapDump(SyBlob *pOut, ph7_hashmap *pMap, int ShowType,
} }
SyBlobAppend(&(*pOut), "}", sizeof(char)); SyBlobAppend(&(*pOut), "}", sizeof(char));
} else { } else {
SyBlobAppend(&(*pOut), ")", sizeof(char)); SyBlobAppend(&(*pOut), "0) {", sizeof("0) {"));
#ifdef __WINNT__
SyBlobAppend(&(*pOut), "\r\n", sizeof("\r\n") - 1);
#else
SyBlobAppend(&(*pOut), "\n", sizeof(char));
#endif
SyBlobAppend(&(*pOut), " }", sizeof(" }"));
} }
return rc; return rc;
} }

4
engine/memobj.c
View File

@ -1125,7 +1125,9 @@ PH7_PRIVATE const char *PH7_MemObjTypeDump(ph7_value *pVal) {
zType = "null"; zType = "null";
} else { } else {
if(pVal->iFlags & MEMOBJ_HASHMAP) { if(pVal->iFlags & MEMOBJ_HASHMAP) {
if(pVal->iFlags & MEMOBJ_OBJ) { if(pVal->iFlags & MEMOBJ_MIXED) {
zType = "array(mixed, ";
} else if(pVal->iFlags & MEMOBJ_OBJ) {
zType = "array(object, "; zType = "array(object, ";
} else if(pVal->iFlags & MEMOBJ_INT) { } else if(pVal->iFlags & MEMOBJ_INT) {
zType = "array(int, "; zType = "array(int, ";