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

Typehinting merge #50

Merged
belliash merged 298 commits from typehinting into master 2019-04-17 11:27:52 +02:00
Conversation 0 Commits 298 Files Changed 98 +3 -3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1cebd3af37 - Show all commits

6
engine/memobj.c
View File

@ -133,7 +133,7 @@ static sxi64 MemObjIntValue(ph7_value *pObj) {
iFlags = pObj->iFlags; iFlags = pObj->iFlags;
if(iFlags & MEMOBJ_REAL) { if(iFlags & MEMOBJ_REAL) {
return MemObjRealToInt(&(*pObj)); return MemObjRealToInt(&(*pObj));
} else if(iFlags & (MEMOBJ_INT | MEMOBJ_BOOL)) { } else if(iFlags & (MEMOBJ_INT | MEMOBJ_BOOL | MEMOBJ_CHAR)) {
return pObj->x.iVal; return pObj->x.iVal;
} else if(iFlags & MEMOBJ_STRING) { } else if(iFlags & MEMOBJ_STRING) {
return MemObjStringToInt(&(*pObj)); return MemObjStringToInt(&(*pObj));
@ -181,7 +181,7 @@ static ph7_real MemObjRealValue(ph7_value *pObj) {
iFlags = pObj->iFlags; iFlags = pObj->iFlags;
if(iFlags & MEMOBJ_REAL) { if(iFlags & MEMOBJ_REAL) {
return pObj->x.rVal; return pObj->x.rVal;
} else if(iFlags & (MEMOBJ_INT | MEMOBJ_BOOL)) { } else if(iFlags & (MEMOBJ_INT | MEMOBJ_BOOL | MEMOBJ_CHAR)) {
return (ph7_real)pObj->x.iVal; return (ph7_real)pObj->x.iVal;
} else if(iFlags & MEMOBJ_STRING) { } else if(iFlags & MEMOBJ_STRING) {
SyString sString; SyString sString;
@ -284,7 +284,7 @@ static sxi32 MemObjBooleanValue(ph7_value *pObj) {
iFlags = pObj->iFlags; iFlags = pObj->iFlags;
if(iFlags & MEMOBJ_REAL) { if(iFlags & MEMOBJ_REAL) {
return pObj->x.rVal != 0.0 ? 1 : 0; return pObj->x.rVal != 0.0 ? 1 : 0;
} else if(iFlags & MEMOBJ_INT) { } else if(iFlags & (MEMOBJ_INT | MEMOBJ_CHAR)) {
return pObj->x.iVal ? 1 : 0; return pObj->x.iVal ? 1 : 0;
} else if(iFlags & MEMOBJ_STRING) { } else if(iFlags & MEMOBJ_STRING) {
SyString sString; SyString sString;