Changeset 13218 for trunk/sources/HeuristicLab.Scripting

Timestamp:

11/17/15 14:19:44 (8 years ago)

Author:

jkarder

Message:

#2298: applied some of the changes suggested by mkommend in comment:14:ticket:2298

Location:

trunk/sources/HeuristicLab.Scripting/3.3

Files:

• ExecutableScript.cs (modified) (2 diffs)
• Script.cs (modified) (3 diffs)
• Scripts/CSharp/CSharpScript.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Scripting/3.3/ExecutableScript.cs

@@ -52 +52 @@
       executionTime = original.executionTime;
     }
-    public ExecutableScript()
+    protected ExecutableScript()
       : base() {
       executionTime = TimeSpan.Zero;
-      Code = CodeTemplate;
     }
-    public ExecutableScript(string code)
+    protected ExecutableScript(string code)
       : base(code) {
       executionTime = TimeSpan.Zero;
@@ -85 +84 @@
         timer.Elapsed -= timer_Elapsed;
         timer.Stop();
+        timer.Dispose();
         ExecutionTime += DateTime.UtcNow - lastUpdateTime;
         Running = false;

trunk/sources/HeuristicLab.Scripting/3.3/Script.cs

@@ -37 +37 @@
 namespace HeuristicLab.Scripting {
   [StorableClass]
-  public class Script : NamedItem, IProgrammableItem {
-    protected virtual string CodeTemplate {
-      get { return string.Empty; }
-    }
-
+  public abstract class Script : NamedItem, IProgrammableItem {
     #region Fields & Properties
     public static new Image StaticItemImage {
@@ -77 +73 @@
         compileErrors = new CompilerErrorCollection(original.compileErrors);
     }
-    public Script()
+    protected Script()
       : base("Script", "An empty script.") {
-      code = CodeTemplate;
     }
-    public Script(string code)
+    protected Script(string code)
       : this() {
       this.code = code;
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new Script(this, cloner);
     }
     #endregion
 
     #region Compilation
-    protected virtual CSharpCodeProvider CodeProvider {
-      get {
-        return new CSharpCodeProvider(
-          new Dictionary<string, string> {
-                {"CompilerVersion", "v4.0"}, // support C# 4.0 syntax
-              });
-      }
-    }
-
     protected virtual CompilerResults DoCompile() {
       var parameters = new CompilerParameters {
@@ -114 +96 @@
         .ToArray());
 
-      return CodeProvider.CompileAssemblyFromSource(parameters, code);
+      var codeProvider = new CSharpCodeProvider(
+        new Dictionary<string, string> {
+          { "CompilerVersion", "v4.0"} // support C# 4.0 syntax
+        });
+
+      return codeProvider.CompileAssemblyFromSource(parameters, code);
     }
 

trunk/sources/HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScript.cs

@@ -32 +32 @@
   [StorableClass]
   public class CSharpScript : ExecutableScript, IStorableContent {
-    #region Constants
-    protected override string CodeTemplate { get { return ScriptTemplates.CSharpScriptTemplate; } }
-    #endregion
-
     #region Fields & Properties
     private CSharpScriptBase compiledScript;
@@ -56 +52 @@
     }
     public CSharpScript()
-      : base() {
+      : base(ScriptTemplates.CSharpScriptTemplate) {
       variableStore = new VariableStore();
     }