2005-01-31 Zoltan Varga <vargaz@freemail.hu>

[mono.git] / mcs / class / Microsoft.JScript / Microsoft.JScript / CodeGenerator.cs

diff --git a/mcs/class/Microsoft.JScript/Microsoft.JScript/CodeGenerator.cs b/mcs/class/Microsoft.JScript/Microsoft.JScript/CodeGenerator.cs
index 97fa55baf9752290f19c2127f368dc59a47b02fe..e3ae60d76ea4793122c97e23b68e603da8dd8192 100644 (file)
--- a/mcs/class/Microsoft.JScript/Microsoft.JScript/CodeGenerator.cs
+++ b/mcs/class/Microsoft.JScript/Microsoft.JScript/CodeGenerator.cs
@@ -29,6 +29,7 @@
 //
 
 using System;
+using System.IO;
 using System.Reflection;
 using System.Reflection.Emit;
 using System.Threading;
@@ -77,18 +78,46 @@ namespace Microsoft.JScript {
                internal static AssemblyBuilder assembly_builder;
                internal static ModuleBuilder module_builder;
 
+               internal static string Basename (string name)
+               {
+                       int pos = name.LastIndexOf ('/');
+
+                       if (pos != -1)
+                               return name.Substring (pos + 1);
+
+                       pos = name.LastIndexOf ('\\');
+                       if (pos != -1)
+                               return name.Substring (pos + 1);
+
+                       return name;
+               }
+
+               internal static string Dirname (string name)
+               {
+                       int pos = name.LastIndexOf ('/');
+
+                        if (pos != -1)
+                                return name.Substring (0, pos);
+
+                        pos = name.LastIndexOf ('\\');
+                        if (pos != -1)
+                                return name.Substring (0, pos);
+
+                        return ".";
+               }
+
                internal static void Init (string file_name)
                {
                        app_domain = Thread.GetDomain ();
 
                        assembly_name = new AssemblyName ();
-                       assembly_name.Name =  trim_extension (file_name);
-
+                       assembly_name.Name = Path.GetFileNameWithoutExtension (file_name);
                        mod_name = MODULE;
 
                        assembly_builder = app_domain.DefineDynamicAssembly (
                                             assembly_name,
-                                            AssemblyBuilderAccess.RunAndSave);
+                                            AssemblyBuilderAccess.RunAndSave,
+                                            Dirname (file_name));
 
                        ConstructorInfo ctr_info = typeof (Microsoft.JScript.ReferenceAttribute).GetConstructor (new Type [] { typeof (string) });
                        // FIXME: find out which is the blob.
@@ -96,9 +125,9 @@ namespace Microsoft.JScript {
                        assembly_builder.SetCustomAttribute (ctr_info, blob); 
 
                        module_builder = assembly_builder.DefineDynamicModule (
-                                               mod_name,
-                                               assembly_name.Name + ".exe", 
-                                               false);
+                                              mod_name,
+                                              Basename (assembly_name.Name + ".exe"),
+                                              false);
                }
 
                internal static string trim_extension (string file_name)
@@ -113,7 +142,7 @@ namespace Microsoft.JScript {
 
                internal static void Save (string target_name)
                {
-                       assembly_builder.Save (target_name);
+                       assembly_builder.Save (CodeGenerator.Basename (target_name));
                }
 
                internal static void Emit (AST prog)
@@ -309,7 +338,6 @@ namespace Microsoft.JScript {
 
                internal static void fall_true (EmitContext ec, AST ast, Label lbl)
                {
-                       ILGenerator ig = ec.ig;
                        Type type = ast.GetType ();
 
                        if (type == typeof (Expression)) {  
@@ -327,9 +355,11 @@ namespace Microsoft.JScript {
                                emit_default_case (ec, ast, OpCodes.Brfalse, lbl);
                }
 
-               static void ff_emit_relational (ILGenerator ig, AST ast, Label lbl)
+               static void ff_emit_relational (EmitContext ec, AST ast, Label lbl)
                {
+                       ILGenerator ig = ec.ig;
                        Relational r = ast as Relational;
+                       r.Emit (ec);
 
                        switch (r.op) {
                        case JSToken.LessThan:
@@ -360,20 +390,44 @@ namespace Microsoft.JScript {
                        }
                }
 
-               internal static void fall_false (EmitContext ec, AST ast, Label lbl)
+               static void ff_emit_equality_cond (EmitContext ec, AST ast, Label lbl)
                {
                        ILGenerator ig = ec.ig;
+                       Equality eq = ast as Equality;
+                       eq.Emit (ec);
+
+                       switch (eq.op) {
+                       case JSToken.NotEqual:
+                       case JSToken.Equal:
+                               ig.Emit (OpCodes.Brfalse, lbl);
+                               break;
+                       }
+               }
+                       
+               internal static void fall_false (EmitContext ec, AST ast, Label lbl)
+               {
                        Type type = ast.GetType ();
 
                        if (type == typeof (Expression)) {  
                                Expression exp = ast as Expression;
-                               exp.Emit (ec);
+
+                               if (exp.Size > 1)
+                                       exp.Emit (ec);
+
                                AST last_exp = (AST) exp.exprs [exp.exprs.Count - 1];
 
                                if (last_exp is Relational)
-                                       ff_emit_relational (ec.ig, last_exp, lbl);
+                                       ff_emit_relational (ec, last_exp, lbl);
                                else if (last_exp is Binary)
                                        ff_binary_recursion (ec, last_exp, lbl);
+                               else if (last_exp is Identifier || last_exp is BooleanLiteral)
+                                       emit_default_case (ec, last_exp, OpCodes.Brtrue, lbl);
+                               else if (last_exp is Equality) 
+                                       ff_emit_equality_cond (ec, last_exp, lbl);
+                               else {
+                                       Console.WriteLine ("fall_false, last_exp.GetType () == {0}", last_exp);
+                                       throw new Exception ("uknown type: " + last_exp.GetType ().ToString ());
+                               }
                        } else if (type == typeof (Binary))
                                ff_binary_recursion (ec, ast, lbl);
                        else 
@@ -405,5 +459,22 @@ namespace Microsoft.JScript {
                        } else 
                                return false;
                }
+               
+               //
+               // Loads a current VsaEngine
+               //
+               internal static void load_engine (AST parent, ILGenerator ig)
+               {
+                       //
+                       // If we are in a function declaration at global level,
+                       // we must load the engine associated to the current 'JScript N' instance,
+                       // otherwise pick up the engine at second place in method's signature.
+                       //
+                       if (parent == null ||  parent.GetType () == typeof (ScriptBlock)) {
+                               ig.Emit (OpCodes.Ldarg_0);
+                               ig.Emit (OpCodes.Ldfld, typeof (ScriptObject).GetField ("engine"));
+                       } else if (parent != null &&  parent.GetType () == typeof (FunctionDeclaration )) 
+                               ig.Emit (OpCodes.Ldarg_1);
+               }
        }
 }