diff options
Diffstat (limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Basic')
5 files changed, 17 insertions, 35 deletions
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/GlobalObject.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/GlobalObject.cs index fc48bb2a2..c76fba8e2 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/GlobalObject.cs +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/GlobalObject.cs @@ -6,8 +6,8 @@ using System.Threading.Tasks; namespace Tango.Scripting.Basic { - public class GlobalObject + public class GlobalObject<T> where T : IContext { - public IContext GlobalContext { get; set; } + public T GlobalContext { get; set; } } } diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs index 31be3a714..85caf4706 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs @@ -18,7 +18,7 @@ using System.IO; namespace Tango.Scripting.Basic { - public class Project : ExtendedObject + public class Project<T> : ExtendedObject where T : IContext { private String _name; public String Name @@ -43,6 +43,7 @@ namespace Tango.Scripting.Basic public ObservableCollection<Script> Scripts { get; set; } + [JsonIgnore] public ObservableCollection<IScriptSource> AdditionalScripts { get @@ -78,16 +79,16 @@ namespace Tango.Scripting.Basic } } - public static Project New(String name) + public static Project<T> New(String name) { - Project p = new Project(); + Project<T> p = new Project<T>(); p.Name = name; p.ReferenceAssemblies.Add(new ReferenceAssembly() { FromType = typeof(String) }); p.ReferenceAssemblies.Add(new ReferenceAssembly() { FromType = typeof(Enumerable) }); p.ReferenceAssemblies.Add(new ReferenceAssembly() { FromType = typeof(Form) }); - p.ReferenceAssemblies.Add(new ReferenceAssembly() { FromType = typeof(Project) }); + p.ReferenceAssemblies.Add(new ReferenceAssembly() { FromType = typeof(Project<T>) }); return p; } @@ -140,14 +141,14 @@ namespace Tango.Scripting.Basic } else { - code += Environment.NewLine + Environment.NewLine + "return new Program().OnExecute(GlobalContext);"; + code += Environment.NewLine + Environment.NewLine + "new Program().OnExecute(GlobalContext);"; mainScriptCode = code; } } var scriptOptions = ScriptOptions.Default.WithReferences(ReferenceAssembliesLoaded); - var s = CSharpScript.Create<object>(mainScriptCode, scriptOptions, typeof(GlobalObject)); + var s = CSharpScript.Create<object>(mainScriptCode, scriptOptions, typeof(GlobalObject<T>)); result.Script = s; var compileResults = s.Compile(); @@ -164,7 +165,7 @@ namespace Tango.Scripting.Basic cError.Message = error.GetMessage(); cError.Severity = error.Severity; var line = error.Location.GetMappedLineSpan(); - cError.Line = line.StartLinePosition.Line + 1 + (errorScript != null ? errorScript.LoadCount : 0); + cError.Line = line.StartLinePosition.Line + 1 - (errorScript != null ? errorScript.LoadCount : 0); cError.Column = line.StartLinePosition.Character + 1; cError.Length = line.EndLinePosition.Character - line.StartLinePosition.Character; result.Errors.Add(cError); @@ -174,7 +175,7 @@ namespace Tango.Scripting.Basic }); } - public async Task<ProjectSession> Run(IContext context) + public async Task<ProjectSession<T>> Run(T context) { var result = await Compile(); @@ -184,9 +185,9 @@ namespace Tango.Scripting.Basic } Thread scriptThread = null; - ProjectSession session = null; + ProjectSession<T> session = null; - session = new ProjectSession(this, () => + session = new ProjectSession<T>(this, () => { scriptThread.Abort(); }); @@ -195,7 +196,7 @@ namespace Tango.Scripting.Basic { try { - var runResult = result.Script.RunAsync(globals: new GlobalObject() { GlobalContext = context }).Result; + var runResult = result.Script.RunAsync(globals: new GlobalObject<T>() { GlobalContext = context }).Result; session.Completed(runResult.ReturnValue); } catch (ThreadAbortException) diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ProjectManager.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ProjectManager.cs deleted file mode 100644 index 3af7530bc..000000000 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ProjectManager.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.Scripting.Basic -{ - public class ProjectManager - { - public Project Project { get; set; } - - public ProjectManager(Project project) - { - Project = project; - } - } -} diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ProjectSession.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ProjectSession.cs index 565949402..6bd3d44b9 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ProjectSession.cs +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ProjectSession.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Tango.Scripting.Basic { - public class ProjectSession + public class ProjectSession<T> where T : IContext { private Action _abortAction; private TaskCompletionSource<object> _completion; @@ -15,9 +15,9 @@ namespace Tango.Scripting.Basic public ProjectSessionState State { get; set; } - public Project Project { get; set; } + public Project<T> Project { get; set; } - public ProjectSession(Project project, Action abortAction) + public ProjectSession(Project<T> project, Action abortAction) { _completion = new TaskCompletionSource<object>(); Project = project; diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Tango.Scripting.Basic.csproj b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Tango.Scripting.Basic.csproj index 8af52748a..be52ca57a 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Tango.Scripting.Basic.csproj +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Tango.Scripting.Basic.csproj @@ -136,7 +136,6 @@ <Compile Include="CompilationResult.cs" /> <Compile Include="GlobalObject.cs" /> <Compile Include="Project.cs" /> - <Compile Include="ProjectManager.cs" /> <Compile Include="ReferenceAssembly.cs" /> <Compile Include="Properties\AssemblyInfo.cs"> <SubType>Code</SubType> |