Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

3 files changed, 40 insertions, 21 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
index 6aa717d..8b8e038 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
@@ -162,7 +162,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             m_braceCount++;
 
             // line number
-            m_CSharpLine += 3;
+            m_CSharpLine += 9;
 
             // here's the payload
             retstr += GenerateLine();
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index b4640ef..1efe798 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -444,7 +444,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
 //            return compileScript;
 //        }
 
-        private static string CreateCSCompilerScript(
+        public static string CreateCSCompilerScript(
             string compileScript, string className, string baseClassName, ParameterInfo[] constructorParameters)
         {
             compileScript = string.Format(    
@@ -472,7 +472,7 @@ namespace SecondLife
             return compileScript;
         }
 
-        private static string CreateVBCompilerScript(string compileScript, string className, string baseClassName)
+        public static string CreateVBCompilerScript(string compileScript, string className, string baseClassName)
         {
             compileScript = String.Empty +
                 "Imports OpenSim.Region.ScriptEngine.Shared: Imports System.Collections.Generic: " +
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
index 05a8756..badf82a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
 using Microsoft.CSharp;
 using NUnit.Framework;
 using OpenSim.Region.ScriptEngine.Shared.CodeTools;
+using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
 using OpenSim.Tests.Common;
 
 namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
@@ -66,9 +67,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
             m_CSCodeProvider = new CSharpCodeProvider();
             m_compilerParameters = new CompilerParameters();
 
-            string rootPath = Path.Combine(Path.GetDirectoryName(System.AppDomain.CurrentDomain.BaseDirectory), "bin");
+            string rootPath = Path.Combine(Path.GetDirectoryName(System.AppDomain.CurrentDomain.BaseDirectory));
             m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.dll"));
             m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.Api.Runtime.dll"));
+            m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenMetaverseTypes.dll"));
             m_compilerParameters.GenerateExecutable = false;
         }
 
@@ -90,7 +92,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
         /// Test the C# compiler error message can be mapped to the correct
         /// line/column in the LSL source when an undeclared variable is used.
         /// </summary>
-        //[Test]
+        [Test]
         public void TestUseUndeclaredVariable()
         {
             TestHelpers.InMethod();
@@ -106,25 +108,37 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
 }";
 
             CSCodeGenerator cg = new CSCodeGenerator();
-            string output = "using OpenSim.Region.ScriptEngine.Shared; using System.Collections.Generic;\n" +
-                            "namespace SecondLife { " +
-                            "public class Script : OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass {\n" +
-                            "public Script() { } " +
-                            cg.Convert(input) +
-                            "} }\n";
+            string output = cg.Convert(input);
+
+            output = Compiler.CreateCSCompilerScript(output, "script1", typeof(ScriptBaseClass).FullName, null);         
+//            System.Console.WriteLine(output);
+
             Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> positionMap = cg.PositionMap;
 
             m_compilerResults = m_CSCodeProvider.CompileAssemblyFromSource(m_compilerParameters, output);
-
-            Assert.AreEqual(new KeyValuePair<int, int>(5, 21),
-                            positionMap[new KeyValuePair<int, int>(m_compilerResults.Errors[0].Line, m_compilerResults.Errors[0].Column)]);
+//
+//            foreach (KeyValuePair<int, int> key in positionMap.Keys)
+//            {
+//                KeyValuePair<int, int> val = positionMap[key];
+//
+//                System.Console.WriteLine("{0},{1} => {2},{3}", key.Key, key.Value, val.Key, val.Value);
+//            }
+//
+//            foreach (CompilerError compErr in m_compilerResults.Errors)
+//            {
+//                System.Console.WriteLine("Error: {0},{1} => {2}", compErr.Line, compErr.Column, compErr);
+//            }
+
+            Assert.AreEqual(
+                new KeyValuePair<int, int>(5, 21),
+                positionMap[new KeyValuePair<int, int>(m_compilerResults.Errors[0].Line, m_compilerResults.Errors[0].Column)]);
         }
 
         /// <summary>
         /// Test that a string can be cast to string and another string
         /// concatenated.
         /// </summary>
-        //[Test]
+        [Test]
         public void TestCastAndConcatString()
         {
             TestHelpers.InMethod();
@@ -143,15 +157,20 @@ default
     }
 }";
 
+//            System.Console.WriteLine(input);
             CSCodeGenerator cg = new CSCodeGenerator();
-            string output = "using OpenSim.Region.ScriptEngine.Shared; using System.Collections.Generic;\n" +
-                            "namespace SecondLife { " +
-                            "public class Script : OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass {\n" +
-                            "public Script() { } " +
-                            cg.Convert(input) +
-                            "} }\n";
+            string output = cg.Convert(input);
+
+            output = Compiler.CreateCSCompilerScript(output, "script1", typeof(ScriptBaseClass).FullName, null);
+//            System.Console.WriteLine(output);
+
             m_compilerResults = m_CSCodeProvider.CompileAssemblyFromSource(m_compilerParameters, output);
 
+//            foreach (CompilerError compErr in m_compilerResults.Errors)
+//            {
+//                System.Console.WriteLine("Error: {0}", compErr);
+//            }
+
             Assert.AreEqual(0, m_compilerResults.Errors.Count);
         }
     }