attero
/
sencha-lang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mixing floats and ints is possible now!

functions
Justyna Ilczuk 2012-12-22 11:40:57 +01:00
parent f0bc0e235b
commit b75236096e
1 changed files with 141 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Sencha-lang/AST/SenchaObject.cpp
View File

@ -106,6 +106,14 @@ SenchaObject SenchaObject::operator+(const SenchaObject& right)const
break; break;
} }
} }
else if(type == float_number && right.type == integer_number )
{
result.set_value(this->number + right.integer);
}
else if(type == integer_number && right.type == float_number)
{
result.set_value(this->integer + right.number);
}
else else
{ {
result.type = invalid; result.type = invalid;
@ -132,6 +140,14 @@ SenchaObject SenchaObject::operator-(const SenchaObject& right)const
break; break;
} }
} }
else if(type == float_number && right.type == integer_number )
{
result.set_value(this->number - right.integer);
}
else if(type == integer_number && right.type == float_number)
{
result.set_value(this->integer - right.number);
}
else else
{ {
result.type = invalid; result.type = invalid;
@ -157,6 +173,14 @@ SenchaObject SenchaObject::operator*(const SenchaObject& right)const
break; break;
} }
} }
else if(type == float_number && right.type == integer_number )
{
result.set_value(this->number * right.integer);
}
else if(type == integer_number && right.type == float_number)
{
result.set_value(this->integer * right.number);
}
else else
{ {
result.type = invalid; result.type = invalid;
@ -182,6 +206,14 @@ SenchaObject SenchaObject::operator/(const SenchaObject& right)const
break; break;
} }
} }
else if(type == float_number && right.type == integer_number )
{
result.set_value(this->number / right.integer);
}
else if(type == integer_number && right.type == float_number)
{
result.set_value(this->integer / right.number);
}
else else
{ {
result.type = invalid; result.type = invalid;
@ -191,7 +223,7 @@ SenchaObject SenchaObject::operator/(const SenchaObject& right)const
} }
SenchaObject SenchaObject::operator==(const SenchaObject& right)const SenchaObject SenchaObject::operator==(const SenchaObject& right)const
{ {
SenchaObject result; SenchaObject result;
bool value = false; bool value = false;
result.type = boolean; result.type = boolean;
@ -219,12 +251,13 @@ SenchaObject SenchaObject::operator==(const SenchaObject& right)const
break; break;
} }
} }
result.truthy = value; result.truthy = value;
return result; return result;
} }
SenchaObject SenchaObject::operator!=(const SenchaObject& right)const SenchaObject SenchaObject::operator!=(const SenchaObject& right)const
{ {
SenchaObject result; SenchaObject result;
result.type = boolean; result.type = boolean;
@ -234,6 +267,6 @@ SenchaObject SenchaObject::operator!=(const SenchaObject& right)const
else result.truthy = true; else result.truthy = true;
return result; return result;
} }
//TODO change code above to something more generic //TODO change code above to something more generic