diff options
| author | Johan Berntsson | 2008-07-10 05:40:45 +0000 |
|---|---|---|
| committer | Johan Berntsson | 2008-07-10 05:40:45 +0000 |
| commit | d41c1f40a8abfb466741d2ccec55e21f11e6b63f (patch) | |
| tree | 77cdcb06001ce5f4106b1f09a1a8ba2fb73a60c4 /OpenSim/Region/ScriptEngine | |
| parent | Mantis#1707. Thank you, Melanie for a patch that: (diff) | |
| download | opensim-SC-d41c1f40a8abfb466741d2ccec55e21f11e6b63f.zip opensim-SC-d41c1f40a8abfb466741d2ccec55e21f11e6b63f.tar.gz opensim-SC-d41c1f40a8abfb466741d2ccec55e21f11e6b63f.tar.bz2 opensim-SC-d41c1f40a8abfb466741d2ccec55e21f11e6b63f.tar.xz | |
Patch from Mike: errors from the LSL/C# compilers are now reported to the user in-world
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/CSCodeGenerator.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/CSCodeGenerator.cs index ec34a7b..f7aee66 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/CSCodeGenerator.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/CSCodeGenerator.cs | |||
| @@ -43,7 +43,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
| 43 | /// <param name="script">String containing LSL source.</param> | 43 | /// <param name="script">String containing LSL source.</param> |
| 44 | public CSCodeGenerator(string script) | 44 | public CSCodeGenerator(string script) |
| 45 | { | 45 | { |
| 46 | Parser p = new LSLSyntax(); | 46 | Parser p = new LSLSyntax(new yyLSLSyntax(), new ErrorHandler(true)); |
| 47 | // Obviously this needs to be in a try/except block. | 47 | // Obviously this needs to be in a try/except block. |
| 48 | LSL2CSCodeTransformer codeTransformer = new LSL2CSCodeTransformer(p.Parse(script)); | 48 | LSL2CSCodeTransformer codeTransformer = new LSL2CSCodeTransformer(p.Parse(script)); |
| 49 | m_astRoot = codeTransformer.Transform(); | 49 | m_astRoot = codeTransformer.Transform(); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs index 78c636e..82c7eda 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs | |||
| @@ -43,7 +43,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
| 43 | /// <param name="script">String containing LSL source.</param> | 43 | /// <param name="script">String containing LSL source.</param> |
| 44 | public CSCodeGenerator(string script) | 44 | public CSCodeGenerator(string script) |
| 45 | { | 45 | { |
| 46 | Parser p = new LSLSyntax(); | 46 | Parser p = new LSLSyntax(new yyLSLSyntax(), new ErrorHandler(true)); |
| 47 | // Obviously this needs to be in a try/except block. | 47 | // Obviously this needs to be in a try/except block. |
| 48 | LSL2CSCodeTransformer codeTransformer = new LSL2CSCodeTransformer(p.Parse(script)); | 48 | LSL2CSCodeTransformer codeTransformer = new LSL2CSCodeTransformer(p.Parse(script)); |
| 49 | m_astRoot = codeTransformer.Transform(); | 49 | m_astRoot = codeTransformer.Transform(); |