diff options
author | Melanie | 2009-12-22 09:24:01 +0000 |
---|---|---|
committer | Melanie | 2009-12-22 09:24:01 +0000 |
commit | 1876ce90af98722a205d1c7181ef66b6a2b54fc5 (patch) | |
tree | 2929090816713fac73d3567314ba8727498d02c4 /OpenSim/Region/ScriptEngine/Shared/CodeTools | |
parent | Add missing file (diff) | |
download | opensim-SC-1876ce90af98722a205d1c7181ef66b6a2b54fc5.zip opensim-SC-1876ce90af98722a205d1c7181ef66b6a2b54fc5.tar.gz opensim-SC-1876ce90af98722a205d1c7181ef66b6a2b54fc5.tar.bz2 opensim-SC-1876ce90af98722a205d1c7181ef66b6a2b54fc5.tar.xz |
FINALLY! Script compile errors now appear in the script error pane,
not in a funky debug window.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/CodeTools')
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs index e427f50..b1fb6c2 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs | |||
@@ -111,7 +111,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
111 | if (emessage.StartsWith(slinfo+": ")) | 111 | if (emessage.StartsWith(slinfo+": ")) |
112 | emessage = emessage.Substring(slinfo.Length+2); | 112 | emessage = emessage.Substring(slinfo.Length+2); |
113 | 113 | ||
114 | message = String.Format("Line ({0},{1}) {2}", | 114 | message = String.Format("({0},{1}) {2}", |
115 | e.slInfo.lineNumber - 2, | 115 | e.slInfo.lineNumber - 2, |
116 | e.slInfo.charPosition - 1, emessage); | 116 | e.slInfo.charPosition - 1, emessage); |
117 | 117 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index 3080c71..d8c0ba5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | |||
@@ -623,7 +623,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
623 | 623 | ||
624 | // The Second Life viewer's script editor begins | 624 | // The Second Life viewer's script editor begins |
625 | // countingn lines and columns at 0, so we subtract 1. | 625 | // countingn lines and columns at 0, so we subtract 1. |
626 | errtext += String.Format("Line ({0},{1}): {4} {2}: {3}\n", | 626 | errtext += String.Format("({0},{1}): {4} {2}: {3}\n", |
627 | lslPos.Key - 1, lslPos.Value - 1, | 627 | lslPos.Key - 1, lslPos.Value - 1, |
628 | CompErr.ErrorNumber, text, severity); | 628 | CompErr.ErrorNumber, text, severity); |
629 | hadErrors = true; | 629 | hadErrors = true; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs index 3ca7f7c..63afb0b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs | |||
@@ -1673,7 +1673,7 @@ default | |||
1673 | { | 1673 | { |
1674 | // The syntax error is on line 6, char 5 (expected ';', found | 1674 | // The syntax error is on line 6, char 5 (expected ';', found |
1675 | // '}'). | 1675 | // '}'). |
1676 | Assert.AreEqual("Line (4,4) syntax error", e.Message); | 1676 | Assert.AreEqual("(4,4) syntax error", e.Message); |
1677 | throw; | 1677 | throw; |
1678 | } | 1678 | } |
1679 | } | 1679 | } |
@@ -1698,7 +1698,7 @@ default | |||
1698 | catch (System.Exception e) | 1698 | catch (System.Exception e) |
1699 | { | 1699 | { |
1700 | // The syntax error is on line 5, char 14 (Syntax error) | 1700 | // The syntax error is on line 5, char 14 (Syntax error) |
1701 | Assert.AreEqual("Line (3,13) syntax error", e.Message); | 1701 | Assert.AreEqual("(3,13) syntax error", e.Message); |
1702 | 1702 | ||
1703 | throw; | 1703 | throw; |
1704 | } | 1704 | } |