Changeset 10401 for trunk/sources/HeuristicLab.HLScript/3.3

Timestamp:

01/27/14 14:13:02 (11 years ago)

Author:

jkarder

Message:

#2136:

• renamed some HLScript files
• fixed a bug where variables could be renamed while a script was running
• the complete source code is now always visible
• removed "show generated code" feature

Location:

trunk/sources/HeuristicLab.HLScript/3.3

Files:

• HeuristicLab.HLScript-3.3.csproj (modified) (1 diff)
• Script.cs (moved) (moved from trunk/sources/HeuristicLab.HLScript/3.3/HLScript.cs) (11 diffs)
• UserScriptBase.cs (moved) (moved from trunk/sources/HeuristicLab.HLScript/3.3/HLScriptGeneration.cs) (4 diffs)

trunk/sources/HeuristicLab.HLScript/3.3/HeuristicLab.HLScript-3.3.csproj

@@ -87 +87 @@
     <Compile Include="VariableStore.cs" />
     <None Include="Plugin.cs.frame" />
-    <Compile Include="HLScript.cs" />
-    <Compile Include="HLScriptGeneration.cs" />
+    <Compile Include="Script.cs" />
+    <Compile Include="UserScriptBase.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

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

@@ -17 +17 @@
 
 namespace HeuristicLab.HLScript {
-  [Item("HL Script", "A HeuristicLab script.")]
+  [Item("Script", "A HeuristicLab script.")]
   [Creatable("Scripts")]
   [StorableClass]
-  public sealed class HLScript : NamedItem, IStorableContent {
+  public sealed class Script : NamedItem, IStorableContent {
     #region Constants
-    private const string ScriptNamespaceName = "HeuristicLab.HLScript";
     private const string ExecuteMethodName = "Execute";
     private const string CodeTemplate =
@@ -29 +28 @@
 using System;
 
-public override void Main() {
-  // type your code here
-}
-
-// further classes and methods";
+namespace UserScripts {
+  public class UserScript : HeuristicLab.HLScript.UserScriptBase {
+    public override void Main() {
+      // type your code here
+    }
+
+    // further classes and methods
+
+  }
+}";
     #endregion
 
     #region Fields & Properties
-    private HLScriptGeneration compiledHLScript;
+    private UserScriptBase compiledScript;
 
     public string Filename { get; set; }
@@ -58 +62 @@
         if (value == code) return;
         code = value;
-        compiledHLScript = null;
+        compiledScript = null;
         OnCodeChanged();
       }
@@ -80 +84 @@
     #region Construction & Initialization
     [StorableConstructor]
-    private HLScript(bool deserializing) : base(deserializing) { }
-    private HLScript(HLScript original, Cloner cloner)
+    private Script(bool deserializing) : base(deserializing) { }
+    private Script(Script original, Cloner cloner)
       : base(original, cloner) {
       code = original.code;
@@ -90 +94 @@
     }
 
-    public HLScript()
-      : base("HL Script", "A HeuristicLab script.") {
+    public Script()
+      : base("Script", "A HeuristicLab script.") {
       code = CodeTemplate;
       variableStore = new VariableStore();
@@ -97 +101 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new HLScript(this, cloner);
+      return new Script(this, cloner);
     }
     #endregion
 
     private void RegisterScriptEvents() {
-      if (compiledHLScript == null) return;
-      compiledHLScript.ConsoleOutputChanged += compiledHLScript_ConsoleOutputChanged;
+      if (compiledScript == null) return;
+      compiledScript.ConsoleOutputChanged += compiledScript_ConsoleOutputChanged;
     }
 
     private void DeregisterScriptEvents() {
-      if (compiledHLScript == null) return;
-      compiledHLScript.ConsoleOutputChanged -= compiledHLScript_ConsoleOutputChanged;
+      if (compiledScript == null) return;
+      compiledScript.ConsoleOutputChanged -= compiledScript_ConsoleOutputChanged;
     }
 
@@ -143 +147 @@
     public void Compile() {
       var results = DoCompile();
-      compiledHLScript = null;
+      compiledScript = null;
       CompileErrors = results.Errors;
       if (results.Errors.HasErrors) {
@@ -160 +164 @@
         var types = assembly.GetTypes();
         DeregisterScriptEvents();
-        compiledHLScript = (HLScriptGeneration)Activator.CreateInstance(types[0]);
+        compiledScript = (UserScriptBase)Activator.CreateInstance(types[0]);
         RegisterScriptEvents();
       }
@@ -181 +185 @@
     }
 
-    private readonly Regex LineSplitter = new Regex(@"\r\n|\r|\n");
     private readonly Regex SafeTypeNameCharRegex = new Regex("[_a-zA-Z0-9]+");
     private readonly Regex SafeTypeNameRegex = new Regex("[_a-zA-Z][_a-zA-Z0-9]*");
-    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() {
-      var ns = new CodeNamespace(ScriptNamespaceName);
-      ns.Types.Add(CreateScriptClass());
-      ns.Imports.AddRange(
-        GetNamespaces()
-        .Select(n => new CodeNamespaceImport(n))
-        .ToArray());
-      var unit = new CodeCompileUnit();
-      unit.Namespaces.Add(ns);
+      var unit = new CodeSnippetCompileUnit(code);
       return unit;
-    }
-
-    private IEnumerable<string> GetNamespaces() {
-      var strings = NamespaceDeclarationRegex.Matches(CommentRegex.Replace(code, string.Empty))
-                                             .Cast<Match>()
-                                             .Select(m => m.Value);
-      foreach (var s in strings) {
-        var match = NamespaceRegex.Match(s.Replace("using", string.Empty));
-        yield return match.Value;
-      }
-    }
-
-    private IEnumerable<string> GetCodeLines() {
-      var lines = LineSplitter.Split(code);
-      foreach (var line in lines) {
-        string trimmedLine = line.Trim();
-        if (!NamespaceDeclarationRegex.IsMatch(trimmedLine))
-          yield return trimmedLine;
-      }
     }
 
@@ -230 +204 @@
       }
     }
-
-    private CodeTypeDeclaration CreateScriptClass() {
-      var typeDecl = new CodeTypeDeclaration(CompiledTypeName) {
-        IsClass = true,
-        TypeAttributes = TypeAttributes.Public,
-      };
-      typeDecl.BaseTypes.Add(typeof(HLScriptGeneration));
-      typeDecl.Members.Add(new CodeSnippetTypeMember(string.Join(Environment.NewLine, GetCodeLines())));
-      return typeDecl;
-    }
     #endregion
 
     private Thread scriptThread;
     public void Execute() {
-      if (compiledHLScript == null) return;
-      var executeMethod = typeof(HLScriptGeneration).GetMethod(ExecuteMethodName, BindingFlags.NonPublic | BindingFlags.Instance);
+      if (compiledScript == null) return;
+      var executeMethod = typeof(UserScriptBase).GetMethod(ExecuteMethodName, BindingFlags.NonPublic | BindingFlags.Instance);
       if (executeMethod != null) {
         scriptThread = new Thread(() => {
           try {
             OnScriptExecutionStarted();
-            executeMethod.Invoke(compiledHLScript, new[] { VariableStore });
+            executeMethod.Invoke(compiledScript, new[] { VariableStore });
           } finally {
             OnScriptExecutionFinished();
@@ -264 +228 @@
     }
 
-    private void compiledHLScript_ConsoleOutputChanged(object sender, EventArgs<string> e) {
+    private void compiledScript_ConsoleOutputChanged(object sender, EventArgs<string> e) {
       OnConsoleOutputChanged(e.Value);
     }

trunk/sources/HeuristicLab.HLScript/3.3/UserScriptBase.cs

@@ -7 +7 @@
 
 namespace HeuristicLab.HLScript {
-  public abstract class HLScriptGeneration {
+  public abstract class UserScriptBase {
     protected dynamic vars;
 
@@ -15 +15 @@
     }
 
-    protected HLScriptGeneration() {
+    protected UserScriptBase() {
       console = new EventWriter(this);
     }
@@ -56 +56 @@
 
     protected class EventWriter : TextWriter {
-      private readonly HLScriptGeneration hlsg;
+      private readonly UserScriptBase usb;
 
-      public EventWriter(HLScriptGeneration hlsg) {
-        this.hlsg = hlsg;
+      public EventWriter(UserScriptBase usb) {
+        this.usb = usb;
       }
 
@@ -68 +68 @@
       #region Write/WriteLine Overrides
       #region Write
-      public override void Write(bool value) { hlsg.OnConsoleOutputChanged(value.ToString()); }
-      public override void Write(char value) { hlsg.OnConsoleOutputChanged(value.ToString()); }
-      public override void Write(char[] buffer) { hlsg.OnConsoleOutputChanged(new string(buffer)); }
-      public override void Write(char[] buffer, int index, int count) { hlsg.OnConsoleOutputChanged(new string(buffer, index, count)); }
-      public override void Write(decimal value) { hlsg.OnConsoleOutputChanged(value.ToString()); }
-      public override void Write(double value) { hlsg.OnConsoleOutputChanged(value.ToString()); }
-      public override void Write(float value) { hlsg.OnConsoleOutputChanged(value.ToString()); }
-      public override void Write(int value) { hlsg.OnConsoleOutputChanged(value.ToString()); }
-      public override void Write(long value) { hlsg.OnConsoleOutputChanged(value.ToString()); }
-      public override void Write(object value) { hlsg.OnConsoleOutputChanged(value.ToString()); }
-      public override void Write(string value) { hlsg.OnConsoleOutputChanged(value); }
-      public override void Write(string format, object arg0) { hlsg.OnConsoleOutputChanged(string.Format(format, arg0)); }
-      public override void Write(string format, object arg0, object arg1) { hlsg.OnConsoleOutputChanged(string.Format(format, arg0, arg0)); }
-      public override void Write(string format, object arg0, object arg1, object arg2) { hlsg.OnConsoleOutputChanged(string.Format(format, arg0, arg1, arg2)); }
-      public override void Write(string format, params object[] arg) { hlsg.OnConsoleOutputChanged(string.Format(format, arg)); }
-      public override void Write(uint value) { hlsg.OnConsoleOutputChanged(value.ToString()); }
-      public override void Write(ulong value) { hlsg.OnConsoleOutputChanged(value.ToString()); }
+      public override void Write(bool value) { usb.OnConsoleOutputChanged(value.ToString()); }
+      public override void Write(char value) { usb.OnConsoleOutputChanged(value.ToString()); }
+      public override void Write(char[] buffer) { usb.OnConsoleOutputChanged(new string(buffer)); }
+      public override void Write(char[] buffer, int index, int count) { usb.OnConsoleOutputChanged(new string(buffer, index, count)); }
+      public override void Write(decimal value) { usb.OnConsoleOutputChanged(value.ToString()); }
+      public override void Write(double value) { usb.OnConsoleOutputChanged(value.ToString()); }
+      public override void Write(float value) { usb.OnConsoleOutputChanged(value.ToString()); }
+      public override void Write(int value) { usb.OnConsoleOutputChanged(value.ToString()); }
+      public override void Write(long value) { usb.OnConsoleOutputChanged(value.ToString()); }
+      public override void Write(object value) { usb.OnConsoleOutputChanged(value.ToString()); }
+      public override void Write(string value) { usb.OnConsoleOutputChanged(value); }
+      public override void Write(string format, object arg0) { usb.OnConsoleOutputChanged(string.Format(format, arg0)); }
+      public override void Write(string format, object arg0, object arg1) { usb.OnConsoleOutputChanged(string.Format(format, arg0, arg0)); }
+      public override void Write(string format, object arg0, object arg1, object arg2) { usb.OnConsoleOutputChanged(string.Format(format, arg0, arg1, arg2)); }
+      public override void Write(string format, params object[] arg) { usb.OnConsoleOutputChanged(string.Format(format, arg)); }
+      public override void Write(uint value) { usb.OnConsoleOutputChanged(value.ToString()); }
+      public override void Write(ulong value) { usb.OnConsoleOutputChanged(value.ToString()); }
       #endregion
 
       #region WriteLine
-      public override void WriteLine() { hlsg.OnConsoleOutputChanged(Environment.NewLine); }
-      public override void WriteLine(bool value) { hlsg.OnConsoleOutputChanged(value + Environment.NewLine); }
-      public override void WriteLine(char value) { hlsg.OnConsoleOutputChanged(value + Environment.NewLine); }
-      public override void WriteLine(char[] buffer) { hlsg.OnConsoleOutputChanged(new string(buffer) + Environment.NewLine); }
-      public override void WriteLine(char[] buffer, int index, int count) { hlsg.OnConsoleOutputChanged(new string(buffer, index, count) + Environment.NewLine); }
-      public override void WriteLine(decimal value) { hlsg.OnConsoleOutputChanged(value + Environment.NewLine); }
-      public override void WriteLine(double value) { hlsg.OnConsoleOutputChanged(value + Environment.NewLine); }
-      public override void WriteLine(float value) { hlsg.OnConsoleOutputChanged(value + Environment.NewLine); }
-      public override void WriteLine(int value) { hlsg.OnConsoleOutputChanged(value + Environment.NewLine); }
-      public override void WriteLine(long value) { hlsg.OnConsoleOutputChanged(value + Environment.NewLine); }
-      public override void WriteLine(object value) { hlsg.OnConsoleOutputChanged(value + Environment.NewLine); }
-      public override void WriteLine(string value) { hlsg.OnConsoleOutputChanged(value + Environment.NewLine); }
-      public override void WriteLine(string format, object arg0) { hlsg.OnConsoleOutputChanged(string.Format(format, arg0) + Environment.NewLine); }
-      public override void WriteLine(string format, object arg0, object arg1) { hlsg.OnConsoleOutputChanged(string.Format(format, arg0, arg1) + Environment.NewLine); }
-      public override void WriteLine(string format, object arg0, object arg1, object arg2) { hlsg.OnConsoleOutputChanged(string.Format(format, arg0, arg1, arg2) + Environment.NewLine); }
-      public override void WriteLine(string format, params object[] arg) { hlsg.OnConsoleOutputChanged(string.Format(format, arg) + Environment.NewLine); }
-      public override void WriteLine(uint value) { hlsg.OnConsoleOutputChanged(value + Environment.NewLine); }
-      public override void WriteLine(ulong value) { hlsg.OnConsoleOutputChanged(value + Environment.NewLine); }
+      public override void WriteLine() { usb.OnConsoleOutputChanged(Environment.NewLine); }
+      public override void WriteLine(bool value) { usb.OnConsoleOutputChanged(value + Environment.NewLine); }
+      public override void WriteLine(char value) { usb.OnConsoleOutputChanged(value + Environment.NewLine); }
+      public override void WriteLine(char[] buffer) { usb.OnConsoleOutputChanged(new string(buffer) + Environment.NewLine); }
+      public override void WriteLine(char[] buffer, int index, int count) { usb.OnConsoleOutputChanged(new string(buffer, index, count) + Environment.NewLine); }
+      public override void WriteLine(decimal value) { usb.OnConsoleOutputChanged(value + Environment.NewLine); }
+      public override void WriteLine(double value) { usb.OnConsoleOutputChanged(value + Environment.NewLine); }
+      public override void WriteLine(float value) { usb.OnConsoleOutputChanged(value + Environment.NewLine); }
+      public override void WriteLine(int value) { usb.OnConsoleOutputChanged(value + Environment.NewLine); }
+      public override void WriteLine(long value) { usb.OnConsoleOutputChanged(value + Environment.NewLine); }
+      public override void WriteLine(object value) { usb.OnConsoleOutputChanged(value + Environment.NewLine); }
+      public override void WriteLine(string value) { usb.OnConsoleOutputChanged(value + Environment.NewLine); }
+      public override void WriteLine(string format, object arg0) { usb.OnConsoleOutputChanged(string.Format(format, arg0) + Environment.NewLine); }
+      public override void WriteLine(string format, object arg0, object arg1) { usb.OnConsoleOutputChanged(string.Format(format, arg0, arg1) + Environment.NewLine); }
+      public override void WriteLine(string format, object arg0, object arg1, object arg2) { usb.OnConsoleOutputChanged(string.Format(format, arg0, arg1, arg2) + Environment.NewLine); }
+      public override void WriteLine(string format, params object[] arg) { usb.OnConsoleOutputChanged(string.Format(format, arg) + Environment.NewLine); }
+      public override void WriteLine(uint value) { usb.OnConsoleOutputChanged(value + Environment.NewLine); }
+      public override void WriteLine(ulong value) { usb.OnConsoleOutputChanged(value + Environment.NewLine); }
       #endregion
       #endregion