Work in progress on SECS stuff. Have been holding it off until after 0.6 release. Still messy as hell and doesn't really work yet. Will undergo dramatic changes. AND MOST IMPORTANTLY: Will be conformed to work in coop with todays DNE and XEngine, hopefully one day providing a common interface for all components.

5 files changed, 37 insertions, 59 deletions

diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/Components/ComponentBase.cs b/OpenSim/ScriptEngine/Components/DotNetEngine/Compilers/Compiler_YP.cs
index 48c6bfe..c81ad76 100644
--- a/OpenSim/ApplicationPlugins/ScriptEngine/Components/ComponentBase.cs
+++ b/OpenSim/ScriptEngine/Components/DotNetEngine/Compilers/Compiler_YP.cs
@@ -26,28 +26,30 @@
  */
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Text;
+using OpenSim.ScriptEngine.Components.DotNetEngine.Compilers.YP;
+using OpenSim.ScriptEngine.Shared;
 
-namespace OpenSim.ApplicationPlugins.ScriptEngine.Components
+namespace OpenSim.ScriptEngine.Components.DotNetEngine.Compilers
 {
-    /// <summary>
-    /// Generic baseclass for component providers
-    /// </summary>
-    public abstract class ComponentBase //: iProviderBase
+    public class Compiler_YP: IScriptCompiler
     {
-        //public abstract iProviderBase CreateInstance();
-        public abstract void Start();
-        public abstract void Close();
-        public RegionScriptEngineBase scriptEngine;
-        public void Initialize(RegionScriptEngineBase ScriptEngine)
+
+        private readonly Compiler_CS m_Compiler_CS = new Compiler_CS();
+
+        public string Compile(ScriptMetaData scriptMetaData, ref string script)
         {
-            scriptEngine = ScriptEngine;
+            // Convert script to CS
+            string scriptCS = YP2CS.Convert(ref script);
+            // Use CS compiler to compile it
+            return m_Compiler_CS.Compile(scriptMetaData, ref scriptCS);
         }
 
-        static ComponentBase()
+        public string PreProcessScript(ref string script)
         {
-            // We got loaded -- should we register now?
-            //OpenSim.ApplicationPlugins.ScriptEngine.ComponentProviders.providers.Add(GetType());
+            // This is handled by our converter
+            return script;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/Components/EventBase.cs b/OpenSim/ScriptEngine/Shared/IScriptCompiler.cs
index 1c0fd52..3bc0c03 100644
--- a/OpenSim/ApplicationPlugins/ScriptEngine/Components/EventBase.cs
+++ b/OpenSim/ScriptEngine/Shared/IScriptCompiler.cs
@@ -26,20 +26,15 @@
  */
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Text;
+using ScriptAssemblies;
 
-namespace OpenSim.ApplicationPlugins.ScriptEngine.Components
+namespace OpenSim.ScriptEngine.Shared
 {
-    public abstract class EventBase : ComponentBase
+    public interface IScriptCompiler : IScriptEngineComponent
     {
-        //public override iProviderBase CreateInstance()
-        //{
-        //    throw new NotImplementedException();
-        //}
-
-        //public override void Start()
-        //{
-        //    throw new NotImplementedException();
-        //}
+        string Compile(ScriptMetaData scriptMetaData, ref string script);
+        string PreProcessScript(ref string script);
     }
 }
\ No newline at end of file
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/Components/CommandBase.cs b/OpenSim/ScriptEngine/Shared/IScriptEngineComponent.cs
index 4708554..3c977a5 100644
--- a/OpenSim/ApplicationPlugins/ScriptEngine/Components/CommandBase.cs
+++ b/OpenSim/ScriptEngine/Shared/IScriptEngineComponent.cs
@@ -28,18 +28,9 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace OpenSim.ApplicationPlugins.ScriptEngine.Components
+namespace OpenSim.ScriptEngine.Shared
 {
-    public abstract class CommandBase: ComponentBase
+    public interface IScriptEngineComponent
     {
-        //public override iProviderBase CreateInstance()
-        //{
-        //    throw new NotImplementedException();
-        //}
-
-        //public override void Start()
-        //{
-        //    throw new NotImplementedException();
-        //}
     }
 }
\ No newline at end of file
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/Components/CompilerBase.cs b/OpenSim/ScriptEngine/Shared/IScriptExecutor.cs
index e62d1f2..77bea13 100644
--- a/OpenSim/ApplicationPlugins/ScriptEngine/Components/CompilerBase.cs
+++ b/OpenSim/ScriptEngine/Shared/IScriptExecutor.cs
@@ -27,19 +27,13 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using OpenSim.ScriptEngine.Shared;
 
-namespace OpenSim.ApplicationPlugins.ScriptEngine.Components
+namespace OpenSim.ScriptEngine.Shared
 {
-    public abstract class CompilerBase: ComponentBase
+    public interface IScriptExecutor : IScriptEngineComponent, IScriptEngineRegionComponent
     {
-        //public override iProviderBase CreateInstance()
-        //{
-        //    throw new NotImplementedException();
-        //}
-
-        //public override void Start()
-        //{
-        //    throw new NotImplementedException();
-        //}
+        void ExecuteCommand(ref ScriptStructure scriptContainer, EventParams p);
+        void ExecuteCommand(EventParams p);
     }
 }
\ No newline at end of file
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/Components/SchedulerBase.cs b/OpenSim/ScriptEngine/Shared/IScriptScheduler.cs
index 9d5aff0..3e56c12 100644
--- a/OpenSim/ApplicationPlugins/ScriptEngine/Components/SchedulerBase.cs
+++ b/OpenSim/ScriptEngine/Shared/IScriptScheduler.cs
@@ -27,19 +27,15 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using OpenMetaverse;
+using OpenSim.ScriptEngine.Shared;
 
-namespace OpenSim.ApplicationPlugins.ScriptEngine.Components
+namespace OpenSim.ScriptEngine.Shared
 {
-    public abstract class SchedulerBase: ComponentBase
+    public interface IScriptScheduler : IScriptEngineComponent
     {
-        //public override iProviderBase CreateInstance()
-        //{
-        //    throw new NotImplementedException();
-        //}
-
-        //public override void Start()
-        //{
-        //    throw new NotImplementedException();
-        //}
+        void AddScript(ScriptStructure script);
+        void Removecript(uint id, UUID itemID);
+        void Close();
     }
 }
\ No newline at end of file