From f9e2f41d7c7906db6e09d3ee4ed6f508df847344 Mon Sep 17 00:00:00 2001 From: Mike Mazur Date: Wed, 23 Jul 2008 06:53:38 +0000 Subject: Enable LSL <-> C# source location mapping when reporing compiler errors to the user in-world. This method is not yet perfect but is an improvement in accuracy over the existing method. --- .../ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs') diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs index 73894d5..e2e8d36 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs @@ -74,6 +74,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL private static LSL2CSConverter LSL_Converter = new LSL2CSConverter(); //private static CSCodeGenerator LSL_Converter = new CSCodeGenerator(); + //private static Dictionary, KeyValuePair> m_positionMap; // mapping between LSL and C# line/column numbers private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider(); private static VBCodeProvider VBcodeProvider = new VBCodeProvider(); private static JScriptCodeProvider JScodeProvider = new JScriptCodeProvider(); @@ -277,6 +278,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL // Its LSL, convert it to C# compileScript = LSL_Converter.Convert(Script); //compileScript = LSL_Converter.Convert(Script); + //m_positionMap = LSL_Converter.PositionMap; l = enumCompileType.cs; } @@ -481,6 +483,20 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL string errtext = String.Empty; foreach (CompilerError CompErr in results.Errors) { + //KeyValuePair lslPos; + + //try + //{ + // lslPos = m_positionMap[new KeyValuePair(CompErr.Line, CompErr.Column)]; + //} + //catch (KeyNotFoundException) // we don't have this line/column mapped + //{ + // lslPos = new KeyValuePair(-1, -1); + //} + + // The Second Life viewer's script editor begins + // countingn lines and columns at 0, so we subtract 1. + //errtext += String.Format("Line {0}, column {1}, Error Number: {2}, '{3}'\r\n", lslPos.Key - 1, lslPos.Value - 1, CompErr.ErrorNumber, CompErr.ErrorText); errtext += "Line number " + (CompErr.Line - LinesToRemoveOnError) + ", Error Number: " + CompErr.ErrorNumber + ", '" + CompErr.ErrorText + "'\r\n"; -- cgit v1.1