Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 21:57:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix the typename in the error message for incompatible types

Browse source
This commit is contained in:
smallmodel 2024-11-16 19:22:01 +01:00
parent b68bb4cee7
commit 8eded28efc
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
1 changed files with 31 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

63
code/script/scriptvariable.cpp
View file

@ -1547,12 +1547,14 @@ void ScriptVariable::operator+=(const ScriptVariable& value)
void ScriptVariable::operator-=(const ScriptVariable& value)
{
switch (GetType() + value.GetType() * VARIABLE_MAX) {
int type = GetType();
switch (type + value.GetType() * VARIABLE_MAX) {
default:
Clear();
throw ScriptException(
"binary '-' applied to incompatible types '%s' and '%s'", typenames[GetType()], typenames[value.GetType()]
"binary '-' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
);
break;
@ -1581,12 +1583,14 @@ void ScriptVariable::operator-=(const ScriptVariable& value)
void ScriptVariable::operator*=(const ScriptVariable& value)
{
switch (GetType() + value.GetType() * VARIABLE_MAX) {
int type = GetType();
switch (type + value.GetType() * VARIABLE_MAX) {
default:
Clear();
throw ScriptException(
"binary '*' applied to incompatible types '%s' and '%s'", typenames[GetType()], typenames[value.GetType()]
"binary '*' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
);
break;
@ -1631,12 +1635,14 @@ void ScriptVariable::operator*=(const ScriptVariable& value)
void ScriptVariable::operator/=(const ScriptVariable& value)
{
switch (GetType() + value.GetType() * VARIABLE_MAX) {
int type = GetType();
switch (type + value.GetType() * VARIABLE_MAX) {
default:
Clear();
throw ScriptException(
"binary '/' applied to incompatible types '%s' and '%s'", typenames[GetType()], typenames[value.GetType()]
"binary '/' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
);
break;
@ -1728,13 +1734,14 @@ void ScriptVariable::operator/=(const ScriptVariable& value)
void ScriptVariable::operator%=(const ScriptVariable& value)
{
float mult = 0.0f;
int type = GetType();
switch (GetType() + value.GetType() * VARIABLE_MAX) {
switch (type + value.GetType() * VARIABLE_MAX) {
default:
Clear();
throw ScriptException(
"binary '%%' applied to incompatible types '%s' and '%s'", typenames[GetType()], typenames[value.GetType()]
"binary '%' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
);
break;
@ -2245,15 +2252,13 @@ void ScriptVariable::complement(void)
void ScriptVariable::greaterthan(ScriptVariable& variable)
{
switch (GetType() + variable.GetType() * VARIABLE_MAX) {
int type = GetType();
switch (type + variable.GetType() * VARIABLE_MAX) {
default:
Clear();
throw ScriptException(
"binary '>' applied to incompatible types '%s' and '%s'",
typenames[GetType()],
typenames[variable.GetType()]
);
throw ScriptException("binary '>' applied to incompatible types '%s' and '%s'", typenames[type], typenames[variable.GetType()]);
break;
@ -2284,15 +2289,13 @@ void ScriptVariable::greaterthan(ScriptVariable& variable)
void ScriptVariable::greaterthanorequal(ScriptVariable& variable)
{
switch (GetType() + variable.GetType() * VARIABLE_MAX) {
int type = GetType();
switch (type + variable.GetType() * VARIABLE_MAX) {
default:
Clear();
throw ScriptException(
"binary '>=' applied to incompatible types '%s' and '%s'",
typenames[GetType()],
typenames[variable.GetType()]
);
throw ScriptException("binary '>=' applied to incompatible types '%s' and '%s'", typenames[type], typenames[variable.GetType()]);
break;
@ -2323,15 +2326,13 @@ void ScriptVariable::greaterthanorequal(ScriptVariable& variable)
void ScriptVariable::lessthan(ScriptVariable& variable)
{
switch (GetType() + variable.GetType() * VARIABLE_MAX) {
int type = GetType();
switch (type + variable.GetType() * VARIABLE_MAX) {
default:
Clear();
throw ScriptException(
"binary '<' applied to incompatible types '%s' and '%s'",
typenames[GetType()],
typenames[variable.GetType()]
);
throw ScriptException("binary '<' applied to incompatible types '%s' and '%s'", typenames[type], typenames[variable.GetType()]);
break;
@ -2362,15 +2363,13 @@ void ScriptVariable::lessthan(ScriptVariable& variable)
void ScriptVariable::lessthanorequal(ScriptVariable& variable)
{
switch (GetType() + variable.GetType() * VARIABLE_MAX) {
int type = GetType();
switch (type + variable.GetType() * VARIABLE_MAX) {
default:
Clear();
throw ScriptException(
"binary '<=' applied to incompatible types '%s' and '%s'",
typenames[GetType()],
typenames[variable.GetType()]
);
throw ScriptException("binary '<=' applied to incompatible types '%s' and '%s'", typenames[type], typenames[variable.GetType()]);
break;