From 117cc09edcc796f93cb05f98d7589b7ca5313ee8 Mon Sep 17 00:00:00 2001
From: Mike Mazur
Date: Thu, 24 Jul 2008 05:23:38 +0000
Subject: Replace implicit casts from LSLFloat to int and uint which were
 removed in r5487.

Also put the unit tests back for Bamboo to execute them, let's see how this
goes.


---
 .nant/bamboo.build                                           | 12 ++++++++++++
 OpenSim/Region/ScriptEngine/Common/LSL_Types.cs              | 10 ++++++++++
 OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs              | 10 ++++++++++
 .../Region/ScriptEngine/Common/LSL_TypesTestLSLFloat.cs      |  4 ++--
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/.nant/bamboo.build b/.nant/bamboo.build
index 5577dd9..93e9ad7 100644
--- a/.nant/bamboo.build
+++ b/.nant/bamboo.build
@@ -21,7 +21,19 @@
     
     <touch file="../${projectdir}/bin/startup_commands.txt" />
 
+    <delete dir="../test-results" />
     <mkdir dir="../test-results" />
+    <nunit2>
+      <formatter type="Xml" usefile="true" extension=".xml" outputdir="../test-results" />
+      <test>
+        <assemblies>
+          <include name="../bin/OpenSim.Framework.Tests.dll" />
+          <include name="../bin/OpenSim.Region.ScriptEngine.Common.Tests.dll" />
+          <include name="../bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
+          <include name="../bin/OpenSim.Region.Environment.dll" />
+        </assemblies>
+      </test>
+    </nunit2>
 
     <zip zipfile="../${projectdir}.zip">
       <fileset basedir="${projectdir}/">
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
index be790d6..7274fa5 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
@@ -1422,6 +1422,16 @@ namespace OpenSim.Region.ScriptEngine.Common
 
             #region Operators
 
+            static public implicit operator int(LSLFloat f)
+            {
+                return (int)f.value;
+            }
+
+            static public implicit operator uint(LSLFloat f)
+            {
+                return (uint) Math.Abs(f.value);
+            }
+
             static public implicit operator Boolean(LSLFloat f)
             {
                 if (f.value == 0.0)
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 0cddf36..acfe613 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -1477,6 +1477,16 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
             #region Operators
 
+            static public implicit operator int(LSLFloat f)
+            {
+                return (int)f.value;
+            }
+
+            static public implicit operator uint(LSLFloat f)
+            {
+                return (uint) Math.Abs(f.value);
+            }
+
             static public implicit operator Boolean(LSLFloat f)
             {
                 if (f.value == 0.0)
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLFloat.cs b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLFloat.cs
index 130c0ec..29d0e1c 100644
--- a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLFloat.cs
+++ b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLFloat.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
 
             foreach (KeyValuePair<double, int> number in numberSet)
             {
-                testNumber = (int)(new LSL_Types.LSLFloat(number.Key));
+                testNumber = new LSL_Types.LSLFloat(number.Key);
                 Assert.AreEqual(number.Value, testNumber, "Converting double " + number.Key + ", expecting int " + number.Value);
             }
         }
@@ -170,7 +170,7 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
 
             foreach (KeyValuePair<double, int> number in numberSet)
             {
-                testNumber = (uint)(new LSL_Types.LSLFloat(number.Key));
+                testNumber = new LSL_Types.LSLFloat(number.Key);
                 Assert.AreEqual(number.Value, testNumber, "Converting double " + number.Key + ", expecting uint " + number.Value);
             }
         }
-- 
cgit v1.1