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

* Resolves comment removal in string literals in the LSL2CSConverter

0.6.0-stable
Teravus Ovares 2008-05-28 01:47:33 +00:00
parent efeba85662
commit fb1c7e62d2
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
View File

@ -42,7 +42,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
// c Style // c Style
private Regex cstylecomments = new Regex(@"/\*(.|[\r\n])*?\*/", RegexOptions.Compiled | RegexOptions.Multiline); private Regex cstylecomments = new Regex(@"/\*(.|[\r\n])*?\*/", RegexOptions.Compiled | RegexOptions.Multiline);
// c# one liners // c# one liners
private Regex conelinecomments = new Regex(@".?([\/]{2}[^\n]*)|([\n]{1,}[\/]{2}[^\n]*)", RegexOptions.Compiled | RegexOptions.Multiline); private Regex nonCommentFwsl = new Regex("\"[a-zA-Z0-9.,:/ ]+//[^\"]+(" + @"[\\" + "\"]+)?[\"](\\s+)?;", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
private Regex conelinecomments = new Regex(@"[^:].?([\/]{2}[^\n]*)|([\n]{1,}[\/]{2}[^\n]*)", RegexOptions.Compiled | RegexOptions.Multiline);
// ([^\"])((?:[a-zA-Z])\.[a-zA-Z].?)([^\"]) // ([^\"])((?:[a-zA-Z])\.[a-zA-Z].?)([^\"])
// value we're looking for: (?:[a-zA-Z])\.[a-zA-Z] // value we're looking for: (?:[a-zA-Z])\.[a-zA-Z]
@ -87,7 +88,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
bool last_was_escape = false; bool last_was_escape = false;
int quote_replaced_count = 0; int quote_replaced_count = 0;
string removecomments = conelinecomments.Replace(Script, ""); string removefwnoncomments = nonCommentFwsl.Replace(Script, "\"\";");
string removecomments = conelinecomments.Replace(removefwnoncomments, "");
removecomments = cstylecomments.Replace(removecomments, ""); removecomments = cstylecomments.Replace(removecomments, "");
string[] localscript = removecomments.Split('"'); string[] localscript = removecomments.Split('"');
string checkscript = String.Empty; string checkscript = String.Empty;
@ -95,19 +98,21 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
for (int p = 0; p < localscript.Length; p++) for (int p = 0; p < localscript.Length; p++)
{ {
if (localscript[p].Length >= 1) //if (localscript[p].Length >= 1)
{ //{
if (localscript[p].Substring(localscript[p].Length - 1, 1) != @"\") if (!localscript[p].EndsWith(@"\"))
{ {
flip = !flip; flip = !flip;
//System.Console.WriteLine("Flip:" + flip.ToString() + " - " + localscript[p] + " ! " + localscript[p].EndsWith(@"\").ToString());
} }
} //}
else //else
{ //{
flip = !flip; // flip = !flip;
} // System.Console.WriteLine("Flip:" + flip.ToString() + " - " + localscript[p]);
//}
if (!flip) if (!flip)
checkscript += "\"" + localscript[p]; checkscript += localscript[p];
} }
//System.Console.WriteLine("SCRIPT:" + checkscript); //System.Console.WriteLine("SCRIPT:" + checkscript);
@ -116,11 +121,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
// ignores alpha.x alpha.y, alpha.z for refering to vector components // ignores alpha.x alpha.y, alpha.z for refering to vector components
Match SecurityM; Match SecurityM;
// Instead of blocking all foo.bar values, block only the ones that will hit // BROKEN: this check is very wrong. It block's any url in strings.
// namespaces we don't like. To add more of these bad namespaces at them SecurityM = Regex.Match(checkscript, @"(?:[a-zA-Z])\.(?:[a-wA-Z]|[a-zA-Z][a-zA-Z])", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
// to the poison array.
String[] poison = {"System"};
SecurityM = Regex.Match(checkscript, @"(" + String.Join("|", poison) + @")\.(?:[a-wA-Z]|[a-zA-Z][a-zA-Z])", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
if (SecurityM.Success) if (SecurityM.Success)
throw new Exception("CS0103: 'The . symbol cannot be used in LSL except in float values or vector components'"); throw new Exception("CS0103: 'The . symbol cannot be used in LSL except in float values or vector components'");