ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-19 22:45:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Yengine: Also error on division by Zero

Browse Source
This commit is contained in:
UbitUmarov
2019-10-18 14:16:37 +01:00
parent 2a90f78fe1
commit f09a18a7a8
5 changed files with 154 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
OpenSim/Region/ScriptEngine/YEngine/MMRScriptTokenize.cs
View File

@@ -611,8 +611,20 @@ namespace OpenSim.Region.ScriptEngine.Yengine
continue;
}
// Check for option enables.
if((c == ';') && (lastToken is TokenName) &&
// Check for option enables.
if ((c == ';') && (lastToken is TokenName) &&
(strcasecmp(((TokenName)lastToken).val, "yoptions") == 0))
{
options.advFlowCtl = true;
options.tryCatch = true;
lastToken = lastToken.prevToken;
lastToken.nextToken = null;
continue;
}
else if ((c == ';') && (lastToken is TokenName) &&
(lastToken.prevToken is TokenName) &&
(strcasecmp(((TokenName)lastToken.prevToken).val, "yoption") == 0))
{
@@ -2186,44 +2198,79 @@ namespace OpenSim.Region.ScriptEngine.Yengine
}
public static object Div(object left, object right)
{
if((left is int) && (right is int))
double r;
try
{
return (int)left / (int)right;
if ((left is int) && (right is int))
{
return (int)left / (int)right;
}
if ((left is double) && (right is int))
{
r = (double)left / (int)right;
if (double.IsNaN(r) || double.IsInfinity(r))
throw new Exception("Division by Zero");
return r;
}
}
if((left is int) && (right is double))
catch (DivideByZeroException)
{
return (int)left / (double)right;
throw new Exception("Division by Zero");
}
if((left is double) && (right is int))
if ((left is int) && (right is double))
{
return (double)left / (int)right;
r = (int)left / (double)right;
}
if((left is double) && (right is double))
else if((left is double) && (right is double))
{
return (double)left / (double)right;
r= (double)left / (double)right;
}
return null;
else
return null;
if (double.IsNaN(r) || double.IsInfinity(r))
throw new Exception("Division by Zero");
return r;
}
public static object Mod(object left, object right)
{
if((left is int) && (right is int))
double r;
try
{
return (int)left % (int)right;
if ((left is int) && (right is int))
{
return (int)left % (int)right;
}
if ((left is double) && (right is int))
{
r = (double)left % (int)right;
if (double.IsNaN(r) || double.IsInfinity(r))
throw new Exception("Division by Zero");
return r;
}
}
if((left is int) && (right is double))
catch (DivideByZeroException)
{
return (int)left % (double)right;
throw new Exception("Division by Zero");
}
if((left is double) && (right is int))
if ((left is int) && (right is double))
{
return (double)left % (int)right;
r = (int)left % (double)right;
}
if((left is double) && (right is double))
else if ((left is double) && (right is double))
{
return (double)left % (double)right;
r = (double)left % (double)right;
}
return null;
else
return null;
if (double.IsNaN(r) || double.IsInfinity(r))
throw new Exception("Division by Zero");
return r;
}
public static object Mul(object left, object right)
{
if((left is int) && (right is int))