1 files changed, 158 insertions, 95 deletions

diff --git a/OpenSim/Region/ScriptEngine/XMREngine/MMRScriptVarDict.cs b/OpenSim/Region/ScriptEngine/YEngine/MMRScriptVarDict.cs
index 67e1c34..2561d02 100644
--- a/OpenSim/Region/ScriptEngine/XMREngine/MMRScriptVarDict.cs
+++ b/OpenSim/Region/ScriptEngine/YEngine/MMRScriptVarDict.cs
@@ -33,63 +33,80 @@ using System.Collections.Generic;
  * @brief Collection of variable/function/method definitions
  */
 
-namespace OpenSim.Region.ScriptEngine.XMREngine
+namespace OpenSim.Region.ScriptEngine.Yengine
 {
-    public class VarDict : IEnumerable {
+    public class VarDict: IEnumerable
+    {
         public VarDict outerVarDict;            // next outer VarDict to search
         public TokenDeclSDTypeClass thisClass;  // this VarDict is for members of thisClass
 
-        private struct ArgTypes {
+        private struct ArgTypes
+        {
             public TokenType[] argTypes;
 
-            public bool CanBeCalledBy (TokenType[] calledBy)
+            public bool CanBeCalledBy(TokenType[] calledBy)
             {
-                if ((argTypes == null) && (calledBy == null)) return true;
-                if ((argTypes == null) || (calledBy == null)) return false;
-                if (argTypes.Length != calledBy.Length) return false;
-                for (int i = argTypes.Length; -- i >= 0;) {
-                    if (!TypeCast.IsAssignableFrom (argTypes[i], calledBy[i])) return false;
+                if((argTypes == null) && (calledBy == null))
+                    return true;
+                if((argTypes == null) || (calledBy == null))
+                    return false;
+                if(argTypes.Length != calledBy.Length)
+                    return false;
+                for(int i = argTypes.Length; --i >= 0;)
+                {
+                    if(!TypeCast.IsAssignableFrom(argTypes[i], calledBy[i]))
+                        return false;
                 }
                 return true;
             }
 
-            public override bool Equals (Object that)
+            public override bool Equals(Object that)
             {
-                if (that == null) return false;
-                if (that.GetType () != typeof (ArgTypes)) return false;
+                if(that == null)
+                    return false;
+                if(that.GetType() != typeof(ArgTypes))
+                    return false;
                 TokenType[] at = this.argTypes;
                 TokenType[] bt = ((ArgTypes)that).argTypes;
-                if ((at == null) && (bt == null)) return true;
-                if ((at == null) || (bt == null)) return false;
-                if (at.Length != bt.Length) return false;
-                for (int i = at.Length; -- i >= 0;) {
-                    if (at[i].ToString () != bt[i].ToString ()) return false;
+                if((at == null) && (bt == null))
+                    return true;
+                if((at == null) || (bt == null))
+                    return false;
+                if(at.Length != bt.Length)
+                    return false;
+                for(int i = at.Length; --i >= 0;)
+                {
+                    if(at[i].ToString() != bt[i].ToString())
+                        return false;
                 }
                 return true;
             }
 
-            public override int GetHashCode ()
+            public override int GetHashCode()
             {
                 TokenType[] at = this.argTypes;
-                if (at == null) return -1;
+                if(at == null)
+                    return -1;
                 int hc = 0;
-                for (int i = at.Length; -- i >= 0;) {
+                for(int i = at.Length; --i >= 0;)
+                {
                     int c = (hc < 0) ? 1 : 0;
-                    hc  = hc * 2 + c;
-                    hc ^= at[i].ToString ().GetHashCode ();
+                    hc = hc * 2 + c;
+                    hc ^= at[i].ToString().GetHashCode();
                 }
                 return hc;
             }
         }
 
-        private struct TDVEntry {
+        private struct TDVEntry
+        {
             public int count;
             public TokenDeclVar var;
         }
 
         private bool isFrozen = false;
         private bool locals;
-        private Dictionary<string, Dictionary<ArgTypes, TDVEntry>> master = new Dictionary<string, Dictionary<ArgTypes, TDVEntry>> ();
+        private Dictionary<string, Dictionary<ArgTypes, TDVEntry>> master = new Dictionary<string, Dictionary<ArgTypes, TDVEntry>>();
         private int count = 0;
         private VarDict frozenLocals = null;
 
@@ -98,7 +115,7 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          * @param locals = false: cannot be frozen, allows forward references
          *                  true: can be frozen, thus forbidding forward references
          */
-        public VarDict (bool locals)
+        public VarDict(bool locals)
         {
             this.locals = locals;
         }
@@ -106,19 +123,21 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
         /**
          * @brief Add new variable to the dictionary.
          */
-        public bool AddEntry (TokenDeclVar var)
+        public bool AddEntry(TokenDeclVar var)
         {
-            if (isFrozen) {
-                throw new Exception ("var dict is frozen");
+            if(isFrozen)
+            {
+                throw new Exception("var dict is frozen");
             }
 
             /*
              * Make sure we have a sub-dictionary based on the bare name (ie, no signature)
              */
             Dictionary<ArgTypes, TDVEntry> typedic;
-            if (!master.TryGetValue (var.name.val, out typedic)) {
-                typedic = new Dictionary<ArgTypes, TDVEntry> ();
-                master.Add (var.name.val, typedic);
+            if(!master.TryGetValue(var.name.val, out typedic))
+            {
+                typedic = new Dictionary<ArgTypes, TDVEntry>();
+                master.Add(var.name.val, typedic);
             }
 
             /*
@@ -127,41 +146,50 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
              * Methods always have a non-null argument list, even if only 0 entries long.
              */
             ArgTypes types;
-            types.argTypes = (var.argDecl == null) ? null : KeyTypesToStringTypes (var.argDecl.types);
-            if (typedic.ContainsKey (types)) return false;
+            types.argTypes = (var.argDecl == null) ? null : KeyTypesToStringTypes(var.argDecl.types);
+            if(typedic.ContainsKey(types))
+                return false;
 
             /*
              * It is unique, add to its name-specific sub-dictionary.
              */
             TDVEntry entry;
-            entry.count = ++ count;
-            entry.var   = var;
-            typedic.Add (types, entry);
+            entry.count = ++count;
+            entry.var = var;
+            typedic.Add(types, entry);
             return true;
         }
 
-        public int Count { get { return count; } }
+        public int Count
+        {
+            get
+            {
+                return count;
+            }
+        }
 
         /**
          * @brief If this is not a local variable frame, just return the frame as is.
          *        If this is a local variable frame, return a version that is frozen,
          *        ie, one that does not contain any future additions.
          */
-        public VarDict FreezeLocals ()
+        public VarDict FreezeLocals()
         {
             /*
              * If not local var frame, return original frame as is.
              * This will allow forward references as the future additions
              * will be seen by lookups done in this dictionary.
              */
-            if (!locals) return this;
+            if(!locals)
+                return this;
 
             /*
              * If local var frame, return a copy frozen at this point.
              * This disallows forward referenes as those future additions
              * will not be seen by lookups done in the frozen dictionary.
              */
-            if ((frozenLocals == null) || (frozenLocals.count != this.count)) {
+            if((frozenLocals == null) || (frozenLocals.count != this.count))
+            {
 
                 /*
                  * Make a copy of the current var dictionary frame.
@@ -169,12 +197,12 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
                  * contain additions made after this point, those additions
                  * will have a count .gt. frozen count and will be ignored.
                  */
-                frozenLocals = new VarDict (true);
+                frozenLocals = new VarDict(true);
 
                 frozenLocals.outerVarDict = this.outerVarDict;
-                frozenLocals.thisClass    = this.thisClass;
-                frozenLocals.master       = this.master;
-                frozenLocals.count        = this.count;
+                frozenLocals.thisClass = this.thisClass;
+                frozenLocals.master = this.master;
+                frozenLocals.count = this.count;
                 frozenLocals.frozenLocals = frozenLocals;
 
                 /*
@@ -196,23 +224,27 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          *          else: list of matching functions/variables
          *                for variables, always of length 1
          */
-        private List<TokenDeclVar> found = new List<TokenDeclVar> ();
-        public TokenDeclVar[] FindCallables (string name, TokenType[] argTypes)
+        private List<TokenDeclVar> found = new List<TokenDeclVar>();
+        public TokenDeclVar[] FindCallables(string name, TokenType[] argTypes)
         {
-            argTypes = KeyTypesToStringTypes (argTypes);
-            TokenDeclVar var = FindExact (name, argTypes);
-            if (var != null) return new TokenDeclVar[] { var };
+            argTypes = KeyTypesToStringTypes(argTypes);
+            TokenDeclVar var = FindExact(name, argTypes);
+            if(var != null)
+                return new TokenDeclVar[] { var };
 
             Dictionary<ArgTypes, TDVEntry> typedic;
-            if (!master.TryGetValue (name, out typedic)) return null;
+            if(!master.TryGetValue(name, out typedic))
+                return null;
 
-            found.Clear ();
-            foreach (KeyValuePair<ArgTypes, TDVEntry> kvp in typedic) {
-                if ((kvp.Value.count <= this.count) && kvp.Key.CanBeCalledBy (argTypes)) {
-                    found.Add (kvp.Value.var);
+            found.Clear();
+            foreach(KeyValuePair<ArgTypes, TDVEntry> kvp in typedic)
+            {
+                if((kvp.Value.count <= this.count) && kvp.Key.CanBeCalledBy(argTypes))
+                {
+                    found.Add(kvp.Value.var);
                 }
             }
-            return (found.Count > 0) ? found.ToArray () : null;
+            return (found.Count > 0) ? found.ToArray() : null;
         }
 
         /**
@@ -223,19 +255,22 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          * @returns null: no matching function/variable found
          *          else: the matching function/variable
          */
-        public TokenDeclVar FindExact (string name, TokenType[] argTypes)
+        public TokenDeclVar FindExact(string name, TokenType[] argTypes)
         {
             /*
              * Look for list of stuff that matches the given name.
              */
             Dictionary<ArgTypes, TDVEntry> typedic;
-            if (!master.TryGetValue (name, out typedic)) return null;
+            if(!master.TryGetValue(name, out typedic))
+                return null;
 
             /*
              * Loop through all fields/methods declared by that name, regardless of arg signature.
              */
-            foreach (TDVEntry entry in typedic.Values) {
-                if (entry.count > this.count) continue;
+            foreach(TDVEntry entry in typedic.Values)
+            {
+                if(entry.count > this.count)
+                    continue;
                 TokenDeclVar var = entry.var;
 
                 /*
@@ -248,12 +283,13 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
                 /*
                  * Convert any key args to string args.
                  */
-                declArgs = KeyTypesToStringTypes (declArgs);
+                declArgs = KeyTypesToStringTypes(declArgs);
 
                 /*
                  * If both are null, they are signature-less (ie, both are fields), and so match.
                  */
-                if ((declArgs == null) && (argTypes == null)) return var;
+                if((declArgs == null) && (argTypes == null))
+                    return var;
 
                 /*
                  * If calling a delegate, it is a match, regardless of delegate arg types.
@@ -261,29 +297,38 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
                  * trying to cast the arguments to the delegate arg types.
                  * We don't allow overloading same field name with different delegate types.
                  */
-                if ((declArgs == null) && (argTypes != null)) {
+                if((declArgs == null) && (argTypes != null))
+                {
                     TokenType fieldType = var.type;
-                    if (fieldType is TokenTypeSDTypeDelegate) return var;
+                    if(fieldType is TokenTypeSDTypeDelegate)
+                        return var;
                 }
 
                 /*
                  * If not both null, no match, keep looking.
                  */
-                if ((declArgs == null) || (argTypes == null)) continue;
+                if((declArgs == null) || (argTypes == null))
+                    continue;
 
                 /*
                  * Both not null, match argument types to make sure we have correct overload.
                  */
                 int i = declArgs.Length;
-                if (i != argTypes.Length) continue;
-                while (-- i >= 0) {
-                    string da = declArgs[i].ToString ();
-                    string ga = argTypes[i].ToString ();
-                    if (da == "key") da = "string";
-                    if (ga == "key") ga = "string";
-                    if (da != ga) break;
+                if(i != argTypes.Length)
+                    continue;
+                while(--i >= 0)
+                {
+                    string da = declArgs[i].ToString();
+                    string ga = argTypes[i].ToString();
+                    if(da == "key")
+                        da = "string";
+                    if(ga == "key")
+                        ga = "string";
+                    if(da != ga)
+                        break;
                 }
-                if (i < 0) return var;
+                if(i < 0)
+                    return var;
             }
 
             /*
@@ -299,20 +344,26 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
          * @param argTypes = argument types as declared in source code
          * @returns argTypes with any key replaced by string
          */
-        private static TokenType[] KeyTypesToStringTypes (TokenType[] argTypes)
+        private static TokenType[] KeyTypesToStringTypes(TokenType[] argTypes)
         {
-            if (argTypes != null) {
+            if(argTypes != null)
+            {
                 int i;
                 int nats = argTypes.Length;
-                for (i = nats; -- i >= 0;) {
-                    if (argTypes[i] is TokenTypeKey) break;
+                for(i = nats; --i >= 0;)
+                {
+                    if(argTypes[i] is TokenTypeKey)
+                        break;
                 }
-                if (i >= 0) {
+                if(i >= 0)
+                {
                     TokenType[] at = new TokenType[nats];
-                    for (i = nats; -- i >= 0;) {
+                    for(i = nats; --i >= 0;)
+                    {
                         at[i] = argTypes[i];
-                        if (argTypes[i] is TokenTypeKey) {
-                            at[i] = new TokenTypeStr (argTypes[i]);
+                        if(argTypes[i] is TokenTypeKey)
+                        {
+                            at[i] = new TokenTypeStr(argTypes[i]);
                         }
                     }
                     return at;
@@ -324,48 +375,60 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
         // foreach goes through all the TokenDeclVars that were added
 
         // IEnumerable
-        public IEnumerator GetEnumerator ()
+        public IEnumerator GetEnumerator()
         {
-            return new VarDictEnumerator (this.master, this.count);
+            return new VarDictEnumerator(this.master, this.count);
         }
 
-        private class VarDictEnumerator : IEnumerator {
+        private class VarDictEnumerator: IEnumerator
+        {
             private IEnumerator masterEnum;
             private IEnumerator typedicEnum;
             private int count;
 
-            public VarDictEnumerator (Dictionary<string, Dictionary<ArgTypes, TDVEntry>> master, int count)
+            public VarDictEnumerator(Dictionary<string, Dictionary<ArgTypes, TDVEntry>> master, int count)
             {
-                masterEnum = master.Values.GetEnumerator ();
+                masterEnum = master.Values.GetEnumerator();
                 this.count = count;
             }
 
             // IEnumerator
-            public void Reset ()
+            public void Reset()
             {
-                masterEnum.Reset ();
+                masterEnum.Reset();
                 typedicEnum = null;
             }
 
             // IEnumerator
-            public bool MoveNext ()
+            public bool MoveNext()
             {
-                while (true) {
-                    if (typedicEnum != null) {
-                        while (typedicEnum.MoveNext ()) {
-                            if (((TDVEntry)typedicEnum.Current).count <= this.count) return true;
+                while(true)
+                {
+                    if(typedicEnum != null)
+                    {
+                        while(typedicEnum.MoveNext())
+                        {
+                            if(((TDVEntry)typedicEnum.Current).count <= this.count)
+                                return true;
                         }
                         typedicEnum = null;
                     }
-                    if (!masterEnum.MoveNext ()) return false;
+                    if(!masterEnum.MoveNext())
+                        return false;
                     Dictionary<ArgTypes, TDVEntry> ctd;
                     ctd = (Dictionary<ArgTypes, TDVEntry>)masterEnum.Current;
-                    typedicEnum = ctd.Values.GetEnumerator ();
+                    typedicEnum = ctd.Values.GetEnumerator();
                 }
             }
 
             // IEnumerator
-            public object Current { get { return ((TDVEntry)typedicEnum.Current).var; } }
+            public object Current
+            {
+                get
+                {
+                    return ((TDVEntry)typedicEnum.Current).var;
+                }
+            }
         }
     }
 }