OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Same VB.Net patch done right.

ThreadPoolClientBranch
Tedd Hansen 2008-02-07 15:36:58 +00:00
parent c997cc97bb
commit ba846e62ef
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
View File

@ -54,6 +54,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
vb = 2, vb = 2,
js = 3 js = 3
} }
/// <summary>
/// This contains number of lines WE use for header when compiling script. User will get error in line x-LinesToRemoveOnError when error occurs.
/// </summary>
public int LinesToRemoveOnError = 2;
private enumCompileType DefaultCompileLanguage; private enumCompileType DefaultCompileLanguage;
private bool WriteScriptSourceToDebugFile; private bool WriteScriptSourceToDebugFile;
private bool CompileWithDebugInformation; private bool CompileWithDebugInformation;
@ -273,14 +278,14 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
String.Empty + "public class Script : OpenSim.Region.ScriptEngine.Common.LSL_BaseClass { " + String.Empty + "public class Script : OpenSim.Region.ScriptEngine.Common.LSL_BaseClass { " +
@"public Script() { } " + @"public Script() { } " +
compileScript + compileScript +
"} }\r\n"; "} }\r\n\r\n";
break; break;
case enumCompileType.vb: case enumCompileType.vb:
// "Public Sub New()\nEnd Sub: " +
compileScript = String.Empty + compileScript = String.Empty +
"Imports OpenSim.Region.ScriptEngine.Common: Imports System.Collections.Generic: " + "Imports OpenSim.Region.ScriptEngine.Common: Imports System.Collections.Generic: " +
String.Empty + "NameSpace SecondLife:" + String.Empty + "NameSpace SecondLife:" +
String.Empty + "Public Class Script: Inherits OpenSim.Region.ScriptEngine.Common.LSL_BaseClass: " + String.Empty + "Public Class Script: Inherits OpenSim.Region.ScriptEngine.Common.LSL_BaseClass: " +
"Public Sub New()\r\nEnd Sub: " +
compileScript + compileScript +
":End Class :End Namespace\r\n"; ":End Class :End Namespace\r\n";
break; break;
@ -291,7 +296,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
"class Script : OpenSim.Region.ScriptEngine.Common.LSL_BaseClass { " + "class Script : OpenSim.Region.ScriptEngine.Common.LSL_BaseClass { " +
@"public Script() { } " + @"public Script() { } " +
compileScript + compileScript +
"} }\r\n"; "} }\r\n\r\n";
break; break;
} }
return CompileFromCSorVBText(compileScript, l); return CompileFromCSorVBText(compileScript, l);
@ -393,7 +398,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
string errtext = String.Empty; string errtext = String.Empty;
foreach (CompilerError CompErr in results.Errors) foreach (CompilerError CompErr in results.Errors)
{ {
errtext += "Line number " + (CompErr.Line - 1) + errtext += "Line number " + (CompErr.Line - LinesToRemoveOnError) +
", Error Number: " + CompErr.ErrorNumber + ", Error Number: " + CompErr.ErrorNumber +
", '" + CompErr.ErrorText + "'\r\n"; ", '" + CompErr.ErrorText + "'\r\n";
} }