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.

1 files changed, 17 insertions, 15 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
+}