1 files changed, 70 insertions, 79 deletions

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSO/Engine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSO/Engine.cs
index f060f06..97981cc 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSO/Engine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSO/Engine.cs
@@ -27,20 +27,19 @@
 */
 /* Original code: Tedd Hansen */
 using System;
+using System.IO;
 using System.Reflection;
 using System.Reflection.Emit;
+using System.Text;
 using System.Threading;
 
-
 namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSO
 {
-
-
     public class Engine
     {
         //private string LSO_FileName = @"LSO\AdditionTest.lso";
-        private string LSO_FileName;// = @"LSO\CloseToDefault.lso";
-        AppDomain appDomain;
+        private string LSO_FileName; // = @"LSO\CloseToDefault.lso";
+        private AppDomain appDomain;
 
         public string Compile(string LSOFileName)
         {
@@ -52,20 +51,19 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSO
 
             // Create Assembly Name
             AssemblyName asmName = new AssemblyName();
-            asmName.Name = System.IO.Path.GetFileNameWithoutExtension(LSO_FileName);
+            asmName.Name = Path.GetFileNameWithoutExtension(LSO_FileName);
             //asmName.Name = "TestAssembly";
 
             string DLL_FileName = asmName.Name + ".dll";
-            string DLL_FileName_WithPath = System.IO.Path.GetDirectoryName(LSO_FileName) + @"\" + DLL_FileName;
+            string DLL_FileName_WithPath = Path.GetDirectoryName(LSO_FileName) + @"\" + DLL_FileName;
 
-            Common.SendToLog("LSO File Name: " + System.IO.Path.GetFileName(LSO_FileName));
+            Common.SendToLog("LSO File Name: " + Path.GetFileName(LSO_FileName));
             Common.SendToLog("Assembly name: " + asmName.Name);
             Common.SendToLog("Assembly File Name: " + asmName.Name + ".dll");
             Common.SendToLog("Starting processing of LSL ByteCode...");
             Common.SendToLog("");
 
 
-
             // Create Assembly
             AssemblyBuilder asmBuilder = appDomain.DefineDynamicAssembly(
                 asmName,
@@ -78,15 +76,15 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSO
 
             // Create a module (and save to disk)
             ModuleBuilder modBuilder = asmBuilder.DefineDynamicModule
-                            (asmName.Name,
-                            DLL_FileName);
+                (asmName.Name,
+                 DLL_FileName);
 
             //Common.SendToDebug("asmName.Name is still \"" + asmName.Name + "\"");
             // Create a Class (/Type)
             TypeBuilder typeBuilder = modBuilder.DefineType(
-                                    "LSL_ScriptObject",
-                                    TypeAttributes.Public | TypeAttributes.BeforeFieldInit,
-                                    typeof(OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSO.LSL_BaseClass));
+                "LSL_ScriptObject",
+                TypeAttributes.Public | TypeAttributes.BeforeFieldInit,
+                typeof (LSL_BaseClass));
             //,
             //                        typeof());
             //, typeof(LSL_BuiltIn_Commands_Interface));
@@ -95,7 +93,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSO
             //                        new Type[] { typeof(LSL_CLRInterface.LSLScript) });
 
 
-
             /*
              * Generate the IL itself
              */
@@ -123,7 +120,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSO
             asmBuilder.Save(DLL_FileName);
 
             Common.SendToLog("Returning assembly filename: " + DLL_FileName);
-            
+
 
             return DLL_FileName;
 
@@ -135,9 +132,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSO
             //object MyScript = (object)Activator.CreateInstance(type);
 
 
-
-
-
             //System.Reflection.MemberInfo[] Members = type.GetMembers();
 
             //Common.SendToLog("Members of assembly " + type.ToString() + ":");
@@ -165,29 +159,25 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSO
             //    type.InvokeMember(s, BindingFlags.InvokeMethod, null, MyScript, new object[] { "Test" });
 
             //}
-
-            
         }
 
 
         private static void IL_CREATE_CONSTRUCTOR(TypeBuilder typeBuilder, LSO_Parser LSOP)
         {
-
-
             Common.SendToDebug("IL_CREATE_CONSTRUCTOR()");
             //ConstructorBuilder constructor = typeBuilder.DefineConstructor(
             //            MethodAttributes.Public,
             //            CallingConventions.Standard, 
             //            new Type[0]);
             ConstructorBuilder constructor = typeBuilder.DefineConstructor(
-                        MethodAttributes.Public |
-                        MethodAttributes.SpecialName |
-                        MethodAttributes.RTSpecialName,
-                        CallingConventions.Standard,
-                        new Type[0]);
+                MethodAttributes.Public |
+                MethodAttributes.SpecialName |
+                MethodAttributes.RTSpecialName,
+                CallingConventions.Standard,
+                new Type[0]);
 
             //Define the reflection ConstructorInfor for System.Object
-            ConstructorInfo conObj = typeof(LSL_BaseClass).GetConstructor(new Type[0]);
+            ConstructorInfo conObj = typeof (LSL_BaseClass).GetConstructor(new Type[0]);
 
             //call constructor of base object
             ILGenerator il = constructor.GetILGenerator();
@@ -230,58 +220,61 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSO
                 LSO_Struct.StaticBlock sb;
                 LSOP.StaticBlocks.TryGetValue(pos, out sb);
 
-                if (sb.ObjectType > 0 && sb.ObjectType < 8) { // We don't want void or null's
-
-                il.Emit(OpCodes.Ldarg_0);
-                // Push position to stack
-                il.Emit(OpCodes.Ldc_I4, pos);
-                //il.Emit(OpCodes.Box, typeof(UInt32));
-
-
-                Type datatype = null;
-
-                // Push data to stack
-                Common.SendToDebug("Adding to static (" + pos + ") type: " + ((LSO_Enums.Variable_Type_Codes)sb.ObjectType).ToString() + " (" + sb.ObjectType + ")");
-                switch ((LSO_Enums.Variable_Type_Codes)sb.ObjectType)
+                if (sb.ObjectType > 0 && sb.ObjectType < 8)
                 {
-                    case LSO_Enums.Variable_Type_Codes.Float:
-                    case LSO_Enums.Variable_Type_Codes.Integer:
-                        //UInt32
-                        il.Emit(OpCodes.Ldc_I4, BitConverter.ToUInt32(sb.BlockVariable, 0));
-                        datatype = typeof(UInt32);
-                        il.Emit(OpCodes.Box, datatype);
-                        break;
-                    case LSO_Enums.Variable_Type_Codes.String:
-                    case LSO_Enums.Variable_Type_Codes.Key:
-                        //String
-                        LSO_Struct.HeapBlock hb = LSOP.GetHeap(LSOP.myHeader.HR + BitConverter.ToUInt32(sb.BlockVariable, 0) - 1);
-                        il.Emit(OpCodes.Ldstr, System.Text.Encoding.UTF8.GetString(hb.Data));
-                        datatype = typeof(string);
-                        break;
-                    case LSO_Enums.Variable_Type_Codes.Vector:
-                        datatype = typeof(LSO_Enums.Vector);
-                        //TODO: Not implemented
-                        break;
-                    case LSO_Enums.Variable_Type_Codes.Rotation:
-                        //Object
-                        //TODO: Not implemented
-                        datatype = typeof(LSO_Enums.Rotation);
-                        break;
-                    default:
-                        datatype = typeof(object);
-                        break;
-                }
-
-
-                // Make call
-                il.Emit(OpCodes.Call, typeof(LSL_BaseClass).GetMethod("AddToStatic", new Type[] { typeof(UInt32), datatype }));
+                    // We don't want void or null's
+
+                    il.Emit(OpCodes.Ldarg_0);
+                    // Push position to stack
+                    il.Emit(OpCodes.Ldc_I4, pos);
+                    //il.Emit(OpCodes.Box, typeof(UInt32));
+
+
+                    Type datatype = null;
+
+                    // Push data to stack
+                    Common.SendToDebug("Adding to static (" + pos + ") type: " +
+                                       ((LSO_Enums.Variable_Type_Codes) sb.ObjectType).ToString() + " (" + sb.ObjectType +
+                                       ")");
+                    switch ((LSO_Enums.Variable_Type_Codes) sb.ObjectType)
+                    {
+                        case LSO_Enums.Variable_Type_Codes.Float:
+                        case LSO_Enums.Variable_Type_Codes.Integer:
+                            //UInt32
+                            il.Emit(OpCodes.Ldc_I4, BitConverter.ToUInt32(sb.BlockVariable, 0));
+                            datatype = typeof (UInt32);
+                            il.Emit(OpCodes.Box, datatype);
+                            break;
+                        case LSO_Enums.Variable_Type_Codes.String:
+                        case LSO_Enums.Variable_Type_Codes.Key:
+                            //String
+                            LSO_Struct.HeapBlock hb =
+                                LSOP.GetHeap(LSOP.myHeader.HR + BitConverter.ToUInt32(sb.BlockVariable, 0) - 1);
+                            il.Emit(OpCodes.Ldstr, Encoding.UTF8.GetString(hb.Data));
+                            datatype = typeof (string);
+                            break;
+                        case LSO_Enums.Variable_Type_Codes.Vector:
+                            datatype = typeof (LSO_Enums.Vector);
+                            //TODO: Not implemented
+                            break;
+                        case LSO_Enums.Variable_Type_Codes.Rotation:
+                            //Object
+                            //TODO: Not implemented
+                            datatype = typeof (LSO_Enums.Rotation);
+                            break;
+                        default:
+                            datatype = typeof (object);
+                            break;
+                    }
+
+
+                    // Make call
+                    il.Emit(OpCodes.Call,
+                            typeof (LSL_BaseClass).GetMethod("AddToStatic", new Type[] {typeof (UInt32), datatype}));
                 }
-
             }
 
 
-
-
             ////il.Emit(OpCodes.Newobj, typeof(UInt32));
             //il.Emit(OpCodes.Starg_0);
             //// Create LSL function library
@@ -293,8 +286,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSO
         }
 
 
-
-
         // End of class
     }
-}
+}
\ No newline at end of file