Changeset 10358 for branches/HLScript/HeuristicLab.HLScript/3.3/HLScriptGeneration.cs

Timestamp:

01/20/14 17:33:22 (10 years ago)

Author:

jkarder

Message:

#2136:

• refactored HLScriptGeneration to separate outputs from different running HL scripts.
• added persistence support for HLScripts and fixed cloning
• added code completion for all types in the currently loaded assemblies
• merged trunk changes

Location:

branches/HLScript

Files:

• . (modified) (1 prop)
• HeuristicLab.HLScript/3.3/HLScriptGeneration.cs (modified) (4 diffs)

branches/HLScript/HeuristicLab.HLScript/3.3/HLScriptGeneration.cs

@@ -8 +8 @@
 namespace HeuristicLab.HLScript {
   public abstract class HLScriptGeneration {
-    protected static dynamic vars;
+    protected dynamic vars;
+
+    private readonly EventWriter console;
+    protected EventWriter Console {
+      get { return console; }
+    }
+
+    protected HLScriptGeneration() {
+      console = new EventWriter(this);
+    }
 
     public abstract void Main();
@@ -14 +23 @@
     private void Execute(VariableStore variableStore) {
       vars = new Variables(variableStore);
-      using (new EventWriter(this)) {
-        try {
-          Main();
-        } catch (ThreadAbortException) {
-        } catch (Exception e) {
-          Console.WriteLine("---");
-          Console.WriteLine(e);
-        }
+      try {
+        Main();
+      } catch (ThreadAbortException) {
+      } catch (Exception e) {
+        Console.WriteLine("---");
+        Console.WriteLine(e);
       }
     }
@@ -48 +55 @@
     }
 
-    private class EventWriter : TextWriter {
-      private readonly TextWriter consoleOut;
+    protected class EventWriter : TextWriter {
       private readonly HLScriptGeneration hlsg;
-      private bool disposed;
 
       public EventWriter(HLScriptGeneration hlsg) {
         this.hlsg = hlsg;
-        consoleOut = Console.Out;
-        Console.SetOut(this);
-        disposed = false;
       }
 
@@ -106 +108 @@
       #endregion
       #endregion
-
-      protected override void Dispose(bool disposing) {
-        if (!disposed && disposing)
-          Console.SetOut(consoleOut);
-        disposed = true;
-      }
     }
   }