Changeset 10358 for branches/HLScript/HeuristicLab.HLScript

Timestamp:

01/20/14 17:33:22 (11 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/HLScript.cs (modified) (7 diffs)
• HeuristicLab.HLScript/3.3/HLScriptGeneration.cs (modified) (4 diffs)

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

@@ -17 +17 @@
 
 namespace HeuristicLab.HLScript {
-  [Item("HLScript", "A HeuristicLab script.")]
+  [Item("HL Script", "A HeuristicLab script.")]
   [Creatable("Scripts")]
   [StorableClass]
@@ -84 +84 @@
       : base(original, cloner) {
       code = original.code;
-      //      variableStore = cloner.Clone(original.variableStore);
-      //      compiledHLScript = cloner.Clone(original.compiledHLScript)
+      variableStore = new VariableStore();
       compilationUnitCode = original.compilationUnitCode;
       if (original.compileErrors != null)
@@ -92 +91 @@
 
     public HLScript()
-      : base("HLS") {
+      : base("HL Script", "A HeuristicLab script.") {
       code = CodeTemplate;
-      variableStore = new VariableStore();
-    }
-
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      compiledHLScript = null;
       variableStore = new VariableStore();
     }
@@ -172 +165 @@
     }
 
+    public IEnumerable<Assembly> GetAssemblies() {
+      var assemblies = new List<Assembly>();
+      foreach (var a in AppDomain.CurrentDomain.GetAssemblies()) {
+        try {
+          if (File.Exists(a.Location)) assemblies.Add(a);
+        } catch (NotSupportedException) {
+          // NotSupportedException is thrown while accessing 
+          // the Location property of the anonymously hosted
+          // dynamic methods assembly, which is related to
+          // LINQ queries
+        }
+      }
+      assemblies.Add(typeof(Microsoft.CSharp.RuntimeBinder.Binder).Assembly); // for dlr functionality
+      return assemblies;
+    }
+
     private readonly Regex LineSplitter = new Regex(@"\r\n|\r|\n");
     private readonly Regex SafeTypeNameCharRegex = new Regex("[_a-zA-Z0-9]+");
@@ -177 +186 @@
     private readonly Regex NamespaceDeclarationRegex = new Regex(@"using\s+(@?[a-z_A-Z]\w+(?:\s*\.\s*@?[a-z_A-Z]\w*)*)\s*;");
     private readonly Regex NamespaceRegex = new Regex(@"(@?[a-z_A-Z]\w+(?:\s*\.\s*@?[a-z_A-Z]\w*)*)");
+    private readonly Regex CommentRegex = new Regex(@"((/\*)[^/]+(\*/))|(//.*)");
 
     private CodeCompileUnit CreateCompilationUnit() {
@@ -191 +201 @@
 
     private IEnumerable<string> GetNamespaces() {
-      var strings = NamespaceDeclarationRegex.Matches(code)
+      var strings = NamespaceDeclarationRegex.Matches(CommentRegex.Replace(code, string.Empty))
                                              .Cast<Match>()
                                              .Select(m => m.Value);
@@ -207 +217 @@
           yield return trimmedLine;
       }
-    }
-
-    private IEnumerable<Assembly> GetAssemblies() {
-      var assemblies = new List<Assembly>();
-      foreach (var a in AppDomain.CurrentDomain.GetAssemblies()) {
-        try {
-          if (File.Exists(a.Location)) assemblies.Add(a);
-        } catch (NotSupportedException) {
-          // NotSupportedException is thrown while accessing 
-          // the Location property of the anonymously hosted
-          // dynamic methods assembly, which is related to
-          // LINQ queries
-        }
-      }
-      assemblies.Add(typeof(Microsoft.CSharp.RuntimeBinder.Binder).Assembly); // for dlr functionality
-      return assemblies;
     }
 

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;
-      }
     }
   }