diff options
author | Melanie Thielker | 2008-09-23 20:20:40 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-09-23 20:20:40 +0000 |
commit | bbb962f64efd7fe0eafd3c4c9ffb77fcaf003fd9 (patch) | |
tree | 1aba127a8114b5a93e50e39cf24b83ba8a69ced7 /OpenSim/Region/ScriptEngine/DotNetEngine/Compiler | |
parent | Remove some debug output (diff) | |
download | opensim-SC-bbb962f64efd7fe0eafd3c4c9ffb77fcaf003fd9.zip opensim-SC-bbb962f64efd7fe0eafd3c4c9ffb77fcaf003fd9.tar.gz opensim-SC-bbb962f64efd7fe0eafd3c4c9ffb77fcaf003fd9.tar.bz2 opensim-SC-bbb962f64efd7fe0eafd3c4c9ffb77fcaf003fd9.tar.xz |
Refactor BuiltIn_Commands_BaseClass to ScriptBaseClass to ease the later
code merging and transition to Shared/
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/Compiler')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/README.TXT | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs index 803fdb1..b50e823 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs | |||
@@ -334,7 +334,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
334 | compileScript = String.Empty + | 334 | compileScript = String.Empty + |
335 | "import OpenSim.Region.ScriptEngine.Common; import OpenSim.Region.ScriptEngine.Shared; import System.Collections.Generic;\r\n" + | 335 | "import OpenSim.Region.ScriptEngine.Common; import OpenSim.Region.ScriptEngine.Shared; import System.Collections.Generic;\r\n" + |
336 | "package SecondLife {\r\n" + | 336 | "package SecondLife {\r\n" + |
337 | "class Script extends OpenSim.Region.ScriptEngine.Common.BuiltIn_Commands_BaseClass { \r\n" + | 337 | "class Script extends OpenSim.Region.ScriptEngine.Common.ScriptBaseClass { \r\n" + |
338 | compileScript + | 338 | compileScript + |
339 | "} }\r\n"; | 339 | "} }\r\n"; |
340 | return compileScript; | 340 | return compileScript; |
@@ -345,7 +345,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
345 | compileScript = String.Empty + | 345 | compileScript = String.Empty + |
346 | "using OpenSim.Region.ScriptEngine.Common; using OpenSim.Region.ScriptEngine.Shared; using System.Collections.Generic;\r\n" + | 346 | "using OpenSim.Region.ScriptEngine.Common; using OpenSim.Region.ScriptEngine.Shared; using System.Collections.Generic;\r\n" + |
347 | String.Empty + "namespace SecondLife { " + | 347 | String.Empty + "namespace SecondLife { " + |
348 | String.Empty + "public class Script : OpenSim.Region.ScriptEngine.Common.BuiltIn_Commands_BaseClass { \r\n" + | 348 | String.Empty + "public class Script : OpenSim.Region.ScriptEngine.Common.ScriptBaseClass { \r\n" + |
349 | @"public Script() { } " + | 349 | @"public Script() { } " + |
350 | compileScript + | 350 | compileScript + |
351 | "} }\r\n"; | 351 | "} }\r\n"; |
@@ -358,7 +358,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
358 | "using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog; " + | 358 | "using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog; " + |
359 | "using OpenSim.Region.ScriptEngine.Common; using OpenSim.Region.ScriptEngine.Shared; using System.Collections.Generic;\r\n" + | 359 | "using OpenSim.Region.ScriptEngine.Common; using OpenSim.Region.ScriptEngine.Shared; using System.Collections.Generic;\r\n" + |
360 | String.Empty + "namespace SecondLife { " + | 360 | String.Empty + "namespace SecondLife { " + |
361 | String.Empty + "public class Script : OpenSim.Region.ScriptEngine.Common.BuiltIn_Commands_BaseClass { \r\n" + | 361 | String.Empty + "public class Script : OpenSim.Region.ScriptEngine.Common.ScriptBaseClass { \r\n" + |
362 | //@"public Script() { } " + | 362 | //@"public Script() { } " + |
363 | @"static OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP YP=null; " + | 363 | @"static OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP YP=null; " + |
364 | @"public Script() { YP= new OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP(); } "+ | 364 | @"public Script() { YP= new OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP(); } "+ |
@@ -373,7 +373,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
373 | compileScript = String.Empty + | 373 | compileScript = String.Empty + |
374 | "Imports OpenSim.Region.ScriptEngine.Common: Imports OpenSim.Region.ScriptEngine.Shared: Imports System.Collections.Generic: " + | 374 | "Imports OpenSim.Region.ScriptEngine.Common: Imports OpenSim.Region.ScriptEngine.Shared: Imports System.Collections.Generic: " + |
375 | String.Empty + "NameSpace SecondLife:" + | 375 | String.Empty + "NameSpace SecondLife:" + |
376 | String.Empty + "Public Class Script: Inherits OpenSim.Region.ScriptEngine.Common.BuiltIn_Commands_BaseClass: " + | 376 | String.Empty + "Public Class Script: Inherits OpenSim.Region.ScriptEngine.Common.ScriptBaseClass: " + |
377 | "\r\nPublic Sub New()\r\nEnd Sub: " + | 377 | "\r\nPublic Sub New()\r\nEnd Sub: " + |
378 | compileScript + | 378 | compileScript + |
379 | ":End Class :End Namespace\r\n"; | 379 | ":End Class :End Namespace\r\n"; |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/README.TXT b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/README.TXT index 5e0863f..3c11938 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/README.TXT +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/README.TXT | |||
@@ -268,7 +268,7 @@ PrologCallback sayit(object ans) | |||
268 | Generated CS Code | 268 | Generated CS Code |
269 | =================================== | 269 | =================================== |
270 | using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog;using OpenSim.Region.ScriptEngine.Common; using System.Collections.Generic; | 270 | using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog;using OpenSim.Region.ScriptEngine.Common; using System.Collections.Generic; |
271 | namespace SecondLife { public class Script : OpenSim.Region.ScriptEngine.Common.BuiltIn_Commands_BaseClass { | 271 | namespace SecondLife { public class Script : OpenSim.Region.ScriptEngine.Common.ScriptBaseClass { |
272 | static OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP YP=null;public Script() { YP= new OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP(); } | 272 | static OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP YP=null;public Script() { YP= new OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP(); } |
273 | //cs | 273 | //cs |
274 | public void default_event_touch_start(int N ) | 274 | public void default_event_touch_start(int N ) |
@@ -411,7 +411,7 @@ Generated CS Code | |||
411 | =================================== | 411 | =================================== |
412 | 412 | ||
413 | using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog; using OpenSim.Region.ScriptEngine.Common; using System.Collections.Generic; | 413 | using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog; using OpenSim.Region.ScriptEngine.Common; using System.Collections.Generic; |
414 | namespace SecondLife { public class Script : OpenSim.Region.ScriptEngine.Common.BuiltIn_Commands_BaseClass { | 414 | namespace SecondLife { public class Script : OpenSim.Region.ScriptEngine.Common.ScriptBaseClass { |
415 | static OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP YP=null; public Script() { YP= new OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP(); } | 415 | static OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP YP=null; public Script() { YP= new OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP(); } |
416 | //cs | 416 | //cs |
417 | 417 | ||