From b16abc8166c29585cb76cc55c3bdd76e5833cb4f Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Thu, 5 Jan 2017 19:07:37 +0000 Subject: Massive tab and trailing space cleanup --- .../Api/Implementation/AsyncCommandManager.cs | 44 +- .../Shared/Api/Implementation/LSL_Api.cs | 118 +- .../Shared/Api/Implementation/LS_Api.cs | 2 +- .../Shared/Api/Implementation/MOD_Api.cs | 74 +- .../Shared/Api/Implementation/OSSL_Api.cs | 106 +- .../Api/Implementation/Plugins/SensorRepeat.cs | 14 +- .../Shared/Api/Implementation/Plugins/Timer.cs | 2 +- .../Api/Implementation/Properties/AssemblyInfo.cs | 8 +- .../ScriptEngine/Shared/Api/Interface/IMOD_Api.cs | 2 +- .../ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 8 +- .../Shared/Api/Runtime/LSL_Constants.cs | 2 +- .../ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | 4 +- .../ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 14 +- .../Shared/Api/Runtime/Properties/AssemblyInfo.cs | 8 +- .../Shared/CodeTools/CSCodeGenerator.cs | 26 +- .../Shared/CodeTools/CSReservedWords.cs | 2 +- .../ScriptEngine/Shared/CodeTools/Compiler.cs | 76 +- .../Shared/CodeTools/Properties/AssemblyInfo.cs | 8 +- .../Shared/CodeTools/Tests/CompilerTest.cs | 6 +- .../Shared/CodeTools/Tests/LSL_EventTests.cs | 24 +- .../ScriptEngine/Shared/CodeTools/lsl.lexer.cs | 6 +- .../ScriptEngine/Shared/CodeTools/lsl.parser.cs | 1710 ++++++++++---------- OpenSim/Region/ScriptEngine/Shared/Helpers.cs | 10 +- .../Shared/Instance/Properties/AssemblyInfo.cs | 8 +- .../ScriptEngine/Shared/Instance/ScriptInstance.cs | 50 +- .../Shared/Instance/Tests/CoopTerminationTests.cs | 76 +- OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 10 +- .../ScriptEngine/Shared/Properties/AssemblyInfo.cs | 8 +- .../ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs | 6 +- .../Shared/Tests/LSL_ApiInventoryTests.cs | 8 +- .../Shared/Tests/LSL_ApiLinkingTests.cs | 4 +- .../ScriptEngine/Shared/Tests/LSL_ApiListTests.cs | 4 +- .../Shared/Tests/LSL_ApiNotecardTests.cs | 8 +- .../Shared/Tests/LSL_ApiObjectTests.cs | 28 +- .../ScriptEngine/Shared/Tests/LSL_ApiTest.cs | 10 +- .../Shared/Tests/LSL_TypesTestLSLFloat.cs | 2 +- .../Shared/Tests/LSL_TypesTestLSLInteger.cs | 2 +- .../Shared/Tests/LSL_TypesTestLSLString.cs | 2 +- .../ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs | 4 +- 39 files changed, 1252 insertions(+), 1252 deletions(-) (limited to 'OpenSim/Region/ScriptEngine/Shared') diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs index 84d44a1..6a39bb9 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs @@ -81,64 +81,64 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public Dataserver DataserverPlugin { - get - { + get + { lock (staticLock) - return m_Dataserver[m_ScriptEngine]; + return m_Dataserver[m_ScriptEngine]; } } public Timer TimerPlugin { - get - { + get + { lock (staticLock) - return m_Timer[m_ScriptEngine]; + return m_Timer[m_ScriptEngine]; } } public HttpRequest HttpRequestPlugin { - get - { + get + { lock (staticLock) - return m_HttpRequest[m_ScriptEngine]; + return m_HttpRequest[m_ScriptEngine]; } } public Listener ListenerPlugin { - get - { + get + { lock (staticLock) - return m_Listener[m_ScriptEngine]; + return m_Listener[m_ScriptEngine]; } } public SensorRepeat SensorRepeatPlugin { - get - { + get + { lock (staticLock) - return m_SensorRepeat[m_ScriptEngine]; + return m_SensorRepeat[m_ScriptEngine]; } } public XmlRequest XmlRequestPlugin { - get - { + get + { lock (staticLock) - return m_XmlRequest[m_ScriptEngine]; + return m_XmlRequest[m_ScriptEngine]; } } public IScriptEngine[] ScriptEngines { - get - { + get + { lock (staticLock) - return m_ScriptEngines.ToArray(); + return m_ScriptEngines.ToArray(); } } @@ -387,7 +387,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } } - + public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID) { diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 5269bf9..8f9ff03 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -100,7 +100,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api protected IScriptEngine m_ScriptEngine; protected SceneObjectPart m_host; - + /// /// The item that hosts this script /// @@ -298,7 +298,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host = host; m_item = item; m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false); - + LoadConfig(); m_TransferModule = @@ -400,7 +400,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } IConfig smtpConfig = seConfigSource.Configs["SMTP"]; - if (smtpConfig != null) + if (smtpConfig != null) { // there's an smtp config, so load in the snooze time. EMAIL_PAUSE_TIME = smtpConfig.GetInt("email_pause_time", EMAIL_PAUSE_TIME); @@ -666,7 +666,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api case ScriptBaseClass.LINK_SET: return new List(part.ParentGroup.Parts); - case ScriptBaseClass.LINK_ROOT: + case ScriptBaseClass.LINK_ROOT: ret.Add(part.ParentGroup.RootPart); return ret; @@ -807,8 +807,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); lock (Util.RandomClass) { - return Util.RandomClass.NextDouble() * mag; - } + return Util.RandomClass.NextDouble() * mag; + } } public LSL_Integer llFloor(double f) @@ -1097,7 +1097,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); /* This method is more accurate than the SL one, and thus causes problems for scripts that deal with the SL inaccuracy around 180-degrees -.- .._. - + double dotProduct = LSL_Vector.Dot(a, b); LSL_Vector crossProduct = LSL_Vector.Cross(a, b); double magProduct = LSL_Vector.Mag(a) * LSL_Vector.Mag(b); @@ -1115,12 +1115,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return new LSL_Rotation((float)x, (float)y, (float)z, (float)w); */ - + // This method mimics the 180 errors found in SL // See www.euclideanspace.com... angleBetween LSL_Vector vec_a = a; LSL_Vector vec_b = b; - + // Eliminate zero length LSL_Float vec_a_mag = LSL_Vector.Mag(vec_a); LSL_Float vec_b_mag = LSL_Vector.Mag(vec_b); @@ -1129,7 +1129,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); } - + // Normalize vec_a = llVecNorm(vec_a); vec_b = llVecNorm(vec_b); @@ -1137,13 +1137,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // Calculate axis and rotation angle LSL_Vector axis = vec_a % vec_b; LSL_Float cos_theta = vec_a * vec_b; - + // Check if parallel if (cos_theta > 0.99999) { return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); } - + // Check if anti-parallel else if (cos_theta < -0.99999) { @@ -1164,7 +1164,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return new LSL_Rotation(x,y,z,s); } } - + public void llWhisper(int channelID, string text) { m_host.AddScriptLPS(1); @@ -1261,7 +1261,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { World.SimChat(Utils.StringToBytes(text), ChatTypeEnum.Shout, channelID, m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, true); - + } IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface(); @@ -1830,7 +1830,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.AddScriptLPS(1); SceneObjectGroup group = m_host.ParentGroup; - + if (group == null || group.IsDeleted || group.inTransit) return 1.0f; @@ -1841,7 +1841,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.AddScriptLPS(1); SceneObjectGroup group = m_host.ParentGroup; - + if (group == null || group.IsDeleted || group.inTransit) return 1.0f; @@ -1970,7 +1970,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api string userAgent = m_UrlModule.GetHttpHeader(new UUID(id), "user-agent"); if (userAgent.IndexOf("SecondLife") < 0) return; // Not the embedded browser. Is this check good enough? - + // Use the IP address of the client and check against the request // seperate logins from the same IP will allow all of them to get non-text/plain as long // as the owner is in the region. Same as SL! @@ -2030,7 +2030,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_UrlModule.HttpContentType(new UUID(id),type); } } -*/ +*/ public void SetTexGen(SceneObjectPart part, int face,int style) { if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) @@ -2774,7 +2774,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void llSetRot(LSL_Rotation rot) { m_host.AddScriptLPS(1); - + // try to let this work as in SL... if (m_host.ParentID == 0 || (m_host.ParentGroup != null && m_host == m_host.ParentGroup.RootPart)) { @@ -2960,7 +2960,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); m_host.SetVelocity(new Vector3((float)vel.x, (float)vel.y, (float)vel.z), local != 0); } - + public void llSetAngularVelocity(LSL_Vector avel, int local) { m_host.AddScriptLPS(1); @@ -3129,7 +3129,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_SoundModule.SendSound( m_host.UUID, - ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, sound, AssetType.Sound), + ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, sound, AssetType.Sound), volume, false, 0, 0, false, false); } @@ -3602,7 +3602,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // LSL_Vector up = new LSL_Vector(0.0, 0.0, 1.0); // find normalized left axis parallel to horizon // LSL_Vector left = llVecNorm(LSL_Vector.Cross(up, dir)); - + LSL_Vector left = new LSL_Vector(-dir.y, dir.x, 0.0f); left = llVecNorm(left); // make up orthogonal to left and dir @@ -3851,7 +3851,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api ScriptSleep(2000); return; } - + // We may be able to use ClientView.SendInstantMessage here, but we need a client instance. // InstantMessageModule.OnInstantMessage searches through a list of scenes for a client matching the toAgent, // but I don't think we have a list of scenes available from here. @@ -3864,7 +3864,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api UUID friendTransactionID = UUID.Random(); //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID); - + GridInstantMessage msg = new GridInstantMessage(); msg.fromAgentID = new Guid(m_host.OwnerID.ToString()); // fromAgentID.Guid; msg.toAgentID = new Guid(user); // toAgentID.Guid; @@ -4217,7 +4217,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } ScenePresence presence = World.GetScenePresence(agentID); - + if (presence != null) { // If permissions are being requested from an NPC and were not implicitly granted above then @@ -4285,7 +4285,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.TaskInventory.LockItemsForWrite(true); m_host.TaskInventory[m_item.ItemID].PermsMask = answer; m_host.TaskInventory.LockItemsForWrite(false); - + m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams( "run_time_permissions", new Object[] { new LSL_Integer(answer) }, @@ -4363,7 +4363,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api UUID targetID; if (!UUID.TryParse(target, out targetID)) - return; + return; SceneObjectPart targetPart = World.GetSceneObjectPart((UUID)targetID); if (targetPart == null) @@ -4493,7 +4493,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } } finally { } - + newRoot.ParentGroup.HasGroupChanged = true; newRoot.ParentGroup.ScheduleGroupForFullUpdate(); } @@ -4515,7 +4515,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); TaskInventoryItem item = m_item; - + if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 && !m_automaticLinkPermission) { @@ -4634,7 +4634,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api count = count + 1; } } - + m_host.TaskInventory.LockItemsForRead(false); return count; } @@ -4729,7 +4729,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (agentItem == null) { - llSay(0, message); + llSay(0, message); return; } @@ -4758,7 +4758,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (m_TransferModule != null) m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); } - + //This delay should only occur when giving inventory to avatars. ScriptSleep(m_sleepMsOnGiveInventory); } @@ -5064,7 +5064,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // Can't TP sitting avatars if (presence.ParentID != 0) // Sitting return; - + if (m_item.PermsGranter == agentId) { // If attached using llAttachToAvatarTemp, cowardly refuse @@ -5190,7 +5190,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api string movementAnimation = presence.Animator.CurrentMovementAnimation; string lslMovementAnimation; - + if (MovementAnimationsForLSL.TryGetValue(movementAnimation, out lslMovementAnimation)) return lslMovementAnimation; } @@ -5531,7 +5531,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api rot.Normalize(); double angle = 2 * Math.Acos(rot.s); - if (angle > Math.PI) + if (angle > Math.PI) angle = 2 * Math.PI - angle; return angle; @@ -6916,10 +6916,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api SceneObjectPart part = World.GetSceneObjectPart(uuid); if (part != null) { - + if(part.ParentGroup.IsAttachment) { - uuid = part.ParentGroup.AttachedAvatar; + uuid = part.ParentGroup.AttachedAvatar; } else { @@ -10266,7 +10266,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } break; - case ScriptBaseClass.PRIM_ROTATION: + case ScriptBaseClass.PRIM_ROTATION: if (remain < 1) return new LSL_List(); @@ -10329,7 +10329,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api catch (InvalidCastException e) { Error( - originFunc, + originFunc, string.Format("Error running rule #{0}: arg #{1} - ", rulesParsed, idx - idxStart) + e.Message); } @@ -10433,7 +10433,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } while (str2.EndsWith("=")) str2 = str2.Substring(0, str2.Length - 1); - + byte[] d1 = new byte[str1.Length]; byte[] d2 = new byte[str2.Length]; @@ -10638,7 +10638,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api Vector3 box = presence.Appearance.AvatarBoxSize * 0.5f; - if (presence.Animator.Animations.ImplicitDefaultAnimation.AnimID + if (presence.Animator.Animations.ImplicitDefaultAnimation.AnimID == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) /* { @@ -10803,7 +10803,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api List parts; List avatars; - + LSL_List res = new LSL_List(); LSL_List remaining = new LSL_List(); @@ -12887,7 +12887,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return; } } - + ScenePresence avatar = World.GetScenePresence(detectedParams.Key); if (avatar != null) { @@ -13239,7 +13239,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api byte[] d2 = new Byte[data1.Length]; int pos = 0; - + if (data1.Length <= data2.Length) { Array.Copy(data2, 0, d2, 0, data1.Length); @@ -13636,7 +13636,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api LSL_List ret = new LSL_List(); UUID key = new UUID(); - + if (UUID.TryParse(id, out key)) { @@ -13824,7 +13824,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api case ScriptBaseClass.OBJECT_NAME: ret.Add(new LSL_String(obj.Name)); break; - case ScriptBaseClass.OBJECT_DESC: + case ScriptBaseClass.OBJECT_DESC: ret.Add(new LSL_String(obj.Description)); break; case ScriptBaseClass.OBJECT_POS: @@ -13865,7 +13865,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } else { - vel = obj.Velocity; + vel = obj.Velocity; } ret.Add(vel); @@ -14263,8 +14263,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api ossl.CheckThreatLevel(ThreatLevel.High, "print"); m_log.Info("LSL print():" + str); } - } - + } + public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link) { List parts = GetLinkParts(link); @@ -14488,7 +14488,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { // get work copies float sx = rayStart.X; - float ex = rayEnd.X; + float ex = rayEnd.X; float sy = rayStart.Y; float ey = rayEnd.Y; @@ -14497,7 +14497,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // region size info float rsx = World.RegionInfo.RegionSizeX; - + float tmp; // region bounds @@ -14513,7 +14513,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api sy += dy * dx; sx = 0; } - else if(sx >= rsx) + else if(sx >= rsx) { if(ex >= rsx) // totally outside return null; @@ -14537,7 +14537,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api sx += dy * dx; sy = 0; } - else if(sy >= rsy) + else if(sy >= rsy) { if(dy >= 0) // out and going away return null; @@ -14875,7 +14875,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { return a.Depth.CompareTo(b.Depth); }); - + int values = 0; SceneObjectGroup thisgrp = m_host.ParentGroup; @@ -14931,7 +14931,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api list.Add(new LSL_Integer(values)); return list; } - + /// /// Implementation of llCastRay similar to SL 2015-04-21. @@ -15076,7 +15076,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api isNonphysical = !isPhysical; isPhantom = ((part.Flags & PrimFlags.Phantom) != 0) || (part.VolumeDetectActive); - + if (isPhysical && rejectPhysical) continue; if (isNonphysical && rejectNonphysical) @@ -16291,7 +16291,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api pos = sitroot.AbsolutePosition + pos * sitroot.GetWorldRotation(); } else - pos = avatar.AbsolutePosition; + pos = avatar.AbsolutePosition; res.Add(new LSL_Vector(pos.X,pos.Y,pos.Z)); break; @@ -16471,7 +16471,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api res.Add(new LSL_String("")); break; - case (int)ScriptBaseClass.PRIM_ROT_LOCAL: + case (int)ScriptBaseClass.PRIM_ROT_LOCAL: Quaternion lrot = avatar.Rotation; res.Add(new LSL_Rotation(lrot.X, lrot.Y, lrot.Z, lrot.W)); break; @@ -16577,7 +16577,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api presence.SetAnimationOverride("ALL", UUID.Zero); return; } - + string state = String.Empty; foreach (KeyValuePair kvp in MovementAnimationsForLSL) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs index 8cd065b..cec595d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs @@ -831,6 +831,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } return success; - } + } } } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs index 1e26036..692bec0 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs @@ -107,14 +107,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api /// Dumps an error message on the debug console. /// /// - internal void MODShoutError(string message) + internal void MODShoutError(string message) { if (message.Length > 1023) message = message.Substring(0, 1023); World.SimChat( Utils.StringToBytes(message), - ChatTypeEnum.Shout, ScriptBaseClass.DEBUG_CHANNEL, + ChatTypeEnum.Shout, ScriptBaseClass.DEBUG_CHANNEL, m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, false); IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface(); @@ -122,7 +122,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } /// - /// + /// /// /// The name of the function to invoke /// List of parameters @@ -130,9 +130,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public void modInvokeN(string fname, params object[] parms) { // m_log.DebugFormat( -// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", -// fname, -// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), +// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", +// fname, +// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), // ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); Type returntype = m_comms.LookupReturnType(fname); @@ -145,9 +145,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_String modInvokeS(string fname, params object[] parms) { // m_log.DebugFormat( -// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", -// fname, -// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), +// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", +// fname, +// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), // ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); Type returntype = m_comms.LookupReturnType(fname); @@ -161,9 +161,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Integer modInvokeI(string fname, params object[] parms) { // m_log.DebugFormat( -// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", -// fname, -// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), +// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", +// fname, +// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), // ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); Type returntype = m_comms.LookupReturnType(fname); @@ -173,13 +173,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api int result = (int)modInvoke(fname,parms); return new LSL_Integer(result); } - + public LSL_Float modInvokeF(string fname, params object[] parms) { // m_log.DebugFormat( -// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", -// fname, -// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), +// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", +// fname, +// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), // ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); Type returntype = m_comms.LookupReturnType(fname); @@ -193,9 +193,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Key modInvokeK(string fname, params object[] parms) { // m_log.DebugFormat( -// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", -// fname, -// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), +// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", +// fname, +// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), // ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); Type returntype = m_comms.LookupReturnType(fname); @@ -209,9 +209,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Vector modInvokeV(string fname, params object[] parms) { // m_log.DebugFormat( -// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", -// fname, -// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), +// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", +// fname, +// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), // ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); Type returntype = m_comms.LookupReturnType(fname); @@ -225,9 +225,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_Rotation modInvokeR(string fname, params object[] parms) { // m_log.DebugFormat( -// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", -// fname, -// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), +// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", +// fname, +// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), // ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); Type returntype = m_comms.LookupReturnType(fname); @@ -241,9 +241,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_List modInvokeL(string fname, params object[] parms) { // m_log.DebugFormat( -// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", -// fname, -// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), +// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", +// fname, +// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), // ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); Type returntype = m_comms.LookupReturnType(fname); @@ -308,22 +308,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } // m_log.DebugFormat( -// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", -// fname, -// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), +// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", +// fname, +// string.Join(",", Array.ConvertAll(parms, o => o.ToString())), // ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); Type[] signature = m_comms.LookupTypeSignature(fname); if (signature.Length != parms.Length) MODError(String.Format("wrong number of parameters to function {0}",fname)); - + object[] convertedParms = new object[parms.Length]; for (int i = 0; i < parms.Length; i++) convertedParms[i] = ConvertFromLSL(parms[i], signature[i], fname); // now call the function, the contract with the function is that it will always return // non-null but don't trust it completely - try + try { object result = m_comms.InvokeOperation(m_host.UUID, m_item.ItemID, fname, convertedParms); if (result != null) @@ -342,7 +342,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return null; } - + /// /// Send a command to functions registered on an event /// @@ -365,7 +365,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api /// protected object ConvertFromLSL(object lslparm, Type type, string fname) { - + if(lslparm.GetType() == type) return lslparm; @@ -429,7 +429,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api for (int i = 0; i < plist.Length; i++) { if (plist[i] is LSL_String) - result[i] = (string)(LSL_String)plist[i]; + result[i] = (string)(LSL_String)plist[i]; else if (plist[i] is LSL_Integer) result[i] = (int)(LSL_Integer)plist[i]; // The int check exists because of the many plain old int script constants in ScriptBase which @@ -451,7 +451,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return result; } } - + MODError(String.Format("{0}: parameter type mismatch; expecting {1}, type(parm)={2}", fname, type.Name, lslparm.GetType())); return null; } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index ba5a46d..066f6a4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -142,7 +142,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api internal float m_ScriptDelayFactor = 1.0f; internal float m_ScriptDistanceFactor = 1.0f; internal bool m_debuggerSafe = false; - internal Dictionary m_FunctionPerms = new Dictionary(); + internal Dictionary m_FunctionPerms = new Dictionary(); protected IUrlModule m_UrlModule = null; public void Initialize( @@ -418,7 +418,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api //Only gods may use the function if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("GOD")) { - if (World.Permissions.IsGod(ownerID)) + if (World.Permissions.IsGod(ownerID)) { return String.Empty; } @@ -427,7 +427,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api //Only grid gods may use the function if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("GRID_GOD")) { - if (World.Permissions.IsGridGod(ownerID)) + if (World.Permissions.IsGridGod(ownerID)) { return String.Empty; } @@ -856,11 +856,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // { // We will launch the teleport on a new thread so that when the script threads are terminated - // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting. + // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting. Util.FireAndForget( o => World.RequestTeleportLocation( presence.ControllingClient, regionName, position, - lookat, (uint)TPFlags.ViaLocation), + lookat, (uint)TPFlags.ViaLocation), null, "OSSL_Api.TeleportAgentByRegionCoords"); ScriptSleep(5000); @@ -906,8 +906,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting. Util.FireAndForget( o => World.RequestTeleportLocation( - presence.ControllingClient, regionHandle, - position, lookat, (uint)TPFlags.ViaLocation), + presence.ControllingClient, regionHandle, + position, lookat, (uint)TPFlags.ViaLocation), null, "OSSL_Api.TeleportAgentByRegionName"); ScriptSleep(5000); @@ -972,13 +972,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); UUID targetID = new UUID(target); - - ForceSit(avatar, targetID); + + ForceSit(avatar, targetID); } public void ForceSit(string avatar, UUID targetID) { - UUID agentID; + UUID agentID; if (!UUID.TryParse(avatar, out agentID)) return; @@ -1015,7 +1015,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api ScenePresence target = (ScenePresence)World.Entities[avatarID]; return target.ControllingClient.RemoteEndPoint.Address.ToString(); } - + // fall through case, just return nothing return ""; } @@ -1058,7 +1058,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api ScenePresence target = null; if ((World.Entities[avatarID] is ScenePresence)) target = (ScenePresence)World.Entities[avatarID]; - + if (target == null) return; @@ -1115,8 +1115,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api else animID = UUID.Zero; } - - + + if (animID == UUID.Zero) target.Animator.RemoveAnimation(animation); else @@ -1257,7 +1257,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public string osSetPenColor(string drawList, string color) { CheckThreatLevel(ThreatLevel.None, "osSetPenColor"); - + m_host.AddScriptLPS(1); drawList += "PenColor " + color + "; "; return drawList; @@ -1780,7 +1780,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } return result; } - + private ArrayList osdToArray(OSDArray list) { ArrayList result = new ArrayList(); @@ -1834,7 +1834,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); Object decoded = osParseJSONNew(JSON); - + if ( decoded is Hashtable ) { return (Hashtable) decoded; } else if ( decoded is ArrayList ) { @@ -1902,7 +1902,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { // CheckThreatLevel(ThreatLevel.VeryHigh, "osDie"); // if this is restricted to objects rezzed by this host level can be reduced - + CheckThreatLevel(ThreatLevel.Low, "osDie"); m_host.AddScriptLPS(1); @@ -1931,7 +1931,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (sceneOG.OwnerID != m_host.OwnerID) return; - + // harakiri check if(sceneOG.UUID == m_host.ParentGroup.UUID) throw new SelfDeleteException(); @@ -2042,16 +2042,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (assetID != UUID.Zero) { StringBuilder notecardData = new StringBuilder(); - + for (int count = 0; count < NotecardCache.GetLines(assetID); count++) { string line = NotecardCache.GetLine(assetID, count) + "\n"; - + // m_log.DebugFormat("[OSSL]: From notecard {0} loading line {1}", notecardNameOrUuid, line); - + notecardData.Append(line); } - + return notecardData.ToString(); } @@ -2086,7 +2086,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (a == null) { - // Whoops, it's still possible here that the notecard name was properly + // Whoops, it's still possible here that the notecard name was properly // formatted like a UUID but isn't an asset UUID so lets look it up by name after all assetID = SearchTaskInventoryForAssetId(notecardNameOrUuid); if (assetID == UUID.Zero) @@ -2291,7 +2291,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } } } - + return ""; } @@ -2429,7 +2429,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); IConfigSource config = m_ScriptEngine.ConfigSource; - string HomeURI = Util.GetConfigVarFromSections(config, "HomeURI", + string HomeURI = Util.GetConfigVarFromSections(config, "HomeURI", new string[] { "Startup", "Hypergrid" }, String.Empty); if (!string.IsNullOrEmpty(HomeURI)) @@ -2705,12 +2705,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { CheckThreatLevel(ThreatLevel.High, "osNpcCreate"); m_host.AddScriptLPS(1); - + // have to get the npc module also here to set the default Not Owned INPCModule module = World.RequestModuleInterface(); if(module == null) return new LSL_Key(UUID.Zero.ToString()); - + bool owned = (module.NPCOptionFlags & NPCOptionsFlags.AllowNotOwned) == 0; return NpcCreate(firstname, lastname, position, notecard, owned, false, false); @@ -2795,7 +2795,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api groupTitle = "- NPC -"; } } - + if((createFlags & NPCOptionsFlags.AllowCloneOtherAvatars) != 0) { UUID id; @@ -2973,7 +2973,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (!module.CheckPermissions(npcId, m_host.OwnerID)) return; - + module.MoveToTarget(npcId, World, pos, false, true, false); } } @@ -3202,7 +3202,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (!module.CheckPermissions(npcId, m_host.OwnerID)) return; - module.DeleteNPC(npcId, World); + module.DeleteNPC(npcId, World); } } catch { } @@ -3259,7 +3259,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { CheckThreatLevel(ThreatLevel.High, "osNpcTouch"); m_host.AddScriptLPS(1); - + INPCModule module = World.RequestModuleInterface(); int linkNum = link_num.value; if (module != null || (linkNum < 0 && linkNum != ScriptBaseClass.LINK_THIS)) @@ -3400,7 +3400,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api bool isMale = vpShapeMale > 0.5f; return new LSL_String(isMale ? "male" : "female"); } - + /// /// Get current region's map texture UUID /// @@ -3441,7 +3441,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return key.ToString(); } - + /// /// Return information regarding various simulator statistics (sim fps, physics fps, time /// dilation, total number of prims, total number of active scripts, script lps, various @@ -3455,7 +3455,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); LSL_List ret = new LSL_List(); float[] stats = World.StatsReporter.LastReportedSimStats; - + for (int i = 0; i < 21; i++) { ret.Add(new LSL_Float(stats[i])); @@ -3488,7 +3488,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return (int)pws; } - + public void osSetSpeed(string UUID, LSL_Float SpeedModifier) { CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed"); @@ -3498,7 +3498,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (avatar != null) avatar.SpeedModifier = (float)SpeedModifier; } - + public void osKickAvatar(string FirstName, string SurName, string alert) { CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar"); @@ -3528,7 +3528,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (presence != null) health = presence.Health; return health; } - + public void osCauseDamage(string avatar, double damage) { CheckThreatLevel(ThreatLevel.High, "osCauseDamage"); @@ -3537,7 +3537,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api UUID avatarId = new UUID(avatar); Vector3 pos = m_host.GetWorldPosition(); - ScenePresence presence = World.GetScenePresence(avatarId); + ScenePresence presence = World.GetScenePresence(avatarId); if (presence != null) { LandData land = World.GetLandData(pos); @@ -3556,7 +3556,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } } } - + public void osCauseHealing(string avatar, double healing) { CheckThreatLevel(ThreatLevel.High, "osCauseHealing"); @@ -3625,7 +3625,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api CheckThreatLevel(ThreatLevel.High, "osGetPrimitiveParams"); m_host.AddScriptLPS(1); InitLSL(); - + return m_LSL_Api.GetPrimitiveParamsEx(prim, rules); } @@ -3634,12 +3634,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api CheckThreatLevel(ThreatLevel.High, "osSetPrimitiveParams"); m_host.AddScriptLPS(1); InitLSL(); - + m_LSL_Api.SetPrimitiveParamsEx(prim, rules, "osSetPrimitiveParams"); } - + /// - /// Set parameters for light projection in host prim + /// Set parameters for light projection in host prim /// public void osSetProjectionParams(bool projection, LSL_Key texture, double fov, double focus, double amb) { @@ -3723,7 +3723,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api /// Get the description from an inventory item /// /// - /// Item description + /// Item description public LSL_String osGetInventoryDesc(string item) { m_host.AddScriptLPS(1); @@ -3921,7 +3921,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (item.InvType != (int)InventoryType.Object) { // FIXME: Temporary null check for regression tests since they dont' have the infrastructure to set - // up the api reference. + // up the api reference. if (m_LSL_Api != null) ((LSL_Api)m_LSL_Api).llSay(0, string.Format("Unable to attach, item '{0}' is not an object.", itemName)); @@ -4002,10 +4002,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api UUID targetUUID; if(!UUID.TryParse(avatar.ToString(), out targetUUID)) return; - + if(targetUUID == UUID.Zero) return; - + ScenePresence target; if(!World.TryGetScenePresence(targetUUID, out target)) return; @@ -4068,7 +4068,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return; } - bool optionObjCreator = (options & + bool optionObjCreator = (options & ScriptBaseClass.OS_ATTACH_MSG_OBJECT_CREATOR) != 0; bool optionScriptCreator = (options & ScriptBaseClass.OS_ATTACH_MSG_SCRIPT_CREATOR) != 0; @@ -4316,7 +4316,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { CheckThreatLevel(ThreatLevel.Moderate, "osRequestSecureURL"); m_host.AddScriptLPS(1); - + Hashtable opts = new Hashtable(); for (int i = 0 ; i < options.Length ; i++) { @@ -4334,7 +4334,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { CheckThreatLevel(ThreatLevel.Moderate, "osRequestSecureURL"); m_host.AddScriptLPS(1); - + Hashtable opts = new Hashtable(); for (int i = 0 ; i < options.Length ; i++) { @@ -4362,7 +4362,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.CollisionSoundType = 0; // full return to default sounds else m_host.CollisionSoundType = 2; // default sounds with volume - m_host.aggregateScriptEvents(); + m_host.aggregateScriptEvents(); return; } // TODO: Parameter check logic required. @@ -4376,7 +4376,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api else m_host.CollisionSoundType = -1; - m_host.aggregateScriptEvents(); + m_host.aggregateScriptEvents(); } // still not very usefull, detector is lost on rez, restarts, etc diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs index 7bfe27b..d401ed8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs @@ -351,7 +351,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins // your head but the sensor will stay with your (global) // avatar rotation and position. // Position of a sensor in a child prim attached to an avatar - // will be still wrong. + // will be still wrong. ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar); // Don't proceed if the avatar for this attachment has since been removed from the scene. @@ -473,7 +473,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins SceneObjectPart SensePoint = ts.host; Vector3 fromRegionPos = SensePoint.GetWorldPosition(); - + Quaternion q = SensePoint.GetWorldRotation(); if (SensePoint.ParentGroup.IsAttachment) { @@ -486,7 +486,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins // your head but the sensor will stay with your (global) // avatar rotation and position. // Position of a sensor in a child prim attached to an avatar - // will be still wrong. + // will be still wrong. ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar); // Don't proceed if the avatar for this attachment has since been removed from the scene. @@ -502,7 +502,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins bool attached = (SensePoint.ParentGroup.AttachmentPoint != 0); Vector3 toRegionPos; double dis; - + Action senseEntity = new Action(presence => { // m_log.DebugFormat( @@ -542,7 +542,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins if (presence.IsDeleted || presence.IsChildAgent || presence.GodLevel > 0.0) return; - + // if the object the script is in is attached and the avatar is the owner // then this one is not wanted if (attached && presence.UUID == SensePoint.OwnerID) @@ -700,7 +700,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins DateTime.Now.ToUniversalTime().AddSeconds(ts.interval); AddSenseRepeater(ts); - + idx += 6; } } @@ -716,6 +716,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins } return retList; - } + } } } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs index 5b1fdc0..cae1c14 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs @@ -200,6 +200,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins } return retList; - } + } } } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs index 16805e4..e6676b4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("OpenSim.Region.ScriptEngine.Shared.Api")] @@ -14,8 +14,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] @@ -25,7 +25,7 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IMOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IMOD_Api.cs index aa78aaa..7c518f3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IMOD_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IMOD_Api.cs @@ -49,7 +49,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces LSL_Vector modInvokeV(string fname, params object[] parms); LSL_Rotation modInvokeR(string fname, params object[] parms); LSL_List modInvokeL(string fname, params object[] parms); - + //Module functions string modSendCommand(string modules, string command, string k); } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 7415fea..bee060a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs @@ -54,7 +54,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces NoAccess = -1, /// - /// Function is no threat at all. It doesn't constitute a threat to + /// Function is no threat at all. It doesn't constitute a threat to /// either users or the system and has no known side effects. /// None = 0, @@ -66,7 +66,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces Nuisance = 1, /// - /// Extreme levels of abuse of this function can cause impaired + /// Extreme levels of abuse of this function can cause impaired /// functioning of the region, or very gullible users can be tricked /// into experiencing harmless effects. /// @@ -81,7 +81,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces /// /// Intentional abuse can cause denial of service and crashes with - /// potential of data or state loss; or trusting users can be tricked + /// potential of data or state loss; or trusting users can be tricked /// into embarrassing or uncomfortable situations. /// Moderate = 4, @@ -145,7 +145,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces // Avatar Info Commands string osGetAgentIP(string agent); LSL_List osGetAgents(); - + // Teleport commands void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs index 903b362..3a90c77 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs @@ -746,7 +746,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase public const int FRICTION = 2; public const int RESTITUTION = 4; public const int GRAVITY_MULTIPLIER = 8; - + // extra constants for llSetPrimMediaParams public static readonly LSLInteger LSL_STATUS_OK = new LSLInteger(0); public static readonly LSLInteger LSL_STATUS_MALFORMED_PARAMS = new LSLInteger(1000); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index 9d36341..1a42c3a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs @@ -1580,7 +1580,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase m_LSL_Functions.llSetVelocity(force, local); } - + public void llSetAngularVelocity(LSL_Vector force, int local) { m_LSL_Functions.llSetAngularVelocity(force, local); @@ -1995,7 +1995,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase { return m_LSL_Functions.llXorBase64StringsCorrect(str1, str2); } - + public LSL_List llGetPrimMediaParams(int face, LSL_List rules) { return m_LSL_Functions.llGetPrimMediaParams(face, rules); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index c34ccd0..6164734 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs @@ -539,7 +539,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase { return m_OSSL_Functions.osReplaceString(src,pattern,replace,count,start); } - + // Information about data loaded into the region public string osLoadedCreationDate() @@ -914,7 +914,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase { return m_OSSL_Functions.osGetRegionMapTexture(regionName); } - + public LSL_List osGetRegionStats() { return m_OSSL_Functions.osGetRegionStats(); @@ -934,12 +934,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase { return m_OSSL_Functions.osGetSimulatorMemory(); } - + public void osKickAvatar(string FirstName,string SurName,string alert) { m_OSSL_Functions.osKickAvatar(FirstName, SurName, alert); } - + public void osSetSpeed(string UUID, LSL_Float SpeedModifier) { m_OSSL_Functions.osSetSpeed(UUID, SpeedModifier); @@ -954,7 +954,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase { m_OSSL_Functions.osCauseDamage(avatar, damage); } - + public void osCauseHealing(string avatar, double healing) { m_OSSL_Functions.osCauseHealing(avatar, healing); @@ -984,12 +984,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase { m_OSSL_Functions.osForceOtherSit(avatar, target); } - + public LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules) { return m_OSSL_Functions.osGetPrimitiveParams(prim, rules); } - + public void osSetPrimitiveParams(LSL_Key prim, LSL_List rules) { m_OSSL_Functions.osSetPrimitiveParams(prim, rules); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs index b1825ac..81020f1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("OpenSim.Region.ScriptEngine.Shared.Api.Runtime")] @@ -14,8 +14,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] @@ -25,7 +25,7 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs index bc6ce4f..031f00a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs @@ -433,9 +433,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools if (m_insertCoopTerminationChecks) { // We have to check in event functions as well because the user can manually call these. - if (previousSymbol is GlobalFunctionDefinition - || previousSymbol is WhileStatement - || previousSymbol is DoWhileStatement + if (previousSymbol is GlobalFunctionDefinition + || previousSymbol is WhileStatement + || previousSymbol is DoWhileStatement || previousSymbol is ForLoop || previousSymbol is StateEvent) GenerateIndentedLine(m_coopTerminationCheck, sb); @@ -474,8 +474,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools { // A non-braced single line do while structure cannot contain multiple statements. // So to insert the termination check we change this to a braced control structure instead. - if (previousSymbol is WhileStatement - || previousSymbol is DoWhileStatement + if (previousSymbol is WhileStatement + || previousSymbol is DoWhileStatement || previousSymbol is ForLoop) { transformToBlock = true; @@ -530,7 +530,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools // This code checks for LSL of the following forms, and generates a // warning if it finds them. // - // list l = [ "foo" ]; + // list l = [ "foo" ]; // l = (l=[]) + l + ["bar"]; // (produces l=["foo","bar"] in SL but l=["bar"] in OS) // @@ -758,7 +758,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools for (int i = 0; i < fls.kids.Count; i++) { SYMBOL s = (SYMBOL)fls.kids[i]; - + // Statements surrounded by parentheses in for loops // // e.g. for ((i = 0), (j = 7); (i < 10); (++i)) @@ -774,7 +774,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools // like it would be considerably more complicated to handle). while (s is ParenthesisExpression) s = (SYMBOL)s.kids.Pop(); - + GenerateNodeToSB(fls, s, sb); if (0 < comma--) Generate(", ", sb); @@ -891,9 +891,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools else if (value is OpenMetaverse.Quaternion) retval = String.Format("new LSL_Types.Quaternion(\"{0}\")",((OpenMetaverse.Quaternion)value).ToString()); else retval = id; - + Generate(retval, s, sb); - return; + return; } } @@ -911,7 +911,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools string modinvoke = null; if (m_comms != null) modinvoke = m_comms.LookupModInvocation(fc.Id); - + if (modinvoke != null) { if (fc.kids[0] is ArgumentList) @@ -926,7 +926,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools { Generate(String.Format("{0}(", CheckName(fc.Id)), fc, sb); } - + foreach (SYMBOL kid in fc.kids) GenerateNodeToSB(fc, kid, sb); @@ -1124,7 +1124,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools { Indent(sb); sb.Append(s); - + if (null != sym) m_positionMap.Add(new KeyValuePair(m_CSharpLine, m_CSharpCol), new KeyValuePair(sym.Line, sym.Position)); diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSReservedWords.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSReservedWords.cs index 7a2a4a0..19a248f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSReservedWords.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSReservedWords.cs @@ -84,7 +84,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools if (word.StartsWith("ll")) return false; char first = word.ToCharArray(0,1)[0]; if (first >= 'A' && first <= 'Z') return false; - + return (reservedWords.BinarySearch(word) >= 0); } } diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index f632cb0..f3b8e1d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs @@ -119,7 +119,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools { in_startup = false; CheckOrCreateScriptsDirectory(); - + // First time we start? Delete old files if (DeleteScriptsOnStartup) DeleteOldFiles(); @@ -310,9 +310,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools { // m_log.DebugFormat("[Compiler]: Found existing assembly {0} for asset {1} in {2}", assembly, asset, m_scriptEngine.World.Name); - // If we have already read this linemap file, then it will be in our dictionary. + // If we have already read this linemap file, then it will be in our dictionary. // Don't build another copy of the dictionary (saves memory) and certainly - // don't keep reading the same file from disk multiple times. + // don't keep reading the same file from disk multiple times. if (!m_lineMaps.ContainsKey(assembly)) m_lineMaps[assembly] = ReadMapFile(assembly + ".map"); linemap = m_lineMaps[assembly]; @@ -366,8 +366,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools LSL_Converter = (ICodeConverter)new CSCodeGenerator(comms, m_insertCoopTerminationCalls); AddCSScriptHeader( - m_scriptEngine.ScriptClassName, - m_scriptEngine.ScriptBaseClassName, + m_scriptEngine.ScriptClassName, + m_scriptEngine.ScriptBaseClassName, m_scriptEngine.ScriptBaseClassParameters, sb); @@ -381,20 +381,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools } linemap = ((CSCodeGenerator)LSL_Converter).PositionMap; - // Write the linemap to a file and save it in our dictionary for next time. + // Write the linemap to a file and save it in our dictionary for next time. m_lineMaps[assembly] = linemap; WriteMapFile(assembly + ".map", linemap); LSL_Converter.Clear(); } else - { + { switch (language) { case enumCompileType.cs: compileScript = CreateCSCompilerScript( - compileScript, - m_scriptEngine.ScriptClassName, - m_scriptEngine.ScriptBaseClassName, + compileScript, + m_scriptEngine.ScriptClassName, + m_scriptEngine.ScriptBaseClassName, m_scriptEngine.ScriptBaseClassParameters); break; case enumCompileType.vb: @@ -434,22 +434,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools public static void AddCSScriptHeader(string className, string baseClassName, ParameterInfo[] constructorParameters, StringBuilder sb) { sb.Append(string.Format( -@"using OpenSim.Region.ScriptEngine.Shared; +@"using OpenSim.Region.ScriptEngine.Shared; using System.Collections.Generic; -namespace SecondLife -{{ - public class {0} : {1} +namespace SecondLife +{{ + public class {0} : {1} {{ public {0}({2}) : base({3}) {{}} ", className, - baseClassName, - constructorParameters != null - ? string.Join(", ", Array.ConvertAll(constructorParameters, pi => pi.ToString())) - : "", - constructorParameters != null - ? string.Join(", ", Array.ConvertAll(constructorParameters, pi => pi.Name)) + baseClassName, + constructorParameters != null + ? string.Join(", ", Array.ConvertAll(constructorParameters, pi => pi.ToString())) + : "", + constructorParameters != null + ? string.Join(", ", Array.ConvertAll(constructorParameters, pi => pi.Name)) : "" )); } @@ -462,26 +462,26 @@ namespace SecondLife public static string CreateCSCompilerScript( string compileScript, string className, string baseClassName, ParameterInfo[] constructorParameters) { - compileScript = string.Format( -@"using OpenSim.Region.ScriptEngine.Shared; + compileScript = string.Format( +@"using OpenSim.Region.ScriptEngine.Shared; using System.Collections.Generic; -namespace SecondLife -{{ - public class {0} : {1} +namespace SecondLife +{{ + public class {0} : {1} {{ public {0}({2}) : base({3}) {{}} {4} }} }}", className, - baseClassName, - constructorParameters != null - ? string.Join(", ", Array.ConvertAll(constructorParameters, pi => pi.ToString())) - : "", - constructorParameters != null - ? string.Join(", ", Array.ConvertAll(constructorParameters, pi => pi.Name)) - : "", + baseClassName, + constructorParameters != null + ? string.Join(", ", Array.ConvertAll(constructorParameters, pi => pi.ToString())) + : "", + constructorParameters != null + ? string.Join(", ", Array.ConvertAll(constructorParameters, pi => pi.Name)) + : "", compileScript); return compileScript; @@ -508,7 +508,7 @@ namespace SecondLife internal string CompileFromDotNetText(string Script, enumCompileType lang, string asset, string assembly) { // m_log.DebugFormat("[Compiler]: Compiling to assembly\n{0}", Script); - + string ext = "." + lang.ToString(); // Output assembly name @@ -562,7 +562,7 @@ namespace SecondLife if (m_scriptEngine.ScriptReferencedAssemblies != null) Array.ForEach( - m_scriptEngine.ScriptReferencedAssemblies, + m_scriptEngine.ScriptReferencedAssemblies, a => parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, a))); parameters.GenerateExecutable = false; @@ -571,7 +571,7 @@ namespace SecondLife //parameters.WarningLevel = 1; // Should be 4? parameters.TreatWarningsAsErrors = false; parameters.GenerateInMemory = false; - + CompilerResults results; CodeDomProvider provider; @@ -605,7 +605,7 @@ namespace SecondLife // results = CScodeProvider.CompileAssemblyFromSource( // parameters, Script); // } - + results = provider.CompileAssemblyFromSource( parameters, Script); // Deal with an occasional segv in the compiler. @@ -685,14 +685,14 @@ namespace SecondLife } provider.Dispose(); - + if (hadErrors) { throw new Exception(errtext); } // On today's highly asynchronous systems, the result of - // the compile may not be immediately apparent. Wait a + // the compile may not be immediately apparent. Wait a // reasonable amount of time before giving up on it. if (!File.Exists(assembly)) diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs index 7966f59..304cd81 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("OpenSim.Region.ScriptEngine.Shared.CodeTools")] @@ -14,8 +14,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] @@ -25,7 +25,7 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs index ad4ccf0..12ba4de 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs @@ -81,7 +81,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests m_resolveEventHandler = new ResolveEventHandler(AssemblyResolver.OnAssemblyResolve); System.AppDomain.CurrentDomain.AssemblyResolve += m_resolveEventHandler; - + m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.dll")); m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.Api.Runtime.dll")); m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenMetaverseTypes.dll")); @@ -112,7 +112,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests CSCodeGenerator cg = new CSCodeGenerator(); string output = cg.Convert(input); - output = Compiler.CreateCSCompilerScript(output, "script1", typeof(ScriptBaseClass).FullName, null); + output = Compiler.CreateCSCompilerScript(output, "script1", typeof(ScriptBaseClass).FullName, null); // System.Console.WriteLine(output); positionMap = cg.PositionMap; @@ -154,7 +154,7 @@ erros position is better tested on viewers @l; i = 1; } -}", out positionMap); +}", out positionMap); Assert.AreEqual( new KeyValuePair(7, 9), diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs index 67ce10a..220ec72 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs @@ -150,7 +150,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests // TestHelpers.EnableLogging(); TestIntArgEvent("changed"); - } + } [Test] public void TestCollisionEvent() @@ -159,7 +159,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests // TestHelpers.EnableLogging(); TestIntArgEvent("collision"); - } + } [Test] public void TestCollisionStartEvent() @@ -168,7 +168,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests // TestHelpers.EnableLogging(); TestIntArgEvent("collision_start"); - } + } [Test] public void TestCollisionEndEvent() @@ -177,7 +177,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests // TestHelpers.EnableLogging(); TestIntArgEvent("collision_end"); - } + } [Test] public void TestOnRezEvent() @@ -186,7 +186,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests // TestHelpers.EnableLogging(); TestIntArgEvent("on_rez"); - } + } [Test] public void TestRunTimePermissionsEvent() @@ -195,7 +195,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests // TestHelpers.EnableLogging(); TestIntArgEvent("run_time_permissions"); - } + } [Test] public void TestSensorEvent() @@ -204,7 +204,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests // TestHelpers.EnableLogging(); TestIntArgEvent("sensor"); - } + } [Test] public void TestTouchEvent() @@ -213,7 +213,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests // TestHelpers.EnableLogging(); TestIntArgEvent("touch"); - } + } [Test] public void TestTouchStartEvent() @@ -222,7 +222,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests // TestHelpers.EnableLogging(); TestIntArgEvent("touch_start"); - } + } [Test] public void TestTouchEndEvent() @@ -231,7 +231,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests // TestHelpers.EnableLogging(); TestIntArgEvent("touch_end"); - } + } [Test] public void TestLandCollisionEvent() @@ -351,8 +351,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests } Assert.That( - gotException, - Is.EqualTo(expectException), + gotException, + Is.EqualTo(expectException), "Failed on {0}, exception {1}", script, ge != null ? ge.ToString() : "n/a"); } } diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs index f87f446..66210b7 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs @@ -379,7 +379,7 @@ public override int yynum { get { return 96; }} public FLOAT_CONSTANT(Lexer yyl):base(yyl) {}} //%|LSLTokens public class yyLSLTokens : YyLexer { - public yyLSLTokens(ErrorHandler eh):base(eh) { arr = new int[] { + public yyLSLTokens(ErrorHandler eh):base(eh) { arr = new int[] { 101,4,6,52,0, 46,0,53,0,6, 102,4,16,117,0, @@ -19717,13 +19717,13 @@ public override TOKEN OldAction(Lexer yym,ref string yytext,int action, ref bool break; case 1063: ; break; - case 1076: ; + case 1076: ; break; case 1032: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); } break; case 1067: ; break; - case 1072: ; + case 1072: ; break; case 1003: { ((LSLTokens)yym).str += "\\\""; } break; diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs index 5fef83c..e4b5891 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs @@ -886,1493 +886,1493 @@ public IncrementDecrementExpression(Parser yyp):base(yyp){}} public class LSLProgramRoot_1 : LSLProgramRoot { public LSLProgramRoot_1(Parser yyq):base(yyq, - ((GlobalDefinitions)(yyq.StackAt(1).m_value)) - , - ((States)(yyq.StackAt(0).m_value)) - ){}} + ((GlobalDefinitions)(yyq.StackAt(1).m_value)) + , + ((States)(yyq.StackAt(0).m_value)) + ){}} public class LSLProgramRoot_2 : LSLProgramRoot { public LSLProgramRoot_2(Parser yyq):base(yyq, - ((States)(yyq.StackAt(0).m_value)) - ){}} + ((States)(yyq.StackAt(0).m_value)) + ){}} public class GlobalDefinitions_1 : GlobalDefinitions { public GlobalDefinitions_1(Parser yyq):base(yyq, - ((GlobalVariableDeclaration)(yyq.StackAt(0).m_value)) - ){}} + ((GlobalVariableDeclaration)(yyq.StackAt(0).m_value)) + ){}} public class GlobalDefinitions_2 : GlobalDefinitions { public GlobalDefinitions_2(Parser yyq):base(yyq, - ((GlobalDefinitions)(yyq.StackAt(1).m_value)) - , - ((GlobalVariableDeclaration)(yyq.StackAt(0).m_value)) - ){}} + ((GlobalDefinitions)(yyq.StackAt(1).m_value)) + , + ((GlobalVariableDeclaration)(yyq.StackAt(0).m_value)) + ){}} public class GlobalDefinitions_3 : GlobalDefinitions { public GlobalDefinitions_3(Parser yyq):base(yyq, - ((GlobalFunctionDefinition)(yyq.StackAt(0).m_value)) - ){}} + ((GlobalFunctionDefinition)(yyq.StackAt(0).m_value)) + ){}} public class GlobalDefinitions_4 : GlobalDefinitions { public GlobalDefinitions_4(Parser yyq):base(yyq, - ((GlobalDefinitions)(yyq.StackAt(1).m_value)) - , - ((GlobalFunctionDefinition)(yyq.StackAt(0).m_value)) - ){}} + ((GlobalDefinitions)(yyq.StackAt(1).m_value)) + , + ((GlobalFunctionDefinition)(yyq.StackAt(0).m_value)) + ){}} public class GlobalVariableDeclaration_1 : GlobalVariableDeclaration { public GlobalVariableDeclaration_1(Parser yyq):base(yyq, - ((Declaration)(yyq.StackAt(1).m_value)) - ){}} + ((Declaration)(yyq.StackAt(1).m_value)) + ){}} public class GlobalVariableDeclaration_2 : GlobalVariableDeclaration { public GlobalVariableDeclaration_2(Parser yyq):base(yyq,new Assignment(((LSLSyntax -)yyq), - ((Declaration)(yyq.StackAt(3).m_value)) - , - ((Expression)(yyq.StackAt(1).m_value)) - , - ((EQUALS)(yyq.StackAt(2).m_value)) - .yytext)){}} +)yyq), + ((Declaration)(yyq.StackAt(3).m_value)) + , + ((Expression)(yyq.StackAt(1).m_value)) + , + ((EQUALS)(yyq.StackAt(2).m_value)) + .yytext)){}} public class GlobalFunctionDefinition_1 : GlobalFunctionDefinition { - public GlobalFunctionDefinition_1(Parser yyq):base(yyq,"void", - ((IDENT)(yyq.StackAt(4).m_value)) - .yytext, - ((ArgumentDeclarationList)(yyq.StackAt(2).m_value)) - , - ((CompoundStatement)(yyq.StackAt(0).m_value)) - ){}} + public GlobalFunctionDefinition_1(Parser yyq):base(yyq,"void", + ((IDENT)(yyq.StackAt(4).m_value)) + .yytext, + ((ArgumentDeclarationList)(yyq.StackAt(2).m_value)) + , + ((CompoundStatement)(yyq.StackAt(0).m_value)) + ){}} public class GlobalFunctionDefinition_2 : GlobalFunctionDefinition { public GlobalFunctionDefinition_2(Parser yyq):base(yyq, - ((Typename)(yyq.StackAt(5).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(4).m_value)) - .yytext, - ((ArgumentDeclarationList)(yyq.StackAt(2).m_value)) - , - ((CompoundStatement)(yyq.StackAt(0).m_value)) - ){}} + ((Typename)(yyq.StackAt(5).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(4).m_value)) + .yytext, + ((ArgumentDeclarationList)(yyq.StackAt(2).m_value)) + , + ((CompoundStatement)(yyq.StackAt(0).m_value)) + ){}} public class States_1 : States { public States_1(Parser yyq):base(yyq, - ((State)(yyq.StackAt(0).m_value)) - ){}} + ((State)(yyq.StackAt(0).m_value)) + ){}} public class States_2 : States { public States_2(Parser yyq):base(yyq, - ((States)(yyq.StackAt(1).m_value)) - , - ((State)(yyq.StackAt(0).m_value)) - ){}} + ((States)(yyq.StackAt(1).m_value)) + , + ((State)(yyq.StackAt(0).m_value)) + ){}} public class State_1 : State { public State_1(Parser yyq):base(yyq, - ((DEFAULT_STATE)(yyq.StackAt(3).m_value)) - .yytext, - ((StateBody)(yyq.StackAt(1).m_value)) - ){}} + ((DEFAULT_STATE)(yyq.StackAt(3).m_value)) + .yytext, + ((StateBody)(yyq.StackAt(1).m_value)) + ){}} public class State_2 : State { public State_2(Parser yyq):base(yyq, - ((IDENT)(yyq.StackAt(3).m_value)) - .yytext, - ((StateBody)(yyq.StackAt(1).m_value)) - ){}} + ((IDENT)(yyq.StackAt(3).m_value)) + .yytext, + ((StateBody)(yyq.StackAt(1).m_value)) + ){}} public class StateBody_1 : StateBody { public StateBody_1(Parser yyq):base(yyq, - ((StateEvent)(yyq.StackAt(0).m_value)) - ){}} + ((StateEvent)(yyq.StackAt(0).m_value)) + ){}} public class StateBody_2 : StateBody { public StateBody_2(Parser yyq):base(yyq, - ((StateBody)(yyq.StackAt(1).m_value)) - , - ((StateEvent)(yyq.StackAt(0).m_value)) - ){}} + ((StateBody)(yyq.StackAt(1).m_value)) + , + ((StateEvent)(yyq.StackAt(0).m_value)) + ){}} public class StateBody_3 : StateBody { public StateBody_3(Parser yyq):base(yyq, - ((VoidArgStateEvent)(yyq.StackAt(0).m_value)) - ){}} + ((VoidArgStateEvent)(yyq.StackAt(0).m_value)) + ){}} public class StateBody_4 : StateBody { public StateBody_4(Parser yyq):base(yyq, - ((StateBody)(yyq.StackAt(1).m_value)) - , - ((VoidArgStateEvent)(yyq.StackAt(0).m_value)) - ){}} + ((StateBody)(yyq.StackAt(1).m_value)) + , + ((VoidArgStateEvent)(yyq.StackAt(0).m_value)) + ){}} public class StateBody_5 : StateBody { public StateBody_5(Parser yyq):base(yyq, - ((KeyArgStateEvent)(yyq.StackAt(0).m_value)) - ){}} + ((KeyArgStateEvent)(yyq.StackAt(0).m_value)) + ){}} public class StateBody_6 : StateBody { public StateBody_6(Parser yyq):base(yyq, - ((StateBody)(yyq.StackAt(1).m_value)) - , - ((KeyArgStateEvent)(yyq.StackAt(0).m_value)) - ){}} + ((StateBody)(yyq.StackAt(1).m_value)) + , + ((KeyArgStateEvent)(yyq.StackAt(0).m_value)) + ){}} public class StateBody_7 : StateBody { public StateBody_7(Parser yyq):base(yyq, - ((IntArgStateEvent)(yyq.StackAt(0).m_value)) - ){}} + ((IntArgStateEvent)(yyq.StackAt(0).m_value)) + ){}} public class StateBody_8 : StateBody { public StateBody_8(Parser yyq):base(yyq, - ((StateBody)(yyq.StackAt(1).m_value)) - , - ((IntArgStateEvent)(yyq.StackAt(0).m_value)) - ){}} + ((StateBody)(yyq.StackAt(1).m_value)) + , + ((IntArgStateEvent)(yyq.StackAt(0).m_value)) + ){}} public class StateBody_9 : StateBody { public StateBody_9(Parser yyq):base(yyq, - ((VectorArgStateEvent)(yyq.StackAt(0).m_value)) - ){}} + ((VectorArgStateEvent)(yyq.StackAt(0).m_value)) + ){}} public class StateBody_10 : StateBody { public StateBody_10(Parser yyq):base(yyq, - ((StateBody)(yyq.StackAt(1).m_value)) - , - ((VectorArgStateEvent)(yyq.StackAt(0).m_value)) - ){}} + ((StateBody)(yyq.StackAt(1).m_value)) + , + ((VectorArgStateEvent)(yyq.StackAt(0).m_value)) + ){}} public class StateBody_11 : StateBody { public StateBody_11(Parser yyq):base(yyq, - ((IntRotRotArgStateEvent)(yyq.StackAt(0).m_value)) - ){}} + ((IntRotRotArgStateEvent)(yyq.StackAt(0).m_value)) + ){}} public class StateBody_12 : StateBody { public StateBody_12(Parser yyq):base(yyq, - ((StateBody)(yyq.StackAt(1).m_value)) - , - ((IntRotRotArgStateEvent)(yyq.StackAt(0).m_value)) - ){}} + ((StateBody)(yyq.StackAt(1).m_value)) + , + ((IntRotRotArgStateEvent)(yyq.StackAt(0).m_value)) + ){}} public class StateBody_13 : StateBody { public StateBody_13(Parser yyq):base(yyq, - ((IntVecVecArgStateEvent)(yyq.StackAt(0).m_value)) - ){}} + ((IntVecVecArgStateEvent)(yyq.StackAt(0).m_value)) + ){}} public class StateBody_14 : StateBody { public StateBody_14(Parser yyq):base(yyq, - ((StateBody)(yyq.StackAt(1).m_value)) - , - ((IntVecVecArgStateEvent)(yyq.StackAt(0).m_value)) - ){}} + ((StateBody)(yyq.StackAt(1).m_value)) + , + ((IntVecVecArgStateEvent)(yyq.StackAt(0).m_value)) + ){}} public class StateBody_15 : StateBody { public StateBody_15(Parser yyq):base(yyq, - ((KeyIntIntArgStateEvent)(yyq.StackAt(0).m_value)) - ){}} + ((KeyIntIntArgStateEvent)(yyq.StackAt(0).m_value)) + ){}} public class StateBody_16 : StateBody { public StateBody_16(Parser yyq):base(yyq, - ((StateBody)(yyq.StackAt(1).m_value)) - , - ((KeyIntIntArgStateEvent)(yyq.StackAt(0).m_value)) - ){}} + ((StateBody)(yyq.StackAt(1).m_value)) + , + ((KeyIntIntArgStateEvent)(yyq.StackAt(0).m_value)) + ){}} public class StateEvent_1 : StateEvent { public StateEvent_1(Parser yyq):base(yyq, - ((Event)(yyq.StackAt(4).m_value)) - .yytext, - ((ArgumentDeclarationList)(yyq.StackAt(2).m_value)) - , - ((CompoundStatement)(yyq.StackAt(0).m_value)) - ){}} + ((Event)(yyq.StackAt(4).m_value)) + .yytext, + ((ArgumentDeclarationList)(yyq.StackAt(2).m_value)) + , + ((CompoundStatement)(yyq.StackAt(0).m_value)) + ){}} public class VoidArgStateEvent_1 : VoidArgStateEvent { public VoidArgStateEvent_1(Parser yyq):base(yyq, - ((VoidArgEvent)(yyq.StackAt(3).m_value)) - .yytext, - ((CompoundStatement)(yyq.StackAt(0).m_value)) - ){}} + ((VoidArgEvent)(yyq.StackAt(3).m_value)) + .yytext, + ((CompoundStatement)(yyq.StackAt(0).m_value)) + ){}} public class KeyArgStateEvent_1 : KeyArgStateEvent { public KeyArgStateEvent_1(Parser yyq):base(yyq, - ((KeyArgEvent)(yyq.StackAt(4).m_value)) - .yytext, - ((KeyArgumentDeclarationList)(yyq.StackAt(2).m_value)) - , - ((CompoundStatement)(yyq.StackAt(0).m_value)) - ){}} + ((KeyArgEvent)(yyq.StackAt(4).m_value)) + .yytext, + ((KeyArgumentDeclarationList)(yyq.StackAt(2).m_value)) + , + ((CompoundStatement)(yyq.StackAt(0).m_value)) + ){}} public class IntArgStateEvent_1 : IntArgStateEvent { public IntArgStateEvent_1(Parser yyq):base(yyq, - ((IntArgEvent)(yyq.StackAt(4).m_value)) - .yytext, - ((IntArgumentDeclarationList)(yyq.StackAt(2).m_value)) - , - ((CompoundStatement)(yyq.StackAt(0).m_value)) - ){}} + ((IntArgEvent)(yyq.StackAt(4).m_value)) + .yytext, + ((IntArgumentDeclarationList)(yyq.StackAt(2).m_value)) + , + ((CompoundStatement)(yyq.StackAt(0).m_value)) + ){}} public class VectorArgStateEvent_1 : VectorArgStateEvent { public VectorArgStateEvent_1(Parser yyq):base(yyq, - ((VectorArgEvent)(yyq.StackAt(4).m_value)) - .yytext, - ((VectorArgumentDeclarationList)(yyq.StackAt(2).m_value)) - , - ((CompoundStatement)(yyq.StackAt(0).m_value)) - ){}} + ((VectorArgEvent)(yyq.StackAt(4).m_value)) + .yytext, + ((VectorArgumentDeclarationList)(yyq.StackAt(2).m_value)) + , + ((CompoundStatement)(yyq.StackAt(0).m_value)) + ){}} public class IntRotRotArgStateEvent_1 : IntRotRotArgStateEvent { public IntRotRotArgStateEvent_1(Parser yyq):base(yyq, - ((IntRotRotArgEvent)(yyq.StackAt(4).m_value)) - .yytext, - ((IntRotRotArgumentDeclarationList)(yyq.StackAt(2).m_value)) - , - ((CompoundStatement)(yyq.StackAt(0).m_value)) - ){}} + ((IntRotRotArgEvent)(yyq.StackAt(4).m_value)) + .yytext, + ((IntRotRotArgumentDeclarationList)(yyq.StackAt(2).m_value)) + , + ((CompoundStatement)(yyq.StackAt(0).m_value)) + ){}} public class IntVecVecArgStateEvent_1 : IntVecVecArgStateEvent { public IntVecVecArgStateEvent_1(Parser yyq):base(yyq, - ((IntVecVecArgEvent)(yyq.StackAt(4).m_value)) - .yytext, - ((IntVecVecArgumentDeclarationList)(yyq.StackAt(2).m_value)) - , - ((CompoundStatement)(yyq.StackAt(0).m_value)) - ){}} + ((IntVecVecArgEvent)(yyq.StackAt(4).m_value)) + .yytext, + ((IntVecVecArgumentDeclarationList)(yyq.StackAt(2).m_value)) + , + ((CompoundStatement)(yyq.StackAt(0).m_value)) + ){}} public class KeyIntIntArgStateEvent_1 : KeyIntIntArgStateEvent { public KeyIntIntArgStateEvent_1(Parser yyq):base(yyq, - ((KeyIntIntArgEvent)(yyq.StackAt(4).m_value)) - .yytext, - ((KeyIntIntArgumentDeclarationList)(yyq.StackAt(2).m_value)) - , - ((CompoundStatement)(yyq.StackAt(0).m_value)) - ){}} + ((KeyIntIntArgEvent)(yyq.StackAt(4).m_value)) + .yytext, + ((KeyIntIntArgumentDeclarationList)(yyq.StackAt(2).m_value)) + , + ((CompoundStatement)(yyq.StackAt(0).m_value)) + ){}} public class ArgumentDeclarationList_1 : ArgumentDeclarationList { public ArgumentDeclarationList_1(Parser yyq):base(yyq, - ((Declaration)(yyq.StackAt(0).m_value)) - ){}} + ((Declaration)(yyq.StackAt(0).m_value)) + ){}} public class ArgumentDeclarationList_2 : ArgumentDeclarationList { public ArgumentDeclarationList_2(Parser yyq):base(yyq, - ((ArgumentDeclarationList)(yyq.StackAt(2).m_value)) - , - ((Declaration)(yyq.StackAt(0).m_value)) - ){}} + ((ArgumentDeclarationList)(yyq.StackAt(2).m_value)) + , + ((Declaration)(yyq.StackAt(0).m_value)) + ){}} public class KeyArgumentDeclarationList_1 : KeyArgumentDeclarationList { public KeyArgumentDeclarationList_1(Parser yyq):base(yyq, - ((KeyDeclaration)(yyq.StackAt(0).m_value)) - ){}} + ((KeyDeclaration)(yyq.StackAt(0).m_value)) + ){}} public class IntArgumentDeclarationList_1 : IntArgumentDeclarationList { public IntArgumentDeclarationList_1(Parser yyq):base(yyq, - ((IntDeclaration)(yyq.StackAt(0).m_value)) - ){}} + ((IntDeclaration)(yyq.StackAt(0).m_value)) + ){}} public class VectorArgumentDeclarationList_1 : VectorArgumentDeclarationList { public VectorArgumentDeclarationList_1(Parser yyq):base(yyq, - ((VecDeclaration)(yyq.StackAt(0).m_value)) - ){}} + ((VecDeclaration)(yyq.StackAt(0).m_value)) + ){}} public class IntRotRotArgumentDeclarationList_1 : IntRotRotArgumentDeclarationList { public IntRotRotArgumentDeclarationList_1(Parser yyq):base(yyq, - ((IntDeclaration)(yyq.StackAt(4).m_value)) - , - ((RotDeclaration)(yyq.StackAt(2).m_value)) - , - ((RotDeclaration)(yyq.StackAt(0).m_value)) - ){}} + ((IntDeclaration)(yyq.StackAt(4).m_value)) + , + ((RotDeclaration)(yyq.StackAt(2).m_value)) + , + ((RotDeclaration)(yyq.StackAt(0).m_value)) + ){}} public class IntVecVecArgumentDeclarationList_1 : IntVecVecArgumentDeclarationList { public IntVecVecArgumentDeclarationList_1(Parser yyq):base(yyq, - ((IntDeclaration)(yyq.StackAt(4).m_value)) - , - ((VecDeclaration)(yyq.StackAt(2).m_value)) - , - ((VecDeclaration)(yyq.StackAt(0).m_value)) - ){}} + ((IntDeclaration)(yyq.StackAt(4).m_value)) + , + ((VecDeclaration)(yyq.StackAt(2).m_value)) + , + ((VecDeclaration)(yyq.StackAt(0).m_value)) + ){}} public class KeyIntIntArgumentDeclarationList_1 : KeyIntIntArgumentDeclarationList { public KeyIntIntArgumentDeclarationList_1(Parser yyq):base(yyq, - ((KeyDeclaration)(yyq.StackAt(4).m_value)) - , - ((IntDeclaration)(yyq.StackAt(2).m_value)) - , - ((IntDeclaration)(yyq.StackAt(0).m_value)) - ){}} + ((KeyDeclaration)(yyq.StackAt(4).m_value)) + , + ((IntDeclaration)(yyq.StackAt(2).m_value)) + , + ((IntDeclaration)(yyq.StackAt(0).m_value)) + ){}} public class Declaration_1 : Declaration { public Declaration_1(Parser yyq):base(yyq, - ((Typename)(yyq.StackAt(1).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((Typename)(yyq.StackAt(1).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class KeyDeclaration_1 : KeyDeclaration { public KeyDeclaration_1(Parser yyq):base(yyq, - ((KEY_TYPE)(yyq.StackAt(1).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((KEY_TYPE)(yyq.StackAt(1).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class IntDeclaration_1 : IntDeclaration { public IntDeclaration_1(Parser yyq):base(yyq, - ((INTEGER_TYPE)(yyq.StackAt(1).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((INTEGER_TYPE)(yyq.StackAt(1).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class VecDeclaration_1 : VecDeclaration { public VecDeclaration_1(Parser yyq):base(yyq, - ((VECTOR_TYPE)(yyq.StackAt(1).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((VECTOR_TYPE)(yyq.StackAt(1).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class RotDeclaration_1 : RotDeclaration { public RotDeclaration_1(Parser yyq):base(yyq, - ((ROTATION_TYPE)(yyq.StackAt(1).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((ROTATION_TYPE)(yyq.StackAt(1).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class CompoundStatement_1 : CompoundStatement { public CompoundStatement_1(Parser yyq):base(yyq){}} public class CompoundStatement_2 : CompoundStatement { public CompoundStatement_2(Parser yyq):base(yyq, - ((StatementList)(yyq.StackAt(1).m_value)) - ){}} + ((StatementList)(yyq.StackAt(1).m_value)) + ){}} public class StatementList_1 : StatementList { public StatementList_1(Parser yyq):base(yyq, - ((Statement)(yyq.StackAt(0).m_value)) - ){}} + ((Statement)(yyq.StackAt(0).m_value)) + ){}} public class StatementList_2 : StatementList { public StatementList_2(Parser yyq):base(yyq, - ((StatementList)(yyq.StackAt(1).m_value)) - , - ((Statement)(yyq.StackAt(0).m_value)) - ){}} + ((StatementList)(yyq.StackAt(1).m_value)) + , + ((Statement)(yyq.StackAt(0).m_value)) + ){}} public class EmptyStatement_1 : EmptyStatement { public EmptyStatement_1(Parser yyq):base(yyq){}} public class Statement_1 : Statement { public Statement_1(Parser yyq):base(yyq, - ((EmptyStatement)(yyq.StackAt(1).m_value)) - ){}} + ((EmptyStatement)(yyq.StackAt(1).m_value)) + ){}} public class Statement_2 : Statement { public Statement_2(Parser yyq):base(yyq, - ((Declaration)(yyq.StackAt(1).m_value)) - ){}} + ((Declaration)(yyq.StackAt(1).m_value)) + ){}} public class Statement_3 : Statement { public Statement_3(Parser yyq):base(yyq, - ((Assignment)(yyq.StackAt(1).m_value)) - ){}} + ((Assignment)(yyq.StackAt(1).m_value)) + ){}} public class Statement_4 : Statement { public Statement_4(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(1).m_value)) - ){}} + ((Expression)(yyq.StackAt(1).m_value)) + ){}} public class Statement_5 : Statement { public Statement_5(Parser yyq):base(yyq, - ((ReturnStatement)(yyq.StackAt(1).m_value)) - ){}} + ((ReturnStatement)(yyq.StackAt(1).m_value)) + ){}} public class Statement_6 : Statement { public Statement_6(Parser yyq):base(yyq, - ((JumpLabel)(yyq.StackAt(1).m_value)) - ){}} + ((JumpLabel)(yyq.StackAt(1).m_value)) + ){}} public class Statement_7 : Statement { public Statement_7(Parser yyq):base(yyq, - ((JumpStatement)(yyq.StackAt(1).m_value)) - ){}} + ((JumpStatement)(yyq.StackAt(1).m_value)) + ){}} public class Statement_8 : Statement { public Statement_8(Parser yyq):base(yyq, - ((StateChange)(yyq.StackAt(1).m_value)) - ){}} + ((StateChange)(yyq.StackAt(1).m_value)) + ){}} public class Statement_9 : Statement { public Statement_9(Parser yyq):base(yyq, - ((IfStatement)(yyq.StackAt(0).m_value)) - ){}} + ((IfStatement)(yyq.StackAt(0).m_value)) + ){}} public class Statement_10 : Statement { public Statement_10(Parser yyq):base(yyq, - ((WhileStatement)(yyq.StackAt(0).m_value)) - ){}} + ((WhileStatement)(yyq.StackAt(0).m_value)) + ){}} public class Statement_11 : Statement { public Statement_11(Parser yyq):base(yyq, - ((DoWhileStatement)(yyq.StackAt(0).m_value)) - ){}} + ((DoWhileStatement)(yyq.StackAt(0).m_value)) + ){}} public class Statement_12 : Statement { public Statement_12(Parser yyq):base(yyq, - ((ForLoop)(yyq.StackAt(0).m_value)) - ){}} + ((ForLoop)(yyq.StackAt(0).m_value)) + ){}} public class Statement_13 : Statement { public Statement_13(Parser yyq):base(yyq, - ((CompoundStatement)(yyq.StackAt(0).m_value)) - ){}} + ((CompoundStatement)(yyq.StackAt(0).m_value)) + ){}} public class JumpLabel_1 : JumpLabel { public JumpLabel_1(Parser yyq):base(yyq, - ((IDENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((IDENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class JumpStatement_1 : JumpStatement { public JumpStatement_1(Parser yyq):base(yyq, - ((IDENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((IDENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class StateChange_1 : StateChange { public StateChange_1(Parser yyq):base(yyq, - ((IDENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((IDENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class StateChange_2 : StateChange { public StateChange_2(Parser yyq):base(yyq, - ((DEFAULT_STATE)(yyq.StackAt(0).m_value)) - .yytext){}} + ((DEFAULT_STATE)(yyq.StackAt(0).m_value)) + .yytext){}} public class IfStatement_1 : IfStatement { public IfStatement_1(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(2).m_value)) - , - ((Statement)(yyq.StackAt(0).m_value)) - ){}} + ((Expression)(yyq.StackAt(2).m_value)) + , + ((Statement)(yyq.StackAt(0).m_value)) + ){}} public class IfStatement_2 : IfStatement { public IfStatement_2(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(4).m_value)) - , - ((Statement)(yyq.StackAt(2).m_value)) - , - ((Statement)(yyq.StackAt(0).m_value)) - ){}} + ((Expression)(yyq.StackAt(4).m_value)) + , + ((Statement)(yyq.StackAt(2).m_value)) + , + ((Statement)(yyq.StackAt(0).m_value)) + ){}} public class IfStatement_3 : IfStatement { public IfStatement_3(Parser yyq):base(yyq, - ((SimpleAssignment)(yyq.StackAt(2).m_value)) - , - ((Statement)(yyq.StackAt(0).m_value)) - ){}} + ((SimpleAssignment)(yyq.StackAt(2).m_value)) + , + ((Statement)(yyq.StackAt(0).m_value)) + ){}} public class IfStatement_4 : IfStatement { public IfStatement_4(Parser yyq):base(yyq, - ((SimpleAssignment)(yyq.StackAt(4).m_value)) - , - ((Statement)(yyq.StackAt(2).m_value)) - , - ((Statement)(yyq.StackAt(0).m_value)) - ){}} + ((SimpleAssignment)(yyq.StackAt(4).m_value)) + , + ((Statement)(yyq.StackAt(2).m_value)) + , + ((Statement)(yyq.StackAt(0).m_value)) + ){}} public class WhileStatement_1 : WhileStatement { public WhileStatement_1(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(2).m_value)) - , - ((Statement)(yyq.StackAt(0).m_value)) - ){}} + ((Expression)(yyq.StackAt(2).m_value)) + , + ((Statement)(yyq.StackAt(0).m_value)) + ){}} public class WhileStatement_2 : WhileStatement { public WhileStatement_2(Parser yyq):base(yyq, - ((SimpleAssignment)(yyq.StackAt(2).m_value)) - , - ((Statement)(yyq.StackAt(0).m_value)) - ){}} + ((SimpleAssignment)(yyq.StackAt(2).m_value)) + , + ((Statement)(yyq.StackAt(0).m_value)) + ){}} public class DoWhileStatement_1 : DoWhileStatement { public DoWhileStatement_1(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(2).m_value)) - , - ((Statement)(yyq.StackAt(5).m_value)) - ){}} + ((Expression)(yyq.StackAt(2).m_value)) + , + ((Statement)(yyq.StackAt(5).m_value)) + ){}} public class DoWhileStatement_2 : DoWhileStatement { public DoWhileStatement_2(Parser yyq):base(yyq, - ((SimpleAssignment)(yyq.StackAt(2).m_value)) - , - ((Statement)(yyq.StackAt(5).m_value)) - ){}} + ((SimpleAssignment)(yyq.StackAt(2).m_value)) + , + ((Statement)(yyq.StackAt(5).m_value)) + ){}} public class ForLoop_1 : ForLoop { public ForLoop_1(Parser yyq):base(yyq, - ((ForLoopStatement)(yyq.StackAt(6).m_value)) - , - ((Expression)(yyq.StackAt(4).m_value)) - , - ((ForLoopStatement)(yyq.StackAt(2).m_value)) - , - ((Statement)(yyq.StackAt(0).m_value)) - ){}} + ((ForLoopStatement)(yyq.StackAt(6).m_value)) + , + ((Expression)(yyq.StackAt(4).m_value)) + , + ((ForLoopStatement)(yyq.StackAt(2).m_value)) + , + ((Statement)(yyq.StackAt(0).m_value)) + ){}} public class ForLoop_2 : ForLoop { - public ForLoop_2(Parser yyq):base(yyq,null, - ((Expression)(yyq.StackAt(4).m_value)) - , - ((ForLoopStatement)(yyq.StackAt(2).m_value)) - , - ((Statement)(yyq.StackAt(0).m_value)) - ){}} + public ForLoop_2(Parser yyq):base(yyq,null, + ((Expression)(yyq.StackAt(4).m_value)) + , + ((ForLoopStatement)(yyq.StackAt(2).m_value)) + , + ((Statement)(yyq.StackAt(0).m_value)) + ){}} public class ForLoopStatement_1 : ForLoopStatement { public ForLoopStatement_1(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(0).m_value)) - ){}} + ((Expression)(yyq.StackAt(0).m_value)) + ){}} public class ForLoopStatement_2 : ForLoopStatement { public ForLoopStatement_2(Parser yyq):base(yyq, - ((SimpleAssignment)(yyq.StackAt(0).m_value)) - ){}} + ((SimpleAssignment)(yyq.StackAt(0).m_value)) + ){}} public class ForLoopStatement_3 : ForLoopStatement { public ForLoopStatement_3(Parser yyq):base(yyq, - ((ForLoopStatement)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - ){}} + ((ForLoopStatement)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + ){}} public class ForLoopStatement_4 : ForLoopStatement { public ForLoopStatement_4(Parser yyq):base(yyq, - ((ForLoopStatement)(yyq.StackAt(2).m_value)) - , - ((SimpleAssignment)(yyq.StackAt(0).m_value)) - ){}} + ((ForLoopStatement)(yyq.StackAt(2).m_value)) + , + ((SimpleAssignment)(yyq.StackAt(0).m_value)) + ){}} public class Assignment_1 : Assignment { public Assignment_1(Parser yyq):base(yyq, - ((Declaration)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} + ((Declaration)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class Assignment_2 : Assignment { public Assignment_2(Parser yyq):base(yyq, - ((SimpleAssignment)(yyq.StackAt(0).m_value)) - ){}} + ((SimpleAssignment)(yyq.StackAt(0).m_value)) + ){}} public class SimpleAssignment_1 : SimpleAssignment { public SimpleAssignment_1(Parser yyq):base(yyq, - ((IDENT)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} + ((IDENT)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class SimpleAssignment_2 : SimpleAssignment { public SimpleAssignment_2(Parser yyq):base(yyq, - ((IDENT)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((PLUS_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} + ((IDENT)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((PLUS_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class SimpleAssignment_3 : SimpleAssignment { public SimpleAssignment_3(Parser yyq):base(yyq, - ((IDENT)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((MINUS_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} + ((IDENT)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((MINUS_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class SimpleAssignment_4 : SimpleAssignment { public SimpleAssignment_4(Parser yyq):base(yyq, - ((IDENT)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((STAR_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} + ((IDENT)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((STAR_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class SimpleAssignment_5 : SimpleAssignment { public SimpleAssignment_5(Parser yyq):base(yyq, - ((IDENT)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((SLASH_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} + ((IDENT)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((SLASH_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class SimpleAssignment_6 : SimpleAssignment { public SimpleAssignment_6(Parser yyq):base(yyq, - ((IDENT)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((PERCENT_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} + ((IDENT)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((PERCENT_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class SimpleAssignment_7 : SimpleAssignment { public SimpleAssignment_7(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax -)yyq), - ((IDENT)(yyq.StackAt(4).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(2).m_value)) - .yytext), - ((Expression)(yyq.StackAt(0).m_value)) - , - ((EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} +)yyq), + ((IDENT)(yyq.StackAt(4).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(2).m_value)) + .yytext), + ((Expression)(yyq.StackAt(0).m_value)) + , + ((EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class SimpleAssignment_8 : SimpleAssignment { public SimpleAssignment_8(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax -)yyq), - ((IDENT)(yyq.StackAt(4).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(2).m_value)) - .yytext), - ((Expression)(yyq.StackAt(0).m_value)) - , - ((PLUS_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} +)yyq), + ((IDENT)(yyq.StackAt(4).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(2).m_value)) + .yytext), + ((Expression)(yyq.StackAt(0).m_value)) + , + ((PLUS_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class SimpleAssignment_9 : SimpleAssignment { public SimpleAssignment_9(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax -)yyq), - ((IDENT)(yyq.StackAt(4).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(2).m_value)) - .yytext), - ((Expression)(yyq.StackAt(0).m_value)) - , - ((MINUS_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} +)yyq), + ((IDENT)(yyq.StackAt(4).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(2).m_value)) + .yytext), + ((Expression)(yyq.StackAt(0).m_value)) + , + ((MINUS_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class SimpleAssignment_10 : SimpleAssignment { public SimpleAssignment_10(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax -)yyq), - ((IDENT)(yyq.StackAt(4).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(2).m_value)) - .yytext), - ((Expression)(yyq.StackAt(0).m_value)) - , - ((STAR_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} +)yyq), + ((IDENT)(yyq.StackAt(4).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(2).m_value)) + .yytext), + ((Expression)(yyq.StackAt(0).m_value)) + , + ((STAR_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class SimpleAssignment_11 : SimpleAssignment { public SimpleAssignment_11(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax -)yyq), - ((IDENT)(yyq.StackAt(4).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(2).m_value)) - .yytext), - ((Expression)(yyq.StackAt(0).m_value)) - , - ((SLASH_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} +)yyq), + ((IDENT)(yyq.StackAt(4).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(2).m_value)) + .yytext), + ((Expression)(yyq.StackAt(0).m_value)) + , + ((SLASH_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class SimpleAssignment_12 : SimpleAssignment { public SimpleAssignment_12(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax -)yyq), - ((IDENT)(yyq.StackAt(4).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(2).m_value)) - .yytext), - ((Expression)(yyq.StackAt(0).m_value)) - , - ((PERCENT_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} +)yyq), + ((IDENT)(yyq.StackAt(4).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(2).m_value)) + .yytext), + ((Expression)(yyq.StackAt(0).m_value)) + , + ((PERCENT_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class SimpleAssignment_13 : SimpleAssignment { public SimpleAssignment_13(Parser yyq):base(yyq, - ((IDENT)(yyq.StackAt(2).m_value)) - , - ((SimpleAssignment)(yyq.StackAt(0).m_value)) - , - ((EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} + ((IDENT)(yyq.StackAt(2).m_value)) + , + ((SimpleAssignment)(yyq.StackAt(0).m_value)) + , + ((EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class SimpleAssignment_14 : SimpleAssignment { public SimpleAssignment_14(Parser yyq):base(yyq, - ((IDENT)(yyq.StackAt(2).m_value)) - , - ((SimpleAssignment)(yyq.StackAt(0).m_value)) - , - ((PLUS_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} + ((IDENT)(yyq.StackAt(2).m_value)) + , + ((SimpleAssignment)(yyq.StackAt(0).m_value)) + , + ((PLUS_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class SimpleAssignment_15 : SimpleAssignment { public SimpleAssignment_15(Parser yyq):base(yyq, - ((IDENT)(yyq.StackAt(2).m_value)) - , - ((SimpleAssignment)(yyq.StackAt(0).m_value)) - , - ((MINUS_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} + ((IDENT)(yyq.StackAt(2).m_value)) + , + ((SimpleAssignment)(yyq.StackAt(0).m_value)) + , + ((MINUS_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class SimpleAssignment_16 : SimpleAssignment { public SimpleAssignment_16(Parser yyq):base(yyq, - ((IDENT)(yyq.StackAt(2).m_value)) - , - ((SimpleAssignment)(yyq.StackAt(0).m_value)) - , - ((STAR_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} + ((IDENT)(yyq.StackAt(2).m_value)) + , + ((SimpleAssignment)(yyq.StackAt(0).m_value)) + , + ((STAR_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class SimpleAssignment_17 : SimpleAssignment { public SimpleAssignment_17(Parser yyq):base(yyq, - ((IDENT)(yyq.StackAt(2).m_value)) - , - ((SimpleAssignment)(yyq.StackAt(0).m_value)) - , - ((SLASH_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} + ((IDENT)(yyq.StackAt(2).m_value)) + , + ((SimpleAssignment)(yyq.StackAt(0).m_value)) + , + ((SLASH_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class SimpleAssignment_18 : SimpleAssignment { public SimpleAssignment_18(Parser yyq):base(yyq, - ((IDENT)(yyq.StackAt(2).m_value)) - , - ((SimpleAssignment)(yyq.StackAt(0).m_value)) - , - ((PERCENT_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} + ((IDENT)(yyq.StackAt(2).m_value)) + , + ((SimpleAssignment)(yyq.StackAt(0).m_value)) + , + ((PERCENT_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class SimpleAssignment_19 : SimpleAssignment { public SimpleAssignment_19(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax -)yyq), - ((IDENT)(yyq.StackAt(4).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(2).m_value)) - .yytext), - ((SimpleAssignment)(yyq.StackAt(0).m_value)) - , - ((EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} +)yyq), + ((IDENT)(yyq.StackAt(4).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(2).m_value)) + .yytext), + ((SimpleAssignment)(yyq.StackAt(0).m_value)) + , + ((EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class SimpleAssignment_20 : SimpleAssignment { public SimpleAssignment_20(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax -)yyq), - ((IDENT)(yyq.StackAt(4).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(2).m_value)) - .yytext), - ((SimpleAssignment)(yyq.StackAt(0).m_value)) - , - ((PLUS_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} +)yyq), + ((IDENT)(yyq.StackAt(4).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(2).m_value)) + .yytext), + ((SimpleAssignment)(yyq.StackAt(0).m_value)) + , + ((PLUS_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class SimpleAssignment_21 : SimpleAssignment { public SimpleAssignment_21(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax -)yyq), - ((IDENT)(yyq.StackAt(4).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(2).m_value)) - .yytext), - ((SimpleAssignment)(yyq.StackAt(0).m_value)) - , - ((MINUS_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} +)yyq), + ((IDENT)(yyq.StackAt(4).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(2).m_value)) + .yytext), + ((SimpleAssignment)(yyq.StackAt(0).m_value)) + , + ((MINUS_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class SimpleAssignment_22 : SimpleAssignment { public SimpleAssignment_22(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax -)yyq), - ((IDENT)(yyq.StackAt(4).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(2).m_value)) - .yytext), - ((SimpleAssignment)(yyq.StackAt(0).m_value)) - , - ((STAR_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} +)yyq), + ((IDENT)(yyq.StackAt(4).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(2).m_value)) + .yytext), + ((SimpleAssignment)(yyq.StackAt(0).m_value)) + , + ((STAR_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class SimpleAssignment_23 : SimpleAssignment { public SimpleAssignment_23(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax -)yyq), - ((IDENT)(yyq.StackAt(4).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(2).m_value)) - .yytext), - ((SimpleAssignment)(yyq.StackAt(0).m_value)) - , - ((SLASH_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} +)yyq), + ((IDENT)(yyq.StackAt(4).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(2).m_value)) + .yytext), + ((SimpleAssignment)(yyq.StackAt(0).m_value)) + , + ((SLASH_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class SimpleAssignment_24 : SimpleAssignment { public SimpleAssignment_24(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax -)yyq), - ((IDENT)(yyq.StackAt(4).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(2).m_value)) - .yytext), - ((SimpleAssignment)(yyq.StackAt(0).m_value)) - , - ((PERCENT_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} +)yyq), + ((IDENT)(yyq.StackAt(4).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(2).m_value)) + .yytext), + ((SimpleAssignment)(yyq.StackAt(0).m_value)) + , + ((PERCENT_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class ReturnStatement_1 : ReturnStatement { public ReturnStatement_1(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(0).m_value)) - ){}} + ((Expression)(yyq.StackAt(0).m_value)) + ){}} public class ReturnStatement_2 : ReturnStatement { public ReturnStatement_2(Parser yyq):base(yyq){}} public class Constant_1 : Constant { - public Constant_1(Parser yyq):base(yyq,"integer", - ((INTEGER_CONSTANT)(yyq.StackAt(0).m_value)) - .yytext){}} + public Constant_1(Parser yyq):base(yyq,"integer", + ((INTEGER_CONSTANT)(yyq.StackAt(0).m_value)) + .yytext){}} public class Constant_2 : Constant { - public Constant_2(Parser yyq):base(yyq,"integer", - ((HEX_INTEGER_CONSTANT)(yyq.StackAt(0).m_value)) - .yytext){}} + public Constant_2(Parser yyq):base(yyq,"integer", + ((HEX_INTEGER_CONSTANT)(yyq.StackAt(0).m_value)) + .yytext){}} public class Constant_3 : Constant { - public Constant_3(Parser yyq):base(yyq,"float", - ((FLOAT_CONSTANT)(yyq.StackAt(0).m_value)) - .yytext){}} + public Constant_3(Parser yyq):base(yyq,"float", + ((FLOAT_CONSTANT)(yyq.StackAt(0).m_value)) + .yytext){}} public class Constant_4 : Constant { - public Constant_4(Parser yyq):base(yyq,"string", - ((STRING_CONSTANT)(yyq.StackAt(0).m_value)) - .yytext){}} + public Constant_4(Parser yyq):base(yyq,"string", + ((STRING_CONSTANT)(yyq.StackAt(0).m_value)) + .yytext){}} public class ListConstant_1 : ListConstant { public ListConstant_1(Parser yyq):base(yyq, - ((ArgumentList)(yyq.StackAt(1).m_value)) - ){}} + ((ArgumentList)(yyq.StackAt(1).m_value)) + ){}} public class VectorConstant_1 : VectorConstant { public VectorConstant_1(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(5).m_value)) - , - ((Expression)(yyq.StackAt(3).m_value)) - , - ((Expression)(yyq.StackAt(1).m_value)) - ){}} + ((Expression)(yyq.StackAt(5).m_value)) + , + ((Expression)(yyq.StackAt(3).m_value)) + , + ((Expression)(yyq.StackAt(1).m_value)) + ){}} public class RotationConstant_1 : RotationConstant { public RotationConstant_1(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(7).m_value)) - , - ((Expression)(yyq.StackAt(5).m_value)) - , - ((Expression)(yyq.StackAt(3).m_value)) - , - ((Expression)(yyq.StackAt(1).m_value)) - ){}} + ((Expression)(yyq.StackAt(7).m_value)) + , + ((Expression)(yyq.StackAt(5).m_value)) + , + ((Expression)(yyq.StackAt(3).m_value)) + , + ((Expression)(yyq.StackAt(1).m_value)) + ){}} public class ConstantExpression_1 : ConstantExpression { public ConstantExpression_1(Parser yyq):base(yyq, - ((Constant)(yyq.StackAt(0).m_value)) - ){}} + ((Constant)(yyq.StackAt(0).m_value)) + ){}} public class IdentExpression_1 : IdentExpression { public IdentExpression_1(Parser yyq):base(yyq, - ((IDENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((IDENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class IdentDotExpression_1 : IdentDotExpression { public IdentDotExpression_1(Parser yyq):base(yyq, - ((IDENT)(yyq.StackAt(2).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((IDENT)(yyq.StackAt(2).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class IncrementDecrementExpression_1 : IncrementDecrementExpression { public IncrementDecrementExpression_1(Parser yyq):base(yyq, - ((IDENT)(yyq.StackAt(1).m_value)) - .yytext, - ((INCREMENT)(yyq.StackAt(0).m_value)) - .yytext, true){}} + ((IDENT)(yyq.StackAt(1).m_value)) + .yytext, + ((INCREMENT)(yyq.StackAt(0).m_value)) + .yytext, true){}} public class IncrementDecrementExpression_2 : IncrementDecrementExpression { public IncrementDecrementExpression_2(Parser yyq):base(yyq, - ((IDENT)(yyq.StackAt(1).m_value)) - .yytext, - ((DECREMENT)(yyq.StackAt(0).m_value)) - .yytext, true){}} + ((IDENT)(yyq.StackAt(1).m_value)) + .yytext, + ((DECREMENT)(yyq.StackAt(0).m_value)) + .yytext, true){}} public class IncrementDecrementExpression_3 : IncrementDecrementExpression { public IncrementDecrementExpression_3(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax -)yyq), - ((IDENT)(yyq.StackAt(3).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(1).m_value)) - .yytext), - ((INCREMENT)(yyq.StackAt(0).m_value)) - .yytext, true){}} +)yyq), + ((IDENT)(yyq.StackAt(3).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(1).m_value)) + .yytext), + ((INCREMENT)(yyq.StackAt(0).m_value)) + .yytext, true){}} public class IncrementDecrementExpression_4 : IncrementDecrementExpression { public IncrementDecrementExpression_4(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax -)yyq), - ((IDENT)(yyq.StackAt(3).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(1).m_value)) - .yytext), - ((DECREMENT)(yyq.StackAt(0).m_value)) - .yytext, true){}} +)yyq), + ((IDENT)(yyq.StackAt(3).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(1).m_value)) + .yytext), + ((DECREMENT)(yyq.StackAt(0).m_value)) + .yytext, true){}} public class IncrementDecrementExpression_5 : IncrementDecrementExpression { public IncrementDecrementExpression_5(Parser yyq):base(yyq, - ((IDENT)(yyq.StackAt(0).m_value)) - .yytext, - ((INCREMENT)(yyq.StackAt(1).m_value)) - .yytext, false){}} + ((IDENT)(yyq.StackAt(0).m_value)) + .yytext, + ((INCREMENT)(yyq.StackAt(1).m_value)) + .yytext, false){}} public class IncrementDecrementExpression_6 : IncrementDecrementExpression { public IncrementDecrementExpression_6(Parser yyq):base(yyq, - ((IDENT)(yyq.StackAt(0).m_value)) - .yytext, - ((DECREMENT)(yyq.StackAt(1).m_value)) - .yytext, false){}} + ((IDENT)(yyq.StackAt(0).m_value)) + .yytext, + ((DECREMENT)(yyq.StackAt(1).m_value)) + .yytext, false){}} public class IncrementDecrementExpression_7 : IncrementDecrementExpression { public IncrementDecrementExpression_7(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax -)yyq), - ((IDENT)(yyq.StackAt(2).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(0).m_value)) - .yytext), - ((INCREMENT)(yyq.StackAt(3).m_value)) - .yytext, false){}} +)yyq), + ((IDENT)(yyq.StackAt(2).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(0).m_value)) + .yytext), + ((INCREMENT)(yyq.StackAt(3).m_value)) + .yytext, false){}} public class IncrementDecrementExpression_8 : IncrementDecrementExpression { public IncrementDecrementExpression_8(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax -)yyq), - ((IDENT)(yyq.StackAt(2).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(0).m_value)) - .yytext), - ((DECREMENT)(yyq.StackAt(3).m_value)) - .yytext, false){}} +)yyq), + ((IDENT)(yyq.StackAt(2).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(0).m_value)) + .yytext), + ((DECREMENT)(yyq.StackAt(3).m_value)) + .yytext, false){}} public class FunctionCallExpression_1 : FunctionCallExpression { public FunctionCallExpression_1(Parser yyq):base(yyq, - ((FunctionCall)(yyq.StackAt(0).m_value)) - ){}} + ((FunctionCall)(yyq.StackAt(0).m_value)) + ){}} public class BinaryExpression_1 : BinaryExpression { public BinaryExpression_1(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((PLUS)(yyq.StackAt(1).m_value)) - .yytext){}} + ((Expression)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((PLUS)(yyq.StackAt(1).m_value)) + .yytext){}} public class BinaryExpression_2 : BinaryExpression { public BinaryExpression_2(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((MINUS)(yyq.StackAt(1).m_value)) - .yytext){}} + ((Expression)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((MINUS)(yyq.StackAt(1).m_value)) + .yytext){}} public class BinaryExpression_3 : BinaryExpression { public BinaryExpression_3(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((STAR)(yyq.StackAt(1).m_value)) - .yytext){}} + ((Expression)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((STAR)(yyq.StackAt(1).m_value)) + .yytext){}} public class BinaryExpression_4 : BinaryExpression { public BinaryExpression_4(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((SLASH)(yyq.StackAt(1).m_value)) - .yytext){}} + ((Expression)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((SLASH)(yyq.StackAt(1).m_value)) + .yytext){}} public class BinaryExpression_5 : BinaryExpression { public BinaryExpression_5(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((PERCENT)(yyq.StackAt(1).m_value)) - .yytext){}} + ((Expression)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((PERCENT)(yyq.StackAt(1).m_value)) + .yytext){}} public class BinaryExpression_6 : BinaryExpression { public BinaryExpression_6(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((AMP)(yyq.StackAt(1).m_value)) - .yytext){}} + ((Expression)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((AMP)(yyq.StackAt(1).m_value)) + .yytext){}} public class BinaryExpression_7 : BinaryExpression { public BinaryExpression_7(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((STROKE)(yyq.StackAt(1).m_value)) - .yytext){}} + ((Expression)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((STROKE)(yyq.StackAt(1).m_value)) + .yytext){}} public class BinaryExpression_8 : BinaryExpression { public BinaryExpression_8(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((CARET)(yyq.StackAt(1).m_value)) - .yytext){}} + ((Expression)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((CARET)(yyq.StackAt(1).m_value)) + .yytext){}} public class BinaryExpression_9 : BinaryExpression { public BinaryExpression_9(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((RIGHT_ANGLE)(yyq.StackAt(1).m_value)) - .yytext){}} + ((Expression)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((RIGHT_ANGLE)(yyq.StackAt(1).m_value)) + .yytext){}} public class BinaryExpression_10 : BinaryExpression { public BinaryExpression_10(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((LEFT_ANGLE)(yyq.StackAt(1).m_value)) - .yytext){}} + ((Expression)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((LEFT_ANGLE)(yyq.StackAt(1).m_value)) + .yytext){}} public class BinaryExpression_11 : BinaryExpression { public BinaryExpression_11(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((EQUALS_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} + ((Expression)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((EQUALS_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class BinaryExpression_12 : BinaryExpression { public BinaryExpression_12(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((EXCLAMATION_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} + ((Expression)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((EXCLAMATION_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class BinaryExpression_13 : BinaryExpression { public BinaryExpression_13(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((LESS_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} + ((Expression)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((LESS_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class BinaryExpression_14 : BinaryExpression { public BinaryExpression_14(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((GREATER_EQUALS)(yyq.StackAt(1).m_value)) - .yytext){}} + ((Expression)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((GREATER_EQUALS)(yyq.StackAt(1).m_value)) + .yytext){}} public class BinaryExpression_15 : BinaryExpression { public BinaryExpression_15(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((AMP_AMP)(yyq.StackAt(1).m_value)) - .yytext){}} + ((Expression)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((AMP_AMP)(yyq.StackAt(1).m_value)) + .yytext){}} public class BinaryExpression_16 : BinaryExpression { public BinaryExpression_16(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((STROKE_STROKE)(yyq.StackAt(1).m_value)) - .yytext){}} + ((Expression)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((STROKE_STROKE)(yyq.StackAt(1).m_value)) + .yytext){}} public class BinaryExpression_17 : BinaryExpression { public BinaryExpression_17(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((LEFT_SHIFT)(yyq.StackAt(1).m_value)) - .yytext){}} + ((Expression)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((LEFT_SHIFT)(yyq.StackAt(1).m_value)) + .yytext){}} public class BinaryExpression_18 : BinaryExpression { public BinaryExpression_18(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(2).m_value)) - , - ((Expression)(yyq.StackAt(0).m_value)) - , - ((RIGHT_SHIFT)(yyq.StackAt(1).m_value)) - .yytext){}} + ((Expression)(yyq.StackAt(2).m_value)) + , + ((Expression)(yyq.StackAt(0).m_value)) + , + ((RIGHT_SHIFT)(yyq.StackAt(1).m_value)) + .yytext){}} public class UnaryExpression_1 : UnaryExpression { public UnaryExpression_1(Parser yyq):base(yyq, - ((EXCLAMATION)(yyq.StackAt(1).m_value)) - .yytext, - ((Expression)(yyq.StackAt(0).m_value)) - ){}} + ((EXCLAMATION)(yyq.StackAt(1).m_value)) + .yytext, + ((Expression)(yyq.StackAt(0).m_value)) + ){}} public class UnaryExpression_2 : UnaryExpression { public UnaryExpression_2(Parser yyq):base(yyq, - ((MINUS)(yyq.StackAt(1).m_value)) - .yytext, - ((Expression)(yyq.StackAt(0).m_value)) - ){}} + ((MINUS)(yyq.StackAt(1).m_value)) + .yytext, + ((Expression)(yyq.StackAt(0).m_value)) + ){}} public class UnaryExpression_3 : UnaryExpression { public UnaryExpression_3(Parser yyq):base(yyq, - ((TILDE)(yyq.StackAt(1).m_value)) - .yytext, - ((Expression)(yyq.StackAt(0).m_value)) - ){}} + ((TILDE)(yyq.StackAt(1).m_value)) + .yytext, + ((Expression)(yyq.StackAt(0).m_value)) + ){}} public class ParenthesisExpression_1 : ParenthesisExpression { public ParenthesisExpression_1(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(1).m_value)) - ){}} + ((Expression)(yyq.StackAt(1).m_value)) + ){}} public class ParenthesisExpression_2 : ParenthesisExpression { public ParenthesisExpression_2(Parser yyq):base(yyq, - ((SimpleAssignment)(yyq.StackAt(1).m_value)) - ){}} + ((SimpleAssignment)(yyq.StackAt(1).m_value)) + ){}} public class TypecastExpression_1 : TypecastExpression { public TypecastExpression_1(Parser yyq):base(yyq, - ((Typename)(yyq.StackAt(2).m_value)) - .yytext, - ((Constant)(yyq.StackAt(0).m_value)) - ){}} + ((Typename)(yyq.StackAt(2).m_value)) + .yytext, + ((Constant)(yyq.StackAt(0).m_value)) + ){}} public class TypecastExpression_2 : TypecastExpression { public TypecastExpression_2(Parser yyq):base(yyq, - ((Typename)(yyq.StackAt(2).m_value)) - .yytext, new IdentExpression(((LSLSyntax -)yyq), - ((IDENT)(yyq.StackAt(0).m_value)) - .yytext)){}} + ((Typename)(yyq.StackAt(2).m_value)) + .yytext, new IdentExpression(((LSLSyntax +)yyq), + ((IDENT)(yyq.StackAt(0).m_value)) + .yytext)){}} public class TypecastExpression_3 : TypecastExpression { public TypecastExpression_3(Parser yyq):base(yyq, - ((Typename)(yyq.StackAt(4).m_value)) - .yytext, new IdentDotExpression(((LSLSyntax -)yyq), - ((IDENT)(yyq.StackAt(2).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(0).m_value)) - .yytext)){}} + ((Typename)(yyq.StackAt(4).m_value)) + .yytext, new IdentDotExpression(((LSLSyntax +)yyq), + ((IDENT)(yyq.StackAt(2).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(0).m_value)) + .yytext)){}} public class TypecastExpression_4 : TypecastExpression { public TypecastExpression_4(Parser yyq):base(yyq, - ((Typename)(yyq.StackAt(3).m_value)) - .yytext, new IncrementDecrementExpression(((LSLSyntax -)yyq), - ((IDENT)(yyq.StackAt(1).m_value)) - .yytext, - ((INCREMENT)(yyq.StackAt(0).m_value)) - .yytext, true)){}} + ((Typename)(yyq.StackAt(3).m_value)) + .yytext, new IncrementDecrementExpression(((LSLSyntax +)yyq), + ((IDENT)(yyq.StackAt(1).m_value)) + .yytext, + ((INCREMENT)(yyq.StackAt(0).m_value)) + .yytext, true)){}} public class TypecastExpression_5 : TypecastExpression { public TypecastExpression_5(Parser yyq):base(yyq, - ((Typename)(yyq.StackAt(5).m_value)) - .yytext, new IncrementDecrementExpression(((LSLSyntax + ((Typename)(yyq.StackAt(5).m_value)) + .yytext, new IncrementDecrementExpression(((LSLSyntax )yyq), new IdentDotExpression(((LSLSyntax -)yyq), - ((IDENT)(yyq.StackAt(3).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(1).m_value)) - .yytext), - ((INCREMENT)(yyq.StackAt(0).m_value)) - .yytext, true)){}} +)yyq), + ((IDENT)(yyq.StackAt(3).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(1).m_value)) + .yytext), + ((INCREMENT)(yyq.StackAt(0).m_value)) + .yytext, true)){}} public class TypecastExpression_6 : TypecastExpression { public TypecastExpression_6(Parser yyq):base(yyq, - ((Typename)(yyq.StackAt(3).m_value)) - .yytext, new IncrementDecrementExpression(((LSLSyntax -)yyq), - ((IDENT)(yyq.StackAt(1).m_value)) - .yytext, - ((DECREMENT)(yyq.StackAt(0).m_value)) - .yytext, true)){}} + ((Typename)(yyq.StackAt(3).m_value)) + .yytext, new IncrementDecrementExpression(((LSLSyntax +)yyq), + ((IDENT)(yyq.StackAt(1).m_value)) + .yytext, + ((DECREMENT)(yyq.StackAt(0).m_value)) + .yytext, true)){}} public class TypecastExpression_7 : TypecastExpression { public TypecastExpression_7(Parser yyq):base(yyq, - ((Typename)(yyq.StackAt(5).m_value)) - .yytext, new IncrementDecrementExpression(((LSLSyntax + ((Typename)(yyq.StackAt(5).m_value)) + .yytext, new IncrementDecrementExpression(((LSLSyntax )yyq), new IdentDotExpression(((LSLSyntax -)yyq), - ((IDENT)(yyq.StackAt(3).m_value)) - .yytext, - ((IDENT)(yyq.StackAt(1).m_value)) - .yytext), - ((DECREMENT)(yyq.StackAt(0).m_value)) - .yytext, true)){}} +)yyq), + ((IDENT)(yyq.StackAt(3).m_value)) + .yytext, + ((IDENT)(yyq.StackAt(1).m_value)) + .yytext), + ((DECREMENT)(yyq.StackAt(0).m_value)) + .yytext, true)){}} public class TypecastExpression_8 : TypecastExpression { public TypecastExpression_8(Parser yyq):base(yyq, - ((Typename)(yyq.StackAt(2).m_value)) - .yytext, - ((FunctionCall)(yyq.StackAt(0).m_value)) - ){}} + ((Typename)(yyq.StackAt(2).m_value)) + .yytext, + ((FunctionCall)(yyq.StackAt(0).m_value)) + ){}} public class TypecastExpression_9 : TypecastExpression { public TypecastExpression_9(Parser yyq):base(yyq, - ((Typename)(yyq.StackAt(4).m_value)) - .yytext, - ((Expression)(yyq.StackAt(1).m_value)) - ){}} + ((Typename)(yyq.StackAt(4).m_value)) + .yytext, + ((Expression)(yyq.StackAt(1).m_value)) + ){}} public class FunctionCall_1 : FunctionCall { public FunctionCall_1(Parser yyq):base(yyq, - ((IDENT)(yyq.StackAt(3).m_value)) - .yytext, - ((ArgumentList)(yyq.StackAt(1).m_value)) - ){}} + ((IDENT)(yyq.StackAt(3).m_value)) + .yytext, + ((ArgumentList)(yyq.StackAt(1).m_value)) + ){}} public class ArgumentList_1 : ArgumentList { public ArgumentList_1(Parser yyq):base(yyq, - ((Argument)(yyq.StackAt(0).m_value)) - ){}} + ((Argument)(yyq.StackAt(0).m_value)) + ){}} public class ArgumentList_2 : ArgumentList { public ArgumentList_2(Parser yyq):base(yyq, - ((ArgumentList)(yyq.StackAt(2).m_value)) - , - ((Argument)(yyq.StackAt(0).m_value)) - ){}} + ((ArgumentList)(yyq.StackAt(2).m_value)) + , + ((Argument)(yyq.StackAt(0).m_value)) + ){}} public class ExpressionArgument_1 : ExpressionArgument { public ExpressionArgument_1(Parser yyq):base(yyq, - ((Expression)(yyq.StackAt(0).m_value)) - ){}} + ((Expression)(yyq.StackAt(0).m_value)) + ){}} public class Typename_1 : Typename { public Typename_1(Parser yyq):base(yyq, - ((INTEGER_TYPE)(yyq.StackAt(0).m_value)) - .yytext){}} + ((INTEGER_TYPE)(yyq.StackAt(0).m_value)) + .yytext){}} public class Typename_2 : Typename { public Typename_2(Parser yyq):base(yyq, - ((FLOAT_TYPE)(yyq.StackAt(0).m_value)) - .yytext){}} + ((FLOAT_TYPE)(yyq.StackAt(0).m_value)) + .yytext){}} public class Typename_3 : Typename { public Typename_3(Parser yyq):base(yyq, - ((STRING_TYPE)(yyq.StackAt(0).m_value)) - .yytext){}} + ((STRING_TYPE)(yyq.StackAt(0).m_value)) + .yytext){}} public class Typename_4 : Typename { public Typename_4(Parser yyq):base(yyq, - ((KEY_TYPE)(yyq.StackAt(0).m_value)) - .yytext){}} + ((KEY_TYPE)(yyq.StackAt(0).m_value)) + .yytext){}} public class Typename_5 : Typename { public Typename_5(Parser yyq):base(yyq, - ((VECTOR_TYPE)(yyq.StackAt(0).m_value)) - .yytext){}} + ((VECTOR_TYPE)(yyq.StackAt(0).m_value)) + .yytext){}} public class Typename_6 : Typename { public Typename_6(Parser yyq):base(yyq, - ((ROTATION_TYPE)(yyq.StackAt(0).m_value)) - .yytext){}} + ((ROTATION_TYPE)(yyq.StackAt(0).m_value)) + .yytext){}} public class Typename_7 : Typename { public Typename_7(Parser yyq):base(yyq, - ((LIST_TYPE)(yyq.StackAt(0).m_value)) - .yytext){}} + ((LIST_TYPE)(yyq.StackAt(0).m_value)) + .yytext){}} public class Event_1 : Event { public Event_1(Parser yyq):base(yyq, - ((DATASERVER_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((DATASERVER_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class Event_2 : Event { public Event_2(Parser yyq):base(yyq, - ((EMAIL_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((EMAIL_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class Event_3 : Event { public Event_3(Parser yyq):base(yyq, - ((HTTP_RESPONSE_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((HTTP_RESPONSE_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class Event_4 : Event { public Event_4(Parser yyq):base(yyq, - ((LINK_MESSAGE_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((LINK_MESSAGE_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class Event_5 : Event { public Event_5(Parser yyq):base(yyq, - ((LISTEN_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((LISTEN_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class Event_6 : Event { public Event_6(Parser yyq):base(yyq, - ((MONEY_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((MONEY_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class Event_7 : Event { public Event_7(Parser yyq):base(yyq, - ((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class Event_8 : Event { public Event_8(Parser yyq):base(yyq, - ((HTTP_REQUEST_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((HTTP_REQUEST_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class Event_9 : Event { public Event_9(Parser yyq):base(yyq, - ((TRANSACTION_RESULT_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((TRANSACTION_RESULT_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class VoidArgEvent_1 : VoidArgEvent { public VoidArgEvent_1(Parser yyq):base(yyq, - ((STATE_ENTRY_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((STATE_ENTRY_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class VoidArgEvent_2 : VoidArgEvent { public VoidArgEvent_2(Parser yyq):base(yyq, - ((STATE_EXIT_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((STATE_EXIT_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class VoidArgEvent_3 : VoidArgEvent { public VoidArgEvent_3(Parser yyq):base(yyq, - ((MOVING_END_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((MOVING_END_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class VoidArgEvent_4 : VoidArgEvent { public VoidArgEvent_4(Parser yyq):base(yyq, - ((MOVING_START_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((MOVING_START_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class VoidArgEvent_5 : VoidArgEvent { public VoidArgEvent_5(Parser yyq):base(yyq, - ((NO_SENSOR_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((NO_SENSOR_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class VoidArgEvent_6 : VoidArgEvent { public VoidArgEvent_6(Parser yyq):base(yyq, - ((NOT_AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((NOT_AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class VoidArgEvent_7 : VoidArgEvent { public VoidArgEvent_7(Parser yyq):base(yyq, - ((NOT_AT_TARGET_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((NOT_AT_TARGET_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class VoidArgEvent_8 : VoidArgEvent { public VoidArgEvent_8(Parser yyq):base(yyq, - ((TIMER_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((TIMER_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class KeyArgEvent_1 : KeyArgEvent { public KeyArgEvent_1(Parser yyq):base(yyq, - ((ATTACH_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((ATTACH_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class KeyArgEvent_2 : KeyArgEvent { public KeyArgEvent_2(Parser yyq):base(yyq, - ((OBJECT_REZ_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((OBJECT_REZ_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class IntArgEvent_1 : IntArgEvent { public IntArgEvent_1(Parser yyq):base(yyq, - ((CHANGED_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((CHANGED_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class IntArgEvent_2 : IntArgEvent { public IntArgEvent_2(Parser yyq):base(yyq, - ((COLLISION_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((COLLISION_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class IntArgEvent_3 : IntArgEvent { public IntArgEvent_3(Parser yyq):base(yyq, - ((COLLISION_END_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((COLLISION_END_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class IntArgEvent_4 : IntArgEvent { public IntArgEvent_4(Parser yyq):base(yyq, - ((COLLISION_START_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((COLLISION_START_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class IntArgEvent_5 : IntArgEvent { public IntArgEvent_5(Parser yyq):base(yyq, - ((ON_REZ_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((ON_REZ_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class IntArgEvent_6 : IntArgEvent { public IntArgEvent_6(Parser yyq):base(yyq, - ((RUN_TIME_PERMISSIONS_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((RUN_TIME_PERMISSIONS_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class IntArgEvent_7 : IntArgEvent { public IntArgEvent_7(Parser yyq):base(yyq, - ((SENSOR_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((SENSOR_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class IntArgEvent_8 : IntArgEvent { public IntArgEvent_8(Parser yyq):base(yyq, - ((TOUCH_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((TOUCH_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class IntArgEvent_9 : IntArgEvent { public IntArgEvent_9(Parser yyq):base(yyq, - ((TOUCH_END_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((TOUCH_END_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class IntArgEvent_10 : IntArgEvent { public IntArgEvent_10(Parser yyq):base(yyq, - ((TOUCH_START_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((TOUCH_START_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class VectorArgEvent_1 : VectorArgEvent { public VectorArgEvent_1(Parser yyq):base(yyq, - ((LAND_COLLISION_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((LAND_COLLISION_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class VectorArgEvent_2 : VectorArgEvent { public VectorArgEvent_2(Parser yyq):base(yyq, - ((LAND_COLLISION_END_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((LAND_COLLISION_END_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class VectorArgEvent_3 : VectorArgEvent { public VectorArgEvent_3(Parser yyq):base(yyq, - ((LAND_COLLISION_START_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((LAND_COLLISION_START_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class IntRotRotArgEvent_1 : IntRotRotArgEvent { public IntRotRotArgEvent_1(Parser yyq):base(yyq, - ((AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class IntVecVecArgEvent_1 : IntVecVecArgEvent { public IntVecVecArgEvent_1(Parser yyq):base(yyq, - ((AT_TARGET_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((AT_TARGET_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class KeyIntIntArgEvent_1 : KeyIntIntArgEvent { public KeyIntIntArgEvent_1(Parser yyq):base(yyq, - ((CONTROL_EVENT)(yyq.StackAt(0).m_value)) - .yytext){}} + ((CONTROL_EVENT)(yyq.StackAt(0).m_value)) + .yytext){}} public class yyLSLSyntax : YyParser { public override object Action(Parser yyq,SYMBOL yysym, int yyact) { switch(yyact) { - case -1: break; //// keep compiler happy + case -1: break; //// keep compiler happy } return null; } public class ArgumentDeclarationList_3 : ArgumentDeclarationList { @@ -2390,7 +2390,7 @@ public class ArgumentDeclarationList_4 : ArgumentDeclarationList { public class ArgumentDeclarationList_5 : ArgumentDeclarationList { public ArgumentDeclarationList_5(Parser yyq):base(yyq){}} public yyLSLSyntax -():base() { arr = new int[] { +():base() { arr = new int[] { 101,4,6,52,0, 46,0,53,0,102, 20,103,4,28,76, diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs index 110fce6..7db6b6d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs @@ -48,7 +48,7 @@ namespace OpenSim.Region.ScriptEngine.Shared } protected EventAbortException( - SerializationInfo info, + SerializationInfo info, StreamingContext context) { } @@ -62,7 +62,7 @@ namespace OpenSim.Region.ScriptEngine.Shared } protected SelfDeleteException( - SerializationInfo info, + SerializationInfo info, StreamingContext context) { } @@ -76,14 +76,14 @@ namespace OpenSim.Region.ScriptEngine.Shared } protected ScriptDeleteException( - SerializationInfo info, + SerializationInfo info, StreamingContext context) { } } /// - /// Used to signal when the script is stopping in co-operation with the script engine + /// Used to signal when the script is stopping in co-operation with the script engine /// (instead of through Thread.Abort()). /// [Serializable] @@ -94,7 +94,7 @@ namespace OpenSim.Region.ScriptEngine.Shared } protected ScriptCoopStopException( - SerializationInfo info, + SerializationInfo info, StreamingContext context) { } diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs index fdbdd8c..411d49c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("OpenSim.Region.ScriptEngine.Shared.Instance")] @@ -14,8 +14,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] @@ -25,7 +25,7 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 7129c8a..9d72b1c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs @@ -88,7 +88,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance // The following is for setting a minimum delay between events private double m_minEventDelay; - + private long m_eventDelayTicks; private long m_nextEventTimeTicks; private bool m_startOnInit = true; @@ -122,7 +122,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance { if (value > 0.001) m_minEventDelay = value; - else + else m_minEventDelay = 0.0; m_eventDelayTicks = (long)(m_minEventDelay * 10000000L); @@ -154,7 +154,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance { bool wasSuspended = m_Suspended; m_Suspended = value; - + if (wasSuspended && !m_Suspended) { lock (EventQueue) @@ -201,11 +201,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance public long EventsQueued { - get + get { lock (EventQueue) return EventQueue.Count; - } + } } public long EventsProcessed { get; private set; } @@ -221,7 +221,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance private static readonly int MeasurementWindow = 30 * 1000; // show the *recent* time used by the script, to find currently active scripts private bool m_coopTermination; - + private EventWaitHandle m_coopSleepHandle; public void ClearQueue() @@ -281,7 +281,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance /// /// false if load failed, true if suceeded public bool Load( - IScript script, EventWaitHandle coopSleepHandle, string assemblyPath, + IScript script, EventWaitHandle coopSleepHandle, string assemblyPath, string dataPath, StateSource stateSource, bool coopTermination) { m_Script = script; @@ -324,13 +324,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance return false; } - // For attachments, XEngine saves the state into a .state file when XEngine.SetXMLState() is called. + // For attachments, XEngine saves the state into a .state file when XEngine.SetXMLState() is called. string savedState = Path.Combine(m_dataPath, ItemID.ToString() + ".state"); if (File.Exists(savedState)) { // m_log.DebugFormat( - // "[SCRIPT INSTANCE]: Found state for script {0} for {1} ({2}) at {3} in {4}", + // "[SCRIPT INSTANCE]: Found state for script {0} for {1} ({2}) at {3} in {4}", // ItemID, savedState, Part.Name, Part.ParentGroup.Name, Part.ParentGroup.Scene.Name); string xml = String.Empty; @@ -395,7 +395,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance // else // { // m_log.DebugFormat( - // "[SCRIPT INSTANCE]: Did not find state for script {0} for {1} ({2}) at {3} in {4}", + // "[SCRIPT INSTANCE]: Did not find state for script {0} for {1} ({2}) at {3} in {4}", // ItemID, savedState, Part.Name, Part.ParentGroup.Name, Part.ParentGroup.Scene.Name); // } @@ -407,11 +407,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance if (ShuttingDown) return; - if (m_startedFromSavedState) + if (m_startedFromSavedState) { if (m_startOnInit) Start(); - if (m_postOnRez) + if (m_postOnRez) { PostEvent(new EventParams("on_rez", new Object[] {new LSL_Types.LSLInteger(StartParam)}, new DetectParams[0])); @@ -439,13 +439,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance new Object[] { new LSL_Types.LSLInteger((int)Changed.TELEPORT) }, new DetectParams[0])); } } - else + else { if (m_startOnInit) Start(); PostEvent(new EventParams("state_entry", new Object[0], new DetectParams[0])); - if (m_postOnRez) + if (m_postOnRez) { PostEvent(new EventParams("on_rez", new Object[] {new LSL_Types.LSLInteger(StartParam)}, new DetectParams[0])); @@ -462,7 +462,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance private void ReleaseControls() { SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID); - + if (part != null) { int permsMask; @@ -508,8 +508,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance { m_log.Warn( string.Format( - "[SCRIPT INSTANCE]: Could not delete script state {0} for script {1} (id {2}) in part {3} (id {4}) in object {5} in {6}. Exception ", - savedState, ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name), + "[SCRIPT INSTANCE]: Could not delete script state {0} for script {1} (id {2}) in part {3} (id {4}) in object {5} in {6}. Exception ", + savedState, ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name), e); } } @@ -631,7 +631,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance if (!m_InSelfDelete) { m_log.DebugFormat( - "[SCRIPT INSTANCE]: Aborting unstopped script {0} {1} in prim {2}, localID {3}, timeout was {4} ms", + "[SCRIPT INSTANCE]: Aborting unstopped script {0} {1} in prim {2}, localID {3}, timeout was {4} ms", ScriptName, ItemID, PrimName, LocalID, timeout); workItem.Abort(); @@ -709,7 +709,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance lock (EventQueue) { // The only events that persist across state changes are timers - if (m_StateChangeInProgress && data.EventName != "timer") + if (m_StateChangeInProgress && data.EventName != "timer") return; if (EventQueue.Count >= m_MaxScriptQueue) @@ -784,7 +784,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance return 0; ExecutionTimer.Restart(); - + try { return EventProcessorInt(); @@ -927,7 +927,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance if(e.InnerException != null && e.InnerException is ScriptException) { - string text = e.InnerException.Message + + string text = e.InnerException.Message + "(script: " + ScriptName + " event: " + data.EventName + " at " + Part.AbsolutePosition + ")"; @@ -945,10 +945,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance Part.UUID, Part.AbsolutePosition, Part.ParentGroup.Scene.Name)); - - } + + } else - { + { // DISPLAY ERROR INWORLD string text = FormatException(e); @@ -1217,7 +1217,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance return null; } - + public override string ToString() { return String.Format("{0} {1} on {2}", ScriptName, ItemID, PrimName); diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs index 5b9794b..8138117 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs @@ -79,7 +79,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests m_xEngine.DebugLevel = 1; IniConfigSource configSource = new IniConfigSource(); - + IConfig startupConfig = configSource.AddConfig("Startup"); startupConfig.Set("DefaultScriptEngine", "XEngine"); @@ -124,9 +124,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests TestHelpers.InMethod(); // TestHelpers.EnableLogging(); - string script = + string script = @"default -{ +{ state_entry() { llSay(0, ""Thin Lizzy""); @@ -143,12 +143,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests TestHelpers.InMethod(); // TestHelpers.EnableLogging(); - string script = + string script = @"default -{ +{ state_entry() { - integer i = 0; + integer i = 0; for (i = 0; i <= 1; i++) llSay(0, ""Iter "" + (string)i); } }"; @@ -162,14 +162,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests TestHelpers.InMethod(); // TestHelpers.EnableLogging(); - string script = + string script = @"default -{ +{ state_entry() { integer i = 0; llSay(0, ""Thin Lizzy""); - + for (i = 0; i < 2147483647; i++) llSay(0, ""Iter "" + (string)i); } }"; @@ -183,15 +183,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests TestHelpers.InMethod(); // TestHelpers.EnableLogging(); - string script = + string script = @"default -{ +{ state_entry() { integer i = 0; llSay(0, ""Thin Lizzy""); - - for (i = 0; i < 2147483647; i++) + + for (i = 0; i < 2147483647; i++) { llSay(0, ""Iter "" + (string)i); } @@ -207,12 +207,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests TestHelpers.InMethod(); // TestHelpers.EnableLogging(); - string script = + string script = @"default -{ +{ state_entry() { - integer i = 0; + integer i = 0; while (i < 2) llSay(0, ""Iter "" + (string)i++); } }"; @@ -226,15 +226,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests TestHelpers.InMethod(); // TestHelpers.EnableLogging(); - string script = + string script = @"default -{ +{ state_entry() { integer i = 0; llSay(0, ""Thin Lizzy""); - while (1 == 1) + while (1 == 1) llSay(0, ""Iter "" + (string)i++); } }"; @@ -248,15 +248,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests TestHelpers.InMethod(); // TestHelpers.EnableLogging(); - string script = + string script = @"default -{ +{ state_entry() { integer i = 0; llSay(0, ""Thin Lizzy""); - while (1 == 1) + while (1 == 1) { llSay(0, ""Iter "" + (string)i++); } @@ -272,9 +272,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests TestHelpers.InMethod(); // TestHelpers.EnableLogging(); - string script = + string script = @"default -{ +{ state_entry() { integer i = 0; @@ -293,9 +293,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests TestHelpers.InMethod(); // TestHelpers.EnableLogging(); - string script = + string script = @"default -{ +{ state_entry() { integer i = 0; @@ -315,15 +315,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests TestHelpers.InMethod(); // TestHelpers.EnableLogging(); - string script = + string script = @"default -{ +{ state_entry() { integer i = 0; llSay(0, ""Thin Lizzy""); - do + do { llSay(0, ""Iter "" + (string)i++); } while (1 == 1); @@ -339,15 +339,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests TestHelpers.InMethod(); TestHelpers.EnableLogging(); - string script = + string script = @"default -{ +{ state_entry() { integer i = 0; llSay(0, ""Thin Lizzy""); - @p1; + @p1; llSay(0, ""Iter "" + (string)i++); jump p1; } @@ -364,7 +364,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests TestHelpers.InMethod(); // TestHelpers.EnableLogging(); - string script = + string script = @" integer i = 0; @@ -375,7 +375,7 @@ ufn1() } default -{ +{ state_entry() { integer i = 0; @@ -396,9 +396,9 @@ default TestHelpers.InMethod(); // TestHelpers.EnableLogging(); - string script = + string script = @"default -{ +{ state_entry() { integer i = 0; @@ -417,7 +417,7 @@ default // UUID objectId = TestHelpers.ParseTail(0x100); // UUID itemId = TestHelpers.ParseTail(0x3); - SceneObjectGroup so + SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId, string.Format("Object for {0}", itemName), 0x100); m_scene.AddNewSceneObject(so, true); @@ -505,7 +505,7 @@ default if (++m_chatMessagesReceived >= m_chatMessagesThreshold) { - m_scene.EventManager.OnChatFromWorld -= OnChatFromWorld; + m_scene.EventManager.OnChatFromWorld -= OnChatFromWorld; m_chatEvent.Set(); } } diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index 738a814..f16fd01 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs @@ -1495,7 +1495,7 @@ namespace OpenSim.Region.ScriptEngine.Shared return false; } } - + public static bool operator true(key k) { return (Boolean)k; @@ -1575,7 +1575,7 @@ namespace OpenSim.Region.ScriptEngine.Shared string s = String.Format(Culture.FormatProvider, "{0:0.000000}", f.value); m_string = s; } - + public LSLString(int i) { string s = String.Format("{0}", i); @@ -1583,7 +1583,7 @@ namespace OpenSim.Region.ScriptEngine.Shared } public LSLString(LSLInteger i) : this(i.value) {} - + #endregion #region Operators @@ -1648,7 +1648,7 @@ namespace OpenSim.Region.ScriptEngine.Shared { return new LSLString(d); } - + static public explicit operator LSLString(int i) { return new LSLString(i); @@ -1936,7 +1936,7 @@ namespace OpenSim.Region.ScriptEngine.Shared return false; } } - + return value == ((LSLInteger)o).value; } diff --git a/OpenSim/Region/ScriptEngine/Shared/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/Properties/AssemblyInfo.cs index d08b0a6..a5362a4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Properties/AssemblyInfo.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("OpenSim.Region.ScriptEngine.Shared")] @@ -14,8 +14,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] @@ -25,7 +25,7 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs index 30dc4cd..4dc8fc6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs @@ -112,7 +112,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests public void TearDown() { MainServer.Instance.Stop(); - } + } [Test] public void TestLlReleaseUrl() @@ -204,8 +204,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests // Check that request to URL works. string testResponse = "Hello World"; - m_engine.ClearPostedEvents(); - m_engine.PostEventHook + m_engine.ClearPostedEvents(); + m_engine.PostEventHook += (itemId, evp) => m_lslApi.llHTTPResponse(evp.Params[0].ToString(), 200, testResponse); // Console.WriteLine("Trying {0}", returnedUri); diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs index 9b7cab2..d652b0d1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs @@ -160,7 +160,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests // Item has copy permissions so original should stay intact. List originalItems = so1.RootPart.Inventory.GetInventoryItems(); Assert.That(originalItems.Count, Is.EqualTo(1)); - + // Should now have copied. List copiedItems = so2.RootPart.Inventory.GetInventoryItems(inventoryItemName); Assert.That(copiedItems.Count, Is.EqualTo(1)); @@ -194,7 +194,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests api.llGiveInventory(user2Id.ToString(), inventoryItemName); - InventoryItemBase receivedItem + InventoryItemBase receivedItem = UserInventoryHelpers.GetInventoryItem( m_scene.InventoryService, user2Id, string.Format("Objects/{0}", inventoryItemName)); @@ -222,7 +222,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests // Create an object embedded inside the first UUID itemId = TestHelpers.ParseTail(0x20); - TaskInventoryItem tii + TaskInventoryItem tii = TaskInventoryHelpers.AddSceneObject(m_scene.AssetService, so1.RootPart, inventoryItemName, itemId, user1Id); tii.NextPermissions &= ~((uint)PermissionMask.Modify); @@ -230,7 +230,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests api.llGiveInventory(user2Id.ToString(), inventoryItemName); - InventoryItemBase receivedItem + InventoryItemBase receivedItem = UserInventoryHelpers.GetInventoryItem( m_scene.InventoryService, user2Id, string.Format("Objects/{0}", inventoryItemName)); diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs index 14b1890..435a95f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs @@ -127,7 +127,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests TaskInventoryItem grp1Item = TaskInventoryHelpers.AddNotecard( m_scene.AssetService, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!"); - + grp1Item.PermsMask |= ScriptBaseClass.PERMISSION_CHANGE_LINKS; LSL_Api apiGrp1 = new LSL_Api(); @@ -156,7 +156,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests TaskInventoryItem grp1Item = TaskInventoryHelpers.AddNotecard( m_scene.AssetService, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!"); - + grp1Item.PermsMask |= ScriptBaseClass.PERMISSION_CHANGE_LINKS; LSL_Api apiGrp1 = new LSL_Api(); diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs index 34a29e6..f978138 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs @@ -37,7 +37,7 @@ using OpenSim.Region.ScriptEngine.Shared.Api; using OpenSim.Region.ScriptEngine.Shared.Instance; using OpenSim.Region.ScriptEngine.Shared.ScriptBase; using OpenMetaverse; - + using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat; using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list; @@ -69,7 +69,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests m_lslApi = new LSL_Api(); m_lslApi.Initialize(engine, part, null); } - + [Test] public void TestllListFindList() { diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs index 9ab3115..a341311 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs @@ -76,7 +76,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests string[] ncLines = { "One", "Twoè", "Three" }; - TaskInventoryItem ncItem + TaskInventoryItem ncItem = TaskInventoryHelpers.AddNotecard(m_scene.AssetService, m_so.RootPart, "nc", "1", "10", string.Join("\n", ncLines)); AssertValidNotecardLine(ncItem.Name, 0, ncLines[0]); @@ -111,7 +111,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests { string key = m_lslApi.llGetNotecardLine(ncName, lineNumber); Assert.That(key, Is.Not.EqualTo(UUID.Zero.ToString())); - + Assert.That(m_engine.PostedEvents.Count, Is.EqualTo(1)); Assert.That(m_engine.PostedEvents.ContainsKey(m_scriptItem.ItemID)); @@ -223,8 +223,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests // // Check that request to URL works. // string testResponse = "Hello World"; // -// m_engine.ClearPostedEvents(); -// m_engine.PostEventHook +// m_engine.ClearPostedEvents(); +// m_engine.PostEventHook // += (itemId, evp) => m_lslApi.llHTTPResponse(evp.Params[0].ToString(), 200, testResponse); // //// Console.WriteLine("Trying {0}", returnedUri); diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs index d957bf2..b994901 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs @@ -93,7 +93,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests // Check simple 1 prim case { - LSL_List resList + LSL_List resList = apiGrp1.llGetLinkPrimitiveParams(1, new LSL_List(new LSL_Integer(ScriptBaseClass.PRIM_ROTATION))); Assert.That(resList.Length, Is.EqualTo(1)); @@ -101,11 +101,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests // Check 2 prim case { - LSL_List resList + LSL_List resList = apiGrp1.llGetLinkPrimitiveParams( - 1, + 1, new LSL_List( - new LSL_Integer(ScriptBaseClass.PRIM_ROTATION), + new LSL_Integer(ScriptBaseClass.PRIM_ROTATION), new LSL_Integer(ScriptBaseClass.PRIM_LINK_TARGET), new LSL_Integer(2), new LSL_Integer(ScriptBaseClass.PRIM_ROTATION))); @@ -115,7 +115,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests // Check invalid parameters are ignored { - LSL_List resList + LSL_List resList = apiGrp1.llGetLinkPrimitiveParams(3, new LSL_List(new LSL_Integer(ScriptBaseClass.PRIM_ROTATION))); Assert.That(resList.Length, Is.EqualTo(0)); @@ -123,11 +123,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests // Check all parameters are ignored if an initial bad link is given { - LSL_List resList + LSL_List resList = apiGrp1.llGetLinkPrimitiveParams( - 3, + 3, new LSL_List( - new LSL_Integer(ScriptBaseClass.PRIM_ROTATION), + new LSL_Integer(ScriptBaseClass.PRIM_ROTATION), new LSL_Integer(ScriptBaseClass.PRIM_LINK_TARGET), new LSL_Integer(1), new LSL_Integer(ScriptBaseClass.PRIM_ROTATION))); @@ -137,11 +137,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests // Check only subsequent parameters are ignored when we hit the first bad link number { - LSL_List resList + LSL_List resList = apiGrp1.llGetLinkPrimitiveParams( - 1, + 1, new LSL_List( - new LSL_Integer(ScriptBaseClass.PRIM_ROTATION), + new LSL_Integer(ScriptBaseClass.PRIM_ROTATION), new LSL_Integer(ScriptBaseClass.PRIM_LINK_TARGET), new LSL_Integer(3), new LSL_Integer(ScriptBaseClass.PRIM_ROTATION))); @@ -197,7 +197,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests new LSL_Types.Vector3(0.0d, 1.0d, 0.0d), // Prim cut 0.90f, // Prim hollow new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim twist - new LSL_Types.Vector3(2.0d, 1.0d, 0.0d), // Prim taper + new LSL_Types.Vector3(2.0d, 1.0d, 0.0d), // Prim taper new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim shear 0.90f); // Prim hollow check @@ -211,7 +211,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests new LSL_Types.Vector3(0.0d, 1.0d, 0.0d), // Prim cut 0.99f, // Prim hollow new LSL_Types.Vector3(1.0d, 0.0d, 0.0d), // Prim twist - new LSL_Types.Vector3(1.0d, 1.0d, 0.0d), // Prim taper + new LSL_Types.Vector3(1.0d, 1.0d, 0.0d), // Prim taper new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim shear 0.99f); // Prim hollow check @@ -252,7 +252,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests new LSL_Types.Vector3(0.7d + 0.2d, 0.0d, 0.0d), // Prim twist // Expression for y selected to test precision problems during sbyte // cast in SetPrimitiveShapeParams. - new LSL_Types.Vector3(2.0d, (1.3d + 0.1d), 0.0d), // Prim taper + new LSL_Types.Vector3(2.0d, (1.3d + 0.1d), 0.0d), // Prim taper new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim shear 0.70f); // Prim hollow check diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs index d929da8..98800d0 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs @@ -88,19 +88,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests CheckllAngleBetween(new Vector3(1, 1, 1), 0, 1, 1); CheckllAngleBetween(new Vector3(1, 1, 1), 90, 1, 1); CheckllAngleBetween(new Vector3(1, 1, 1), 180, 1, 1); - + CheckllAngleBetween(new Vector3(1, 0, 0), 0, 1.6f, 1.8f); CheckllAngleBetween(new Vector3(1, 0, 0), 90, 0.3f, 3.9f); CheckllAngleBetween(new Vector3(1, 0, 0), 180, 8.8f, 7.4f); - + CheckllAngleBetween(new Vector3(0, 1, 0), 0, 9.8f, -9.4f); CheckllAngleBetween(new Vector3(0, 1, 0), 90, 8.4f, -8.2f); CheckllAngleBetween(new Vector3(0, 1, 0), 180, 0.4f, -5.8f); - + CheckllAngleBetween(new Vector3(0, 0, 1), 0, -6.8f, 3.4f); CheckllAngleBetween(new Vector3(0, 0, 1), 90, -3.6f, 5.6f); CheckllAngleBetween(new Vector3(0, 0, 1), 180, -3.8f, 1.1f); - + CheckllAngleBetween(new Vector3(1, 1, 1), 0, -7.7f, -2.0f); CheckllAngleBetween(new Vector3(1, 1, 1), 90, -3.0f, -9.1f); CheckllAngleBetween(new Vector3(1, 1, 1), 180, -7.9f, -8.0f); @@ -246,7 +246,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests LSL_Types.Quaternion newRot = m_lslApi.llEuler2Rot(eulerCalc); // Multiple original quaternion by conjugate of quaternion calculated with angles. LSL_Types.Quaternion check = rot * new LSL_Types.Quaternion(-newRot.x, -newRot.y, -newRot.z, newRot.s); - + Assert.AreEqual(0.0, check.x, VECTOR_COMPONENT_ACCURACY, "TestllRot2Euler X bounds check fail"); Assert.AreEqual(0.0, check.y, VECTOR_COMPONENT_ACCURACY, "TestllRot2Euler Y bounds check fail"); Assert.AreEqual(0.0, check.z, VECTOR_COMPONENT_ACCURACY, "TestllRot2Euler Z bounds check fail"); diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs index c8c7f82..b2396fa 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs @@ -155,7 +155,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests m_stringDoubleSet.Add("1ef", 1.0); m_stringDoubleSet.Add("e10", 0.0); m_stringDoubleSet.Add("1.e0.0", 1.0); - + m_doubleStringSet = new Dictionary(); m_doubleStringSet.Add(2.0, "2.000000"); m_doubleStringSet.Add(-2.0, "-2.000000"); diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs index c664108..2bd684f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs @@ -131,7 +131,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests public void TestImplicitCastBooleanToLSLInteger() { TestHelpers.InMethod(); - + LSL_Types.LSLInteger testInteger; testInteger = (1 == 0); diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs index 8550f2d..0159b9e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs @@ -125,7 +125,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests public void TestImplicitCastBooleanToLSLFloat() { TestHelpers.InMethod(); - + LSL_Types.LSLString testString; testString = (LSL_Types.LSLString) (1 == 0); diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs index 99bff83..6936191 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs @@ -296,7 +296,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests string npcRaw = osslApi.osNpcCreate( "Jane", "Doe", new LSL_Types.Vector3(128, 128, 128), notecardName, ScriptBaseClass.OS_NPC_CREATOR_OWNED); - + otherOsslApi.osNpcRemove(npcRaw); // Should still be around @@ -340,7 +340,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests string npcRaw = osslApi.osNpcCreate( "Jane", "Doe", new LSL_Types.Vector3(128, 128, 128), notecardName, ScriptBaseClass.OS_NPC_NOT_OWNED); - + osslApi.osNpcRemove(npcRaw); UUID npcId = new UUID(npcRaw); -- cgit v1.1