ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Formatting cleanup, minor refactoring. Fixed some comparisons of value types and null.

Browse Source
This commit is contained in:
Jeff Ames
2008-05-18 23:06:50 +00:00
parent 901e97f821
commit 6ec680918b
14 changed files with 93 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,13 +39,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
//private Regex rnw = new Regex(@"[a-zA-Z0-9_\-]", RegexOptions.Compiled);
private Dictionary<string, string> dataTypes = new Dictionary<string, string>();
private Dictionary<string, string> quotes = new Dictionary<string, string>();
// c Style
// c Style
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);
// ([^\"])((?:[a-zA-Z])\.[a-zA-Z].?)([^\"])
// value we're looking for: (?:[a-zA-Z])\.[a-zA-Z]
public LSL2CSConverter()
@@ -89,16 +87,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
bool last_was_escape = false;
int quote_replaced_count = 0;
string removecomments = conelinecomments.Replace(Script, "");
removecomments = cstylecomments.Replace(removecomments, "");
string[] localscript = removecomments.Split('"');
string checkscript = String.Empty;
bool flip = true;
for (int p = 0; p < localscript.Length; p++)
{
if (localscript[p].Length >= 1)
@@ -115,7 +109,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
if (!flip)
checkscript += "\"" + localscript[p];
}
//System.Console.WriteLine("SCRIPT:" + checkscript);
// checks for alpha.alpha way of referring to objects in C#
@@ -132,9 +126,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
if (SecurityM.Success)
throw new Exception("CS0103: 'The object.GetType method isn't allowed in LSL'");
for (int p = 0; p < Script.Length; p++)
{
C = Script.Substring(p, 1);

21
OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs
View File

@@ -45,27 +45,25 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer
ChannelServices.RegisterChannel(chan, true);
}
/// <summary>
/// Create a channel for communicating w/ the remote object
/// Notice no port is specified on the client
/// </summary>
public ScriptServerInterfaces.ServerRemotingObject Connect(string hostname, int port)
{
// Create a channel for communicating w/ the remote object
// Notice no port is specified on the client
ScriptServerInterfaces.ServerRemotingObject obj = null;
try
{
// Create an instance of the remote object
ScriptServerInterfaces.ServerRemotingObject obj = (ScriptServerInterfaces.ServerRemotingObject)Activator.GetObject(
obj = (ScriptServerInterfaces.ServerRemotingObject)Activator.GetObject(
typeof(ScriptServerInterfaces.ServerRemotingObject),
"tcp://" + hostname + ":" + port + "/DotNetEngine");
// Use the object
if (obj.Equals(null))
if (obj == null)
{
Console.WriteLine("Error: unable to locate server");
}
else
{
return obj;
}
}
catch (SocketException)
{
@@ -75,7 +73,8 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer
{
Console.WriteLine("Error: unable to connect to server");
}
return null;
return obj;
}
}
}