diff options
author | Adam Frisby | 2008-04-21 07:09:17 +0000 |
---|---|---|
committer | Adam Frisby | 2008-04-21 07:09:17 +0000 |
commit | fef3b3689492dea63693c964bcdbec9f5137eb5e (patch) | |
tree | 7791eef001d85d3e1de863a68f26ff9434d062ca /OpenSim/Region/ScriptEngine/LSOEngine/LSO | |
parent | * Terrain Module code has been reformatted to comply with guidelines. (diff) | |
download | opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2 opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz |
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to '')
5 files changed, 12 insertions, 25 deletions
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs index 54328ff..0208350 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs | |||
@@ -33,7 +33,6 @@ using System.Reflection.Emit; | |||
33 | using System.Text; | 33 | using System.Text; |
34 | using System.Threading; | 34 | using System.Threading; |
35 | using OpenSim.Region.ScriptEngine.Common; | 35 | using OpenSim.Region.ScriptEngine.Common; |
36 | using OpenSim.Region.ScriptEngine.LSOEngine.LSO; | ||
37 | 36 | ||
38 | namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO | 37 | namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO |
39 | { | 38 | { |
@@ -59,11 +58,11 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO | |||
59 | string DLL_FileName = asmName.Name + ".dll"; | 58 | string DLL_FileName = asmName.Name + ".dll"; |
60 | string DLL_FileName_WithPath = Path.GetDirectoryName(LSO_FileName) + @"\" + DLL_FileName; | 59 | string DLL_FileName_WithPath = Path.GetDirectoryName(LSO_FileName) + @"\" + DLL_FileName; |
61 | 60 | ||
62 | LSOEngine.LSO.Common.SendToLog("LSO File Name: " + Path.GetFileName(LSO_FileName)); | 61 | Common.SendToLog("LSO File Name: " + Path.GetFileName(LSO_FileName)); |
63 | LSOEngine.LSO.Common.SendToLog("Assembly name: " + asmName.Name); | 62 | Common.SendToLog("Assembly name: " + asmName.Name); |
64 | LSOEngine.LSO.Common.SendToLog("Assembly File Name: " + asmName.Name + ".dll"); | 63 | Common.SendToLog("Assembly File Name: " + asmName.Name + ".dll"); |
65 | LSOEngine.LSO.Common.SendToLog("Starting processing of LSL ByteCode..."); | 64 | Common.SendToLog("Starting processing of LSL ByteCode..."); |
66 | LSOEngine.LSO.Common.SendToLog(String.Empty); | 65 | Common.SendToLog(String.Empty); |
67 | 66 | ||
68 | 67 | ||
69 | // Create Assembly | 68 | // Create Assembly |
@@ -104,7 +103,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO | |||
104 | LSOP.Parse(); | 103 | LSOP.Parse(); |
105 | 104 | ||
106 | // Constructor has to be created AFTER LSO_Parser because of accumulated variables | 105 | // Constructor has to be created AFTER LSO_Parser because of accumulated variables |
107 | if (LSOEngine.LSO.Common.IL_CreateConstructor) | 106 | if (Common.IL_CreateConstructor) |
108 | IL_CREATE_CONSTRUCTOR(typeBuilder, LSOP); | 107 | IL_CREATE_CONSTRUCTOR(typeBuilder, LSOP); |
109 | 108 | ||
110 | LSOP.CloseFile(); | 109 | LSOP.CloseFile(); |
@@ -113,15 +112,15 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO | |||
113 | */ | 112 | */ |
114 | 113 | ||
115 | 114 | ||
116 | LSOEngine.LSO.Common.SendToLog("Attempting to compile assembly..."); | 115 | Common.SendToLog("Attempting to compile assembly..."); |
117 | // Compile it | 116 | // Compile it |
118 | Type type = typeBuilder.CreateType(); | 117 | Type type = typeBuilder.CreateType(); |
119 | LSOEngine.LSO.Common.SendToLog("Compilation successful!"); | 118 | Common.SendToLog("Compilation successful!"); |
120 | 119 | ||
121 | LSOEngine.LSO.Common.SendToLog("Saving assembly: " + DLL_FileName); | 120 | Common.SendToLog("Saving assembly: " + DLL_FileName); |
122 | asmBuilder.Save(DLL_FileName); | 121 | asmBuilder.Save(DLL_FileName); |
123 | 122 | ||
124 | LSOEngine.LSO.Common.SendToLog("Returning assembly filename: " + DLL_FileName); | 123 | Common.SendToLog("Returning assembly filename: " + DLL_FileName); |
125 | 124 | ||
126 | 125 | ||
127 | return DLL_FileName; | 126 | return DLL_FileName; |
@@ -166,7 +165,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO | |||
166 | 165 | ||
167 | private static void IL_CREATE_CONSTRUCTOR(TypeBuilder typeBuilder, LSO_Parser LSOP) | 166 | private static void IL_CREATE_CONSTRUCTOR(TypeBuilder typeBuilder, LSO_Parser LSOP) |
168 | { | 167 | { |
169 | LSOEngine.LSO.Common.SendToDebug("IL_CREATE_CONSTRUCTOR()"); | 168 | Common.SendToDebug("IL_CREATE_CONSTRUCTOR()"); |
170 | //ConstructorBuilder constructor = typeBuilder.DefineConstructor( | 169 | //ConstructorBuilder constructor = typeBuilder.DefineConstructor( |
171 | // MethodAttributes.Public, | 170 | // MethodAttributes.Public, |
172 | // CallingConventions.Standard, | 171 | // CallingConventions.Standard, |
@@ -235,7 +234,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO | |||
235 | Type datatype = null; | 234 | Type datatype = null; |
236 | 235 | ||
237 | // Push data to stack | 236 | // Push data to stack |
238 | LSOEngine.LSO.Common.SendToDebug("Adding to static (" + pos + ") type: " + | 237 | Common.SendToDebug("Adding to static (" + pos + ") type: " + |
239 | ((LSO_Enums.Variable_Type_Codes) sb.ObjectType).ToString() + " (" + sb.ObjectType + | 238 | ((LSO_Enums.Variable_Type_Codes) sb.ObjectType).ToString() + " (" + sb.ObjectType + |
240 | ")"); | 239 | ")"); |
241 | switch ((LSO_Enums.Variable_Type_Codes) sb.ObjectType) | 240 | switch ((LSO_Enums.Variable_Type_Codes) sb.ObjectType) |
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/IL_common_functions.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/IL_common_functions.cs index 60d68f5..6d0e35c 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/IL_common_functions.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/IL_common_functions.cs | |||
@@ -26,10 +26,6 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | /* Original code: Tedd Hansen */ | 28 | /* Original code: Tedd Hansen */ |
29 | using System; | ||
30 | using System.Reflection; | ||
31 | using System.Reflection.Emit; | ||
32 | |||
33 | namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO | 29 | namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO |
34 | { | 30 | { |
35 | internal partial class LSO_Parser | 31 | internal partial class LSO_Parser |
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs index ad216aa..1b73311 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs | |||
@@ -25,9 +25,6 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | |||
31 | namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO | 28 | namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO |
32 | { | 29 | { |
33 | //public partial class LSL_BaseClass | 30 | //public partial class LSL_BaseClass |
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs index a110c28..e4a57e8 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs | |||
@@ -33,7 +33,6 @@ using System.IO; | |||
33 | using System.Reflection; | 33 | using System.Reflection; |
34 | using System.Reflection.Emit; | 34 | using System.Reflection.Emit; |
35 | using System.Text; | 35 | using System.Text; |
36 | using OpenSim.Region.ScriptEngine.LSOEngine.LSO; | ||
37 | 36 | ||
38 | namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO | 37 | namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO |
39 | { | 38 | { |
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs index 3b5ca0f..f035c03 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs | |||
@@ -25,10 +25,6 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.IO; | ||
31 | using System.Text; | ||
32 | using OpenSim.Region.ScriptEngine.LSOEngine.LSO; | 28 | using OpenSim.Region.ScriptEngine.LSOEngine.LSO; |
33 | 29 | ||
34 | namespace OpenSim.Region.ScriptEngine.LSOEngine | 30 | namespace OpenSim.Region.ScriptEngine.LSOEngine |