Merge remote-tracking branch 'remotes/origin/PerformanceFixPrepareScr…

…ipt'
AndersMalmgren · Mar 30, 2014 · 829f87d · 829f87d
2 parents 3812963 + e318947
commit 829f87d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/FreePIE.Core/ScriptEngine/Globals/GlobalsInfo.cs b/FreePIE.Core/ScriptEngine/Globals/GlobalsInfo.cs
@@ -8,6 +8,8 @@ namespace FreePIE.Core.ScriptEngine.Globals
 {
     public static class GlobalsInfo
     {
+        private static readonly Dictionary<Type, string> globalNamesCache = new Dictionary<Type, string>();
+
         public static string GetGlobalName(object global)
         {
             var name = GetGlobalName(global.GetType());
@@ -22,10 +24,17 @@ public static string GetGlobalName(object global)
 
         public static string GetGlobalName(Type type)
         {
-            var typeAttribute = GetAttribute<GlobalType>(type);
-            var globalAttribute = typeAttribute != null ? GetAttribute<Global>(typeAttribute.Type) : GetAttribute<Global>(type);
+            if (!globalNamesCache.ContainsKey(type))
+            {
+                var typeAttribute = GetAttribute<GlobalType>(type);
+                var globalAttribute = typeAttribute != null
+                    ? GetAttribute<Global>(typeAttribute.Type)
+                    : GetAttribute<Global>(type);
+
+                globalNamesCache[type] = globalAttribute != null ? globalAttribute.Name : null;
+            }
 
-            return globalAttribute != null ? globalAttribute.Name : null;
+            return globalNamesCache[type];
         }
 
         public static IEnumerable<MemberInfo> GetGlobalMembers(Type pluginType)

diff --git a/FreePIE.Core/ScriptEngine/Python/PythonScriptParser.cs b/FreePIE.Core/ScriptEngine/Python/PythonScriptParser.cs
@@ -109,7 +109,8 @@ private string FindAndInitMethodsThatNeedIndexer(string script, IEnumerable<obje
             var globalsThatNeedsIndex = globals
                 .SelectMany(g => g.GetType().GetMethods()
                     .Where(m => m.GetCustomAttributes(typeof(NeedIndexer), false).Length > 0)
-                    .Select(m => new { Global = g, MethodInfo = m }));
+                    .Select(m => new { Global = g, MethodInfo = m }))
+                    .ToList();
 
             for (int i = 0; i < script.Length; i++)
             {