Changeset 339

Timestamp:

10/20/07 19:20:19 (15 months ago)

Author:

tomoyo

Message:

リロード時にビルトインモジュールが削除されてしまうのでモジュールを自分で生成するようにした。

Files:

• Apple Wireless Keyboard Helper/trunk/Misuzilla.Applications.AppleWirelessKeyboardHelper/Program.cs (modified) (8 diffs)

Apple Wireless Keyboard Helper/trunk/Misuzilla.Applications.AppleWirelessKeyboardHelper/Program.cs

@@ -9 +9 @@
 using System.IO;
 using System.Text;
+using Microsoft.Scripting.Hosting;
+using System.Collections.Generic;
 
 namespace Misuzilla.Applications.AppleWirelessKeyboardHelper
@@ -16 +18 @@
         private static NotifyIcon _notifyIcon;
         private const String ApplicationName = "Apple Wireless Keyboard Helper";
+        private static IScriptModule _module;
 
         public static Int32 BalloonTipTimeout = 1500;
@@ -88 +91 @@
         private static void Call(String funcName, EventArgs e)
         {
-            if (!Script.VariableExists(funcName))
+            Object funcObj;
+            if (!_module.TryLookupVariable(funcName, out funcObj))
                 return;
             
-            FastCallable f = Script.GetVariable(funcName) as FastCallable;
+            FastCallable f = funcObj as FastCallable;
             if (f == null)
                 return;
@@ -104 +108 @@
         }
 
+
+        
         /// <summary>
         /// 
@@ -113 +119 @@
             Unload = null;
             Load = null;
-            Script.ClearVariables();
 
 #pragma warning disable 0618
@@ -120 +125 @@
 #pragma warning restore 0618
 
+            IScriptEnvironment scriptEnv = ScriptEnvironment.GetEnvironment();
+            List<ICompiledCode> compiledCodes = new List<ICompiledCode>();
+            _module = scriptEnv.CreateModule("ScriptModule");
+
             Boolean hasScripts = false;
             if (Directory.Exists("Scripts"))
@@ -128 +137 @@
                     try
                     {
+                        IScriptEngine engine = scriptEnv.GetLanguageProviderByFileExtension(Path.GetExtension(path)).GetEngine();
+                        engine.ExecuteFileContent(path, _module);
                         hasScripts = true;
-                        Script.ExecuteFileContent(path);
                     }
                     catch (SyntaxErrorException se)
@@ -145 +155 @@
             if (!hasScripts)
             {
-                Script.Execute("py", Resources.Strings.DefaultPythonScript);
-            }
-
+                Script.GetEngine("py").Execute(Resources.Strings.DefaultPythonScript, _module);
+            }
+
+            // ��s
+            _module.Execute();
+            
             OnLoad(EventArgs.Empty);