rename XMREngine as Yengine (still not all done), big mess source formating changes, move state files to proper folder, fix a source file locking on errors, more changes for cross platform including from Mike,... yes yes i know a messy commit

1 files changed, 223 insertions, 161 deletions

diff --git a/OpenSim/Region/ScriptEngine/XMREngine/XMRArray.cs b/OpenSim/Region/ScriptEngine/YEngine/XMRArray.cs
index 36d95d3..b797224 100644
--- a/OpenSim/Region/ScriptEngine/XMREngine/XMRArray.cs
+++ b/OpenSim/Region/ScriptEngine/YEngine/XMRArray.cs
@@ -40,12 +40,13 @@ using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
 
 // This class exists in the main app domain
 //
-namespace OpenSim.Region.ScriptEngine.XMREngine
+namespace OpenSim.Region.ScriptEngine.Yengine
 {
     /**
      * @brief Array objects.
      */
-    public class XMR_Array {
+    public class XMR_Array
+    {
         private const int EMPTYHEAP = 64;
         private const int ENTRYHEAP = 24;
 
@@ -53,36 +54,40 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
                                                               // false: array[0..arrayValid-1] is all there is
         private SortedDictionary<object, object> dnary;
         private SortedDictionary<object, object>.Enumerator enumr;
-                                                              // enumerator used to fill 'array' past arrayValid to end of dictionary
+        // enumerator used to fill 'array' past arrayValid to end of dictionary
         private int arrayValid;                               // number of elements in 'array' that have been filled in
         private KeyValuePair<object, object>[] array;         // list of kvp's that have been returned by ForEach() since last modification
         private XMRInstAbstract inst;                         // script instance debited with heap use
         private int heapUse;                                  // current heap use debit amount
 
-        public static TokenTypeSDTypeDelegate countDelegate = new TokenTypeSDTypeDelegate (new TokenTypeInt    (null), new TokenType[0]);
-        public static TokenTypeSDTypeDelegate clearDelegate = new TokenTypeSDTypeDelegate (new TokenTypeVoid   (null), new TokenType[0]);
-        public static TokenTypeSDTypeDelegate indexDelegate = new TokenTypeSDTypeDelegate (new TokenTypeObject (null), new TokenType[] { new TokenTypeInt (null) });
-        public static TokenTypeSDTypeDelegate valueDelegate = new TokenTypeSDTypeDelegate (new TokenTypeObject (null), new TokenType[] { new TokenTypeInt (null) });
+        public static TokenTypeSDTypeDelegate countDelegate = new TokenTypeSDTypeDelegate(new TokenTypeInt(null), new TokenType[0]);
+        public static TokenTypeSDTypeDelegate clearDelegate = new TokenTypeSDTypeDelegate(new TokenTypeVoid(null), new TokenType[0]);
+        public static TokenTypeSDTypeDelegate indexDelegate = new TokenTypeSDTypeDelegate(new TokenTypeObject(null), new TokenType[] { new TokenTypeInt(null) });
+        public static TokenTypeSDTypeDelegate valueDelegate = new TokenTypeSDTypeDelegate(new TokenTypeObject(null), new TokenType[] { new TokenTypeInt(null) });
 
-        public XMR_Array (XMRInstAbstract inst)
+        public XMR_Array(XMRInstAbstract inst)
         {
             this.inst = inst;
-            dnary = new SortedDictionary<object, object> (XMRArrayKeyComparer.singleton);
-            heapUse = inst.UpdateHeapUse (0, EMPTYHEAP);
+            dnary = new SortedDictionary<object, object>(XMRArrayKeyComparer.singleton);
+            heapUse = inst.UpdateHeapUse(0, EMPTYHEAP);
         }
 
-        ~XMR_Array ()
+        ~XMR_Array()
         {
-            heapUse = inst.UpdateHeapUse (heapUse, 0);
+            heapUse = inst.UpdateHeapUse(heapUse, 0);
         }
 
-        public static TokenType GetRValType (TokenName name)
+        public static TokenType GetRValType(TokenName name)
         {
-            if (name.val == "count") return new TokenTypeInt (name);
-            if (name.val == "clear") return clearDelegate;
-            if (name.val == "index") return indexDelegate;
-            if (name.val == "value") return valueDelegate;
-            return new TokenTypeVoid (name);
+            if(name.val == "count")
+                return new TokenTypeInt(name);
+            if(name.val == "clear")
+                return clearDelegate;
+            if(name.val == "index")
+                return indexDelegate;
+            if(name.val == "value")
+                return valueDelegate;
+            return new TokenTypeVoid(name);
         }
 
         /**
@@ -93,44 +98,51 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
         public object GetByKey(object key)
         {
             object val;
-            key = FixKey (key);
-            if (!dnary.TryGetValue (key, out val)) val = null;
+            key = FixKey(key);
+            if(!dnary.TryGetValue(key, out val))
+                val = null;
             return val;
         }
 
         public void SetByKey(object key, object value)
         {
-            key = FixKey (key);
+            key = FixKey(key);
 
             /*
              * Update heap use throwing an exception on failure
              * before making any changes to the array.
              */
-            int keysize = HeapTrackerObject.Size (key);
+            int keysize = HeapTrackerObject.Size(key);
             int newheapuse = heapUse;
             object oldval;
-            if (dnary.TryGetValue (key, out oldval)) {
-                newheapuse -= keysize + HeapTrackerObject.Size (oldval);
+            if(dnary.TryGetValue(key, out oldval))
+            {
+                newheapuse -= keysize + HeapTrackerObject.Size(oldval);
             }
-            if (value != null) {
-                newheapuse += keysize + HeapTrackerObject.Size (value);
+            if(value != null)
+            {
+                newheapuse += keysize + HeapTrackerObject.Size(value);
             }
-            heapUse = inst.UpdateHeapUse (heapUse, newheapuse);
+            heapUse = inst.UpdateHeapUse(heapUse, newheapuse);
 
             /*
              * Save new value in array, replacing one of same key if there.
              * null means remove the value, ie, script did array[key] = undef.
              */
-            if (value != null) {
+            if(value != null)
+            {
                 dnary[key] = value;
-            } else {
-                dnary.Remove (key);
+            }
+            else
+            {
+                dnary.Remove(key);
 
                 /*
                  * Shrink the enumeration array, but always leave at least one element.
                  */
-                if ((array != null) && (dnary.Count < array.Length / 2)) {
-                    Array.Resize<KeyValuePair<object, object>> (ref array, array.Length / 2);
+                if((array != null) && (dnary.Count < array.Length / 2))
+                {
+                    Array.Resize<KeyValuePair<object, object>>(ref array, array.Length / 2);
                 }
             }
 
@@ -148,44 +160,48 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          *        the C# runtime can't convert a null to a value type, and throws an exception.
          *        But for any reference type (array, key, etc) we must manually check for null.
          */
-        public static XMR_Array Obj2Array (object obj)
+        public static XMR_Array Obj2Array(object obj)
         {
-            if (obj == null) throw new NullReferenceException ();
+            if(obj == null)
+                throw new NullReferenceException();
             return (XMR_Array)obj;
         }
-        public static LSL_Key Obj2Key (object obj)
+        public static LSL_Key Obj2Key(object obj)
         {
-            if (obj == null) throw new NullReferenceException ();
+            if(obj == null)
+                throw new NullReferenceException();
             return (LSL_Key)obj;
         }
-        public static LSL_List Obj2List (object obj)
+        public static LSL_List Obj2List(object obj)
         {
-            if (obj == null) throw new NullReferenceException ();
+            if(obj == null)
+                throw new NullReferenceException();
             return (LSL_List)obj;
         }
-        public static LSL_String Obj2String (object obj)
+        public static LSL_String Obj2String(object obj)
         {
-            if (obj == null) throw new NullReferenceException ();
-            return obj.ToString ();
+            if(obj == null)
+                throw new NullReferenceException();
+            return obj.ToString();
         }
 
         /**
          * @brief remove all elements from the array.
          *        sets everything to its 'just constructed' state.
          */
-        public void __pub_clear ()
+        public void __pub_clear()
         {
-            heapUse = inst.UpdateHeapUse (heapUse, EMPTYHEAP);
-            dnary.Clear ();
+            heapUse = inst.UpdateHeapUse(heapUse, EMPTYHEAP);
+            dnary.Clear();
             enumrValid = false;
             arrayValid = 0;
-            array      = null;
+            array = null;
         }
 
         /**
          * @brief return number of elements in the array.
          */
-        public int __pub_count ()
+        public int __pub_count()
         {
             return dnary.Count;
         }
@@ -196,9 +212,9 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          * @returns null: array doesn't have that many elements
          *          else: index (key) for that element
          */
-        public object __pub_index (int number)
+        public object __pub_index(int number)
         {
-            return ForEach (number) ? UnfixKey (array[number].Key) : null;
+            return ForEach(number) ? UnfixKey(array[number].Key) : null;
         }
 
         /**
@@ -207,9 +223,9 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          * @returns null: array doesn't have that many elements
          *          else: value for that element
          */
-        public object __pub_value (int number)
+        public object __pub_value(int number)
         {
-            return ForEach (number) ? array[number].Value : null;
+            return ForEach(number) ? array[number].Value : null;
         }
 
         /**
@@ -218,14 +234,15 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          * @returns false: element does not exist
          *           true: element exists
          */
-        private bool ForEach (int number)
+        private bool ForEach(int number)
         {
             /*
              * If we don't have any array, we can't have ever done
              * any calls here before, so allocate an array big enough
              * and set everything else to the beginning.
              */
-            if (array == null) {
+            if(array == null)
+            {
                 array = new KeyValuePair<object, object>[dnary.Count];
                 arrayValid = 0;
             }
@@ -233,17 +250,20 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
             /*
              * If dictionary modified since last enumeration, get a new enumerator.
              */
-            if (arrayValid == 0) {
-                enumr = dnary.GetEnumerator ();
+            if(arrayValid == 0)
+            {
+                enumr = dnary.GetEnumerator();
                 enumrValid = true;
             }
 
             /*
              * Make sure we have filled the array up enough for requested element.
              */
-            while ((arrayValid <= number) && enumrValid && enumr.MoveNext ()) {
-                if (arrayValid >= array.Length) {
-                    Array.Resize<KeyValuePair<object, object>> (ref array, dnary.Count);
+            while((arrayValid <= number) && enumrValid && enumr.MoveNext())
+            {
+                if(arrayValid >= array.Length)
+                {
+                    Array.Resize<KeyValuePair<object, object>>(ref array, dnary.Count);
                 }
                 array[arrayValid++] = enumr.Current;
             }
@@ -258,17 +278,18 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          * @brief Transmit array out in such a way that it can be reconstructed,
          *        including any in-progress ForEach() enumerations.
          */
-        public delegate void SendArrayObjDelegate (object graph);
-        public void SendArrayObj (SendArrayObjDelegate sendObj)
+        public delegate void SendArrayObjDelegate(object graph);
+        public void SendArrayObj(SendArrayObjDelegate sendObj)
         {
             /*
              * Set the count then the elements themselves.
              * UnfixKey() because sendObj doesn't handle XMRArrayListKeys.
              */
-            sendObj (dnary.Count);
-            foreach (KeyValuePair<object, object> kvp in dnary) {
-                sendObj (UnfixKey (kvp.Key));
-                sendObj (kvp.Value);
+            sendObj(dnary.Count);
+            foreach(KeyValuePair<object, object> kvp in dnary)
+            {
+                sendObj(UnfixKey(kvp.Key));
+                sendObj(kvp.Value);
             }
         }
 
@@ -278,10 +299,10 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          *        at the exact spot and in the exact same order as they
          *        were in on the sending side.
          */
-        public delegate object RecvArrayObjDelegate ();
-        public void RecvArrayObj (RecvArrayObjDelegate recvObj)
+        public delegate object RecvArrayObjDelegate();
+        public void RecvArrayObj(RecvArrayObjDelegate recvObj)
         {
-            heapUse = inst.UpdateHeapUse (heapUse, EMPTYHEAP);
+            heapUse = inst.UpdateHeapUse(heapUse, EMPTYHEAP);
 
             /*
              * Cause any enumeration to refill the array from the sorted dictionary.
@@ -294,14 +315,15 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
             /*
              * Fill dictionary.
              */
-            dnary.Clear ();
-            int count = (int)recvObj ();
-            while (-- count >= 0) {
-                object key = FixKey (recvObj ());
-                object val = recvObj ();
-                int htuse = HeapTrackerObject.Size (key) + HeapTrackerObject.Size (val);
-                heapUse = inst.UpdateHeapUse (heapUse, heapUse + htuse);
-                dnary.Add (key, val);
+            dnary.Clear();
+            int count = (int)recvObj();
+            while(--count >= 0)
+            {
+                object key = FixKey(recvObj());
+                object val = recvObj();
+                int htuse = HeapTrackerObject.Size(key) + HeapTrackerObject.Size(val);
+                heapUse = inst.UpdateHeapUse(heapUse, heapUse + htuse);
+                dnary.Add(key, val);
             }
         }
 
@@ -310,16 +332,22 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          * So strip off any LSL-ness from the types.
          * We also deep-strip any given lists used as keys (multi-dimensional arrays).
          */
-        public static object FixKey (object key)
-        {
-            if (key is LSL_Integer) return (int)(LSL_Integer)key;
-            if (key is LSL_Float)   return (double)(LSL_Float)key;
-            if (key is LSL_Key)     return (string)(LSL_Key)key;
-            if (key is LSL_String)  return (string)(LSL_String)key;
-            if (key is LSL_List) {
+        public static object FixKey(object key)
+        {
+            if(key is LSL_Integer)
+                return (int)(LSL_Integer)key;
+            if(key is LSL_Float)
+                return (double)(LSL_Float)key;
+            if(key is LSL_Key)
+                return (string)(LSL_Key)key;
+            if(key is LSL_String)
+                return (string)(LSL_String)key;
+            if(key is LSL_List)
+            {
                 object[] data = ((LSL_List)key).Data;
-                if (data.Length == 1) return FixKey (data[0]);
-                return new XMRArrayListKey ((LSL_List)key);
+                if(data.Length == 1)
+                    return FixKey(data[0]);
+                return new XMRArrayListKey((LSL_List)key);
             }
             return key;  // int, double, string, LSL_Vector, LSL_Rotation, etc are ok as is
         }
@@ -329,99 +357,119 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          *        LSL_List, not the sanitized one, as the script compiler expects an LSL_List.
          *        Any other sanitized types can remain as is (int, string, etc).
          */
-        private static object UnfixKey (object key)
+        private static object UnfixKey(object key)
         {
-            if (key is XMRArrayListKey) key = ((XMRArrayListKey)key).GetOriginal ();
+            if(key is XMRArrayListKey)
+                key = ((XMRArrayListKey)key).GetOriginal();
             return key;
         }
     }
 
-    public class XMRArrayKeyComparer : IComparer<object> {
+    public class XMRArrayKeyComparer: IComparer<object>
+    {
 
-        public static XMRArrayKeyComparer singleton = new XMRArrayKeyComparer ();
+        public static XMRArrayKeyComparer singleton = new XMRArrayKeyComparer();
 
         /**
          * @brief Compare two keys
          */
-        public int Compare (object x, object y)  // IComparer<object>
+        public int Compare(object x, object y)  // IComparer<object>
         {
             /*
              * Use short type name (eg, String, Int32, XMRArrayListKey) as most significant part of key.
              */
-            string xtn = x.GetType ().Name;
-            string ytn = y.GetType ().Name;
-            int ctn = String.CompareOrdinal (xtn, ytn);
-            if (ctn != 0) return ctn;
+            string xtn = x.GetType().Name;
+            string ytn = y.GetType().Name;
+            int ctn = String.CompareOrdinal(xtn, ytn);
+            if(ctn != 0)
+                return ctn;
 
             ComparerDelegate cd;
-            if (!comparers.TryGetValue (xtn, out cd)) {
-                throw new Exception ("unsupported key type " + xtn);
+            if(!comparers.TryGetValue(xtn, out cd))
+            {
+                throw new Exception("unsupported key type " + xtn);
             }
-            return cd (x, y);
+            return cd(x, y);
         }
 
-        private delegate int ComparerDelegate (object a, object b);
+        private delegate int ComparerDelegate(object a, object b);
 
-        private static Dictionary<string, ComparerDelegate> comparers = BuildComparers ();
+        private static Dictionary<string, ComparerDelegate> comparers = BuildComparers();
 
-        private static Dictionary<string, ComparerDelegate> BuildComparers ()
+        private static Dictionary<string, ComparerDelegate> BuildComparers()
         {
-            Dictionary<string, ComparerDelegate> cmps = new Dictionary<string, ComparerDelegate> ();
-            cmps.Add (typeof (double).Name,     MyFloatComparer);
-            cmps.Add (typeof (int).Name,             MyIntComparer);
-            cmps.Add (typeof (XMRArrayListKey).Name, MyListKeyComparer);
-            cmps.Add (typeof (LSL_Rotation).Name,    MyRotationComparer);
-            cmps.Add (typeof (string).Name,          MyStringComparer);
-            cmps.Add (typeof (LSL_Vector).Name,      MyVectorComparer);
+            Dictionary<string, ComparerDelegate> cmps = new Dictionary<string, ComparerDelegate>();
+            cmps.Add(typeof(double).Name, MyFloatComparer);
+            cmps.Add(typeof(int).Name, MyIntComparer);
+            cmps.Add(typeof(XMRArrayListKey).Name, MyListKeyComparer);
+            cmps.Add(typeof(LSL_Rotation).Name, MyRotationComparer);
+            cmps.Add(typeof(string).Name, MyStringComparer);
+            cmps.Add(typeof(LSL_Vector).Name, MyVectorComparer);
             return cmps;
         }
 
-        private static int MyFloatComparer (object a, object b)
+        private static int MyFloatComparer(object a, object b)
         {
             double af = (double)a;
             double bf = (double)b;
-            if (af < bf) return -1;
-            if (af > bf) return  1;
+            if(af < bf)
+                return -1;
+            if(af > bf)
+                return 1;
             return 0;
         }
-        private static int MyIntComparer (object a, object b)
+        private static int MyIntComparer(object a, object b)
         {
             return (int)a - (int)b;
         }
-        private static int MyListKeyComparer (object a, object b)
+        private static int MyListKeyComparer(object a, object b)
         {
             XMRArrayListKey alk = (XMRArrayListKey)a;
             XMRArrayListKey blk = (XMRArrayListKey)b;
-            return XMRArrayListKey.Compare (alk, blk);
+            return XMRArrayListKey.Compare(alk, blk);
         }
-        private static int MyRotationComparer (object a, object b)
+        private static int MyRotationComparer(object a, object b)
         {
             LSL_Rotation ar = (LSL_Rotation)a;
             LSL_Rotation br = (LSL_Rotation)b;
-            if (ar.x < br.x) return -1;
-            if (ar.x > br.x) return  1;
-            if (ar.y < br.y) return -1;
-            if (ar.y > br.y) return  1;
-            if (ar.z < br.z) return -1;
-            if (ar.z > br.z) return  1;
-            if (ar.s < br.s) return -1;
-            if (ar.s > br.s) return  1;
+            if(ar.x < br.x)
+                return -1;
+            if(ar.x > br.x)
+                return 1;
+            if(ar.y < br.y)
+                return -1;
+            if(ar.y > br.y)
+                return 1;
+            if(ar.z < br.z)
+                return -1;
+            if(ar.z > br.z)
+                return 1;
+            if(ar.s < br.s)
+                return -1;
+            if(ar.s > br.s)
+                return 1;
             return 0;
         }
-        private static int MyStringComparer (object a, object b)
+        private static int MyStringComparer(object a, object b)
         {
-            return String.CompareOrdinal ((string)a, (string)b);
+            return String.CompareOrdinal((string)a, (string)b);
         }
-        private static int MyVectorComparer (object a, object b)
+        private static int MyVectorComparer(object a, object b)
         {
             LSL_Vector av = (LSL_Vector)a;
             LSL_Vector bv = (LSL_Vector)b;
-            if (av.x < bv.x) return -1;
-            if (av.x > bv.x) return  1;
-            if (av.y < bv.y) return -1;
-            if (av.y > bv.y) return  1;
-            if (av.z < bv.z) return -1;
-            if (av.z > bv.z) return  1;
+            if(av.x < bv.x)
+                return -1;
+            if(av.x > bv.x)
+                return 1;
+            if(av.y < bv.y)
+                return -1;
+            if(av.y > bv.y)
+                return 1;
+            if(av.z < bv.z)
+                return -1;
+            if(av.z > bv.z)
+                return 1;
             return 0;
         }
     }
@@ -433,7 +481,8 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
      *        Note that just like LSL_Lists, we consider these objects to be immutable, so they can be directly used as keys in
      *        the dictionary as they don't ever change.
      */
-    public class XMRArrayListKey {
+    public class XMRArrayListKey
+    {
         private LSL_List original;
         private object[] cleaned;
         private int length;
@@ -443,18 +492,19 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          * @brief Construct a sanitized object[] from a list.
          *        Also save the original list in case we need it later.
          */
-        public XMRArrayListKey (LSL_List key)
+        public XMRArrayListKey(LSL_List key)
         {
             original = key;
             object[] given = key.Data;
-            int len  = given.Length;
-            length   = len;
-            cleaned  = new object[len];
-            int hc   = len;
-            for (int i = 0; i < len; i ++) {
-                object v   = XMR_Array.FixKey (given[i]);
-                hc        += hc + ((hc < 0) ? 1 : 0);
-                hc        ^= v.GetHashCode ();
+            int len = given.Length;
+            length = len;
+            cleaned = new object[len];
+            int hc = len;
+            for(int i = 0; i < len; i++)
+            {
+                object v = XMR_Array.FixKey(given[i]);
+                hc += hc + ((hc < 0) ? 1 : 0);
+                hc ^= v.GetHashCode();
                 cleaned[i] = v;
             }
             hashCode = hc;
@@ -463,8 +513,10 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
         /**
          * @brief Get heap tracking size.
          */
-        public int Size {
-            get {
+        public int Size
+        {
+            get
+            {
                 return original.Size;
             }
         }
@@ -472,15 +524,20 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
         /**
          * @brief See if the given object is an XMRArrayListKey and every value is equal to our own.
          */
-        public override bool Equals (object o)
+        public override bool Equals(object o)
         {
-            if (!(o is XMRArrayListKey)) return false;
+            if(!(o is XMRArrayListKey))
+                return false;
             XMRArrayListKey a = (XMRArrayListKey)o;
             int len = a.length;
-            if (len != length) return false;
-            if (a.hashCode != hashCode) return false;
-            for (int i = 0; i < len; i ++) {
-                if (!cleaned[i].Equals (a.cleaned[i])) return false;
+            if(len != length)
+                return false;
+            if(a.hashCode != hashCode)
+                return false;
+            for(int i = 0; i < len; i++)
+            {
+                if(!cleaned[i].Equals(a.cleaned[i]))
+                    return false;
             }
             return true;
         }
@@ -488,7 +545,7 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
         /**
          * @brief Get an hash code.
          */
-        public override int GetHashCode ()
+        public override int GetHashCode()
         {
             return hashCode;
         }
@@ -496,15 +553,18 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
         /**
          * @brief Compare for key sorting.
          */
-        public static int Compare (XMRArrayListKey x, XMRArrayListKey y)
+        public static int Compare(XMRArrayListKey x, XMRArrayListKey y)
         {
             int j = x.length - y.length;
-            if (j == 0) {
-                for (int i = 0; i < x.length; i ++) {
+            if(j == 0)
+            {
+                for(int i = 0; i < x.length; i++)
+                {
                     object xo = x.cleaned[i];
                     object yo = y.cleaned[i];
-                    j = XMRArrayKeyComparer.singleton.Compare (xo, yo);
-                    if (j != 0) break;
+                    j = XMRArrayKeyComparer.singleton.Compare(xo, yo);
+                    if(j != 0)
+                        break;
                 }
             }
             return j;
@@ -513,7 +573,7 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
         /**
          * @brief Get the original LSL_List we were built from.
          */
-        public LSL_List GetOriginal ()
+        public LSL_List GetOriginal()
         {
             return original;
         }
@@ -521,14 +581,16 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
         /**
          * @brief Debugging
          */
-        public override string ToString ()
-        {
-            StringBuilder sb = new StringBuilder ();
-            for (int i = 0; i < length; i ++) {
-                if (i > 0) sb.Append (',');
-                sb.Append (cleaned[i].ToString ());
+        public override string ToString()
+        {
+            StringBuilder sb = new StringBuilder();
+            for(int i = 0; i < length; i++)
+            {
+                if(i > 0)
+                    sb.Append(',');
+                sb.Append(cleaned[i].ToString());
             }
-            return sb.ToString ();
+            return sb.ToString();
         }
     }
 }