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

If rest of first line after colon is blank then still warn about running in XEngine if engine specified does not exist. 

This is to take account of situations where the user was intending to specify a script engine using colon using its default language.
This probably generates few false positive as scripts are less likely to end a first line colon with a comment for other purposes.
0.7.4.1
Justin Clark-Casey (justincc) 2012-06-28 21:30:36 +01:00
parent 25baa2d894
commit 972b0b52f9
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -780,27 +780,34 @@ namespace OpenSim.Region.ScriptEngine.XEngine
if (engine == ScriptEngineName) if (engine == ScriptEngineName)
{ {
// If we are falling back on XEngine as the default engine, then only complain to the user // If we are falling back on XEngine as the default engine, then only complain to the user
// if a script language has been explicitly set and it's one that we recognize. If it's // if a script language has been explicitly set and it's one that we recognize or there are
// no non-whitespace characters after the colon.
//
// If the script is
// explicitly not allowed or the script is not in LSL then the user will be informed by a later compiler message. // explicitly not allowed or the script is not in LSL then the user will be informed by a later compiler message.
// //
// If the colon ends the line then we'll risk the false positive as this is more likely
// to signal a real scriptengine line where the user wants to use the default compile language.
//
// This avoids the overwhelming number of false positives where we're in this code because // This avoids the overwhelming number of false positives where we're in this code because
// there's a colon in a comment in the first line of a script for entirely // there's a colon in a comment in the first line of a script for entirely
// unrelated reasons (e.g. vim settings). // unrelated reasons (e.g. vim settings).
// //
// TODO: A better fix would be to deprecate simple : detection and look for some less likely // TODO: A better fix would be to deprecate simple : detection and look for some less likely
// string to begin the comment (like #! in unix shell scripts). // string to begin the comment (like #! in unix shell scripts).
bool scriptExplicitlyInXEngineLanguage = false; bool warnRunningInXEngine = false;
string restOfScript = script.Substring(colon + 1); string restOfFirstLine = firstline.Substring(colon + 1);
// FIXME: These are hardcoded because they are currently hardcoded in Compiler.cs // FIXME: These are hardcoded because they are currently hardcoded in Compiler.cs
if (restOfScript.StartsWith("c#") if (restOfFirstLine.StartsWith("c#")
|| restOfScript.StartsWith("vb") || restOfFirstLine.StartsWith("vb")
|| restOfScript.StartsWith("lsl") || restOfFirstLine.StartsWith("lsl")
|| restOfScript.StartsWith("js") || restOfFirstLine.StartsWith("js")
|| restOfScript.StartsWith("yp")) || restOfFirstLine.StartsWith("yp")
scriptExplicitlyInXEngineLanguage = true; || restOfFirstLine.Length == 0)
warnRunningInXEngine = true;
if (scriptExplicitlyInXEngineLanguage) if (warnRunningInXEngine)
{ {
SceneObjectPart part = SceneObjectPart part =
m_Scene.GetSceneObjectPart( m_Scene.GetSceneObjectPart(