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

Maintis #2078 

Thank you, ralphos, for a patch that corrects the handling of compiler
warnings in the XEngine, which were erronoeously reported as errors!
0.6.0-stable
Melanie Thielker 2008-08-29 19:57:01 +00:00
parent 9fc67f1908
commit fda5457996
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
View File

@ -543,6 +543,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
string errtext = String.Empty; string errtext = String.Empty;
foreach (CompilerError CompErr in results.Errors) foreach (CompilerError CompErr in results.Errors)
{ {
string severity = "Error";
if ( CompErr.IsWarning )
{
severity = "Warning";
}
if (m_UseCompiler) if (m_UseCompiler)
{ {
KeyValuePair<int, int> lslPos; KeyValuePair<int, int> lslPos;
@ -559,16 +565,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
// The Second Life viewer's script editor begins // The Second Life viewer's script editor begins
// countingn lines and columns at 0, so we subtract 1. // 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 += String.Format("Line {0}, column {1}, {4} Number: {2}, '{3}'\r\n", lslPos.Key - 1, lslPos.Value - 1, CompErr.ErrorNumber, CompErr.ErrorText, severity);
} }
else else
{ {
errtext += "Line number " + (CompErr.Line - LinesToRemoveOnError) + errtext += "Line number " + (CompErr.Line - LinesToRemoveOnError) +
", Error Number: " + CompErr.ErrorNumber + ", " + severity + " Number: " + CompErr.ErrorNumber +
", '" + CompErr.ErrorText + "'\r\n"; ", '" + CompErr.ErrorText + "'\r\n";
} }
} }
Console.WriteLine("[COMPILER ERROR]:" + errtext); Console.WriteLine("[COMPILER MESSAGES]: " + errtext);
if (!File.Exists(OutFile)) if (!File.Exists(OutFile))
{ {
throw new Exception(errtext); throw new Exception(errtext);