From 6ef9d4da901a346c232458317cca6268da888e2e Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Mon, 18 Aug 2008 00:39:10 +0000 Subject: Formatting cleanup. --- OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | 2 -- OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSConverter.cs | 6 +++--- OpenSim/Region/ScriptEngine/Shared/CodeTools/YP2CSConverter.cs | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region/ScriptEngine/Shared/CodeTools') diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index 4962023..db90f3e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs @@ -412,8 +412,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools private static string CreateYPCompilerScript(string compileScript) { - - compileScript = String.Empty + "using OpenSim.Region.ScriptEngine.Shared.YieldProlog; " + "using OpenSim.Region.ScriptEngine.Shared; using System.Collections.Generic;\r\n" + diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSConverter.cs index 57e8776..45f92e3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSConverter.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSConverter.cs @@ -87,9 +87,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools string quote = String.Empty; bool last_was_escape = false; int quote_replaced_count = 0; - + string removefwnoncomments = nonCommentFwsl.Replace(Script, "\"\";"); - + string removecomments = conelinecomments.Replace(removefwnoncomments, ""); removecomments = cstylecomments.Replace(removecomments, ""); string[] localscript = removecomments.Split('"'); @@ -120,7 +120,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools // checks for alpha.alpha way of referring to objects in C# // ignores alpha.x alpha.y, alpha.z for refering to vector components Match SecurityM; - + // BROKEN: this check is very wrong. It block's any url in strings. SecurityM = Regex.Match(checkscript, @"(?:[a-zA-Z])\.(?:[a-rt-wA-Z]|[a-zA-Z][a-zA-Z])", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/YP2CSConverter.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/YP2CSConverter.cs index 831b918..22b3742 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/YP2CSConverter.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/YP2CSConverter.cs @@ -61,7 +61,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools myCode = myCode.Substring(0, cs_pointer); } myCode.Replace("//yp", "%YPCode"); - + StringWriter myCS_SW = new StringWriter(); StringReader myCode_SR = new StringReader(" yp_nop_header_nop. \n "+myCode + "\n"); -- cgit v1.1