*** empty log message ***
[mono.git] / mcs / mcs / expression.cs
index 2036b888886eae3aa8493ec6109b4c59d54ddc30..47062869ba4d7debd08537c82e3f4ba17dfd3f9d 100755 (executable)
@@ -15,9 +15,9 @@
 //
 
 namespace CIR {
+       using System;
        using System.Collections;
        using System.Diagnostics;
-       using System;
        using System.Reflection;
        using System.Reflection.Emit;
        using System.Text;
@@ -69,6 +69,27 @@ namespace CIR {
                        }
                }
 
+               // <summary>
+               //   Utility wrapper routine for Error, just to beautify the code
+               // </summary>
+               static protected void Error (TypeContainer tc, int error, string s)
+               {
+                       tc.RootContext.Report.Error (error, s);
+               }
+
+               static protected void Error (TypeContainer tc, int error, Location l, string s)
+               {
+                       tc.RootContext.Report.Error (error, l, s);
+               }
+               
+               // <summary>
+               //   Utility wrapper routine for Warning, just to beautify the code
+               // </summary>
+               static protected void Warning (TypeContainer tc, int warning, string s)
+               {
+                       tc.RootContext.Report.Warning (warning, s);
+               }
+
                // <summary>
                //   Performs semantic analysis on the Expression
                // </summary>
@@ -98,8 +119,32 @@ namespace CIR {
                //   expression).
                // </remarks>
                
-               public abstract Expression Resolve (TypeContainer tc);
+               public abstract Expression DoResolve (TypeContainer tc);
+
+
+               //
+               // Currently Resolve wraps DoResolve to perform sanity
+               // checking and assertion checking on what we expect from Resolve
+               //
+
+               public Expression Resolve (TypeContainer tc)
+               {
+                       Expression e = DoResolve (tc);
+
+                       if (e != null){
+                               if (e.ExprClass == ExprClass.Invalid)
+                                       throw new Exception ("Expression " + e +
+                                                            " ExprClass is Invalid after resolve");
 
+                               if (e.ExprClass != ExprClass.MethodGroup)
+                                       if (e.type == null)
+                                               throw new Exception ("Expression " + e +
+                                                                    " did not set its type after Resolve");
+                       }
+
+                       return e;
+               }
+                      
                // <summary>
                //   Emits the code for the expression
                // </summary>
@@ -123,15 +168,60 @@ namespace CIR {
                        type = null;
                }
 
+               // <summary>
+               //   Returns a literalized version of a literal FieldInfo
+               // </summary>
+               static Expression Literalize (FieldInfo fi)
+               {
+                       Type t = fi.FieldType;
+                       object v = fi.GetValue (fi);
+
+                       if (t == TypeManager.int32_type)
+                               return new IntLiteral ((int) v);
+                       else if (t == TypeManager.uint32_type)
+                               return new UIntLiteral ((uint) v);
+                       else if (t == TypeManager.int64_type)
+                               return new LongLiteral ((long) v);
+                       else if (t == TypeManager.uint64_type)
+                               return new ULongLiteral ((ulong) v);
+                       else if (t == TypeManager.float_type)
+                               return new FloatLiteral ((float) v);
+                       else if (t == TypeManager.double_type)
+                               return new DoubleLiteral ((double) v);
+                       else if (t == TypeManager.string_type)
+                               return new StringLiteral ((string) v);
+                       else if (t == TypeManager.short_type)
+                               return new IntLiteral ((int) ((short)v));
+                       else if (t == TypeManager.ushort_type)
+                               return new IntLiteral ((int) ((ushort)v));
+                       else if (t == TypeManager.sbyte_type)
+                               return new IntLiteral ((int) ((sbyte)v));
+                       else if (t == TypeManager.byte_type)
+                               return new IntLiteral ((int) ((byte)v));
+                       else if (t == TypeManager.char_type)
+                               return new IntLiteral ((int) ((char)v));
+                       else
+                               throw new Exception ("Unknown type for literal (" + v.GetType () +
+                                                    "), details: " + fi);
+               }
+
                // 
                // Returns a fully formed expression after a MemberLookup
                //
-               static Expression ExprClassFromMemberInfo (MemberInfo mi)
+               static Expression ExprClassFromMemberInfo (TypeContainer tc, MemberInfo mi)
                {
                        if (mi is EventInfo){
                                return new EventExpr ((EventInfo) mi);
                        } else if (mi is FieldInfo){
-                               return new FieldExpr ((FieldInfo) mi);
+                               FieldInfo fi = (FieldInfo) mi;
+
+                               if (fi.IsLiteral){
+                                       Expression e = Literalize (fi);
+                                       e.Resolve (tc);
+
+                                       return e;
+                               } else
+                                       return new FieldExpr (fi);
                        } else if (mi is PropertyInfo){
                                return new PropertyExpr ((PropertyInfo) mi);
                        } else if (mi is Type)
@@ -167,24 +257,27 @@ namespace CIR {
                // This is so we can catch correctly attempts to invoke instance methods
                // from a static body (scan for error 120 in ResolveSimpleName).
                //
-               public static Expression MemberLookup (RootContext rc, Type t, string name,
-                                                         bool same_type, MemberTypes mt, BindingFlags bf)
+               public static Expression MemberLookup (TypeContainer tc, Type t, string name,
+                                                      bool same_type, MemberTypes mt, BindingFlags bf)
                {
                        if (same_type)
                                bf |= BindingFlags.NonPublic;
 
-                       MemberInfo [] mi = rc.TypeManager.FindMembers (t, mt, bf, Type.FilterName, name);
+                       MemberInfo [] mi = tc.RootContext.TypeManager.FindMembers (
+                               t, mt, bf, Type.FilterName, name);
 
                        if (mi == null)
                                return null;
                        
                        if (mi.Length == 1 && !(mi [0] is MethodBase))
-                               return Expression.ExprClassFromMemberInfo (mi [0]);
+                               return Expression.ExprClassFromMemberInfo (tc, mi [0]);
                        
                        for (int i = 0; i < mi.Length; i++)
                                if (!(mi [i] is MethodBase)){
-                                       rc.Report.Error (-5, "Do not know how to reproduce this case: " + 
-                                                        "Methods and non-Method with the same name, report this please");
+                                       Error (tc,
+                                              -5, "Do not know how to reproduce this case: " + 
+                                              "Methods and non-Method with the same name, " +
+                                              "report this please");
 
                                        for (i = 0; i < mi.Length; i++){
                                                Type tt = mi [i].GetType ();
@@ -213,49 +306,50 @@ namespace CIR {
                        BindingFlags.Static |
                        BindingFlags.Instance;
 
-               public static Expression MemberLookup (RootContext rc, Type t, string name,
+               public static Expression MemberLookup (TypeContainer tc, Type t, string name,
                                                       bool same_type)
                {
-                       return MemberLookup (rc, t, name, same_type, AllMemberTypes, AllBindingsFlags);
+                       return MemberLookup (tc, t, name, same_type, AllMemberTypes, AllBindingsFlags);
                }
-               
-               // <summary>
-               //   Resolves the E in `E.I' side for a member_access
-               //
-               //   This is suboptimal and should be merged with ResolveMemberAccess
-               // </summary>
-               static Expression ResolvePrimary (TypeContainer tc, string name)
-               {
-                       int dot_pos = name.LastIndexOf (".");
-
-                       if (tc.RootContext.IsNamespace (name))
-                               return new NamespaceExpr (name);
 
-                       if (dot_pos != -1){
-                       } else {
-                               Type t = tc.LookupType (name, false);
-
-                               if (t != null)
-                                       return new TypeExpr (t);
-                       }
-
-                       return null;
-               }
-                       
+               //
+               // I am in general unhappy with this implementation.
+               //
+               // I need to revise this.
+               //
                static public Expression ResolveMemberAccess (TypeContainer tc, string name)
                {
-                       Expression left_e;
+                       Expression left_e = null;
                        int dot_pos = name.LastIndexOf (".");
                        string left = name.Substring (0, dot_pos);
                        string right = name.Substring (dot_pos + 1);
+                       Type t;
 
-                       left_e = ResolvePrimary (tc, left);
-                       if (left_e == null)
+                       if ((t = tc.LookupType (left, false)) != null){
+                               Expression e;
+                               
+                               left_e = new TypeExpr (t);
+                               e = new MemberAccess (left_e, right);
+                               return e.Resolve (tc);
+                       } else {
+                               //
+                               // FIXME: IMplement:
+                               
+                               // Handle here:
+                               //    T.P  Static property access (P) on Type T.
+                               //    e.P  instance property access on instance e for P.
+                               //    p
+                               //
+                       }
+
+                       if (left_e == null){
+                               Error (tc, 246, "Can not find type or namespace `"+left+"'");
                                return null;
+                       }
 
                        switch (left_e.ExprClass){
                        case ExprClass.Type:
-                               return  MemberLookup (tc.RootContext,
+                               return  MemberLookup (tc,
                                                      left_e.Type, right,
                                                      left_e.Type == tc.TypeBuilder);
                                
@@ -268,10 +362,8 @@ namespace CIR {
                        case ExprClass.EventAccess:
                        case ExprClass.MethodGroup:
                        case ExprClass.Invalid:
-                               tc.RootContext.Report.Error (-1000,
-                                                            "Internal compiler error, should have " +
-                                                            "got these handled before");
-                               break;
+                               throw new Exception ("Should have got the " + left_e.ExprClass +
+                                                    " handled before");
                        }
                        
                        return null;
@@ -280,57 +372,109 @@ namespace CIR {
                static public Expression ImplicitReferenceConversion (Expression expr, Type target_type)
                {
                        Type expr_type = expr.Type;
-                       
+
                        if (target_type == TypeManager.object_type) {
                                if (expr_type.IsClass)
                                        return new EmptyCast (expr, target_type);
                                if (expr_type.IsValueType)
-                                       return new BoxedCast (expr, target_type);
-                       } else if (expr_type.IsSubclassOf (target_type))
+                                       return new BoxedCast (expr);
+                       } else if (expr_type.IsSubclassOf (target_type)) {
                                return new EmptyCast (expr, target_type);
-                       else 
-                               // FIXME: missing implicit reference conversions:
-                               // 
+                       } else {
                                // from any class-type S to any interface-type T.
+                               if (expr_type.IsClass && target_type.IsInterface) {
+                                       Type [] interfaces = expr_type.FindInterfaces (Module.FilterTypeName,
+                                                                                      target_type.FullName);
+                                       if (interfaces != null)
+                                               return new EmptyCast (expr, target_type);
+                               }       
+
                                // from any interface type S to interface-type T.
+                               // FIXME : Is it right to use IsAssignableFrom ?
+                               if (expr_type.IsInterface && target_type.IsInterface)
+                                       if (target_type.IsAssignableFrom (expr_type))
+                                               return new EmptyCast (expr, target_type);
+                               
+                               
                                // from an array-type S to an array-type of type T
+                               if (expr_type.IsArray && target_type.IsArray) {
+                                       
+                                       throw new Exception ("Implement array conversion");
+                                       
+                               }
+                               
                                // from an array-type to System.Array
+                               if (expr_type.IsArray && target_type.IsAssignableFrom (expr_type))
+                                       return new EmptyCast (expr, target_type);
+                               
                                // from any delegate type to System.Delegate
+                               if (expr_type.IsSubclassOf (TypeManager.delegate_type) &&
+                                   target_type == TypeManager.delegate_type)
+                                       if (target_type.IsAssignableFrom (expr_type))
+                                               return new EmptyCast (expr, target_type);
+                                       
                                // from any array-type or delegate type into System.ICloneable.
+                               if (expr_type.IsArray || expr_type.IsSubclassOf (TypeManager.delegate_type))
+                                       if (target_type == TypeManager.cloneable_interface)
+                                               throw new Exception ("Implement conversion to System.ICloneable");
+                               
                                // from the null type to any reference-type.
-                                    
+                               // FIXME : How do we do this ?
+
                                return null;
 
+                       }
+                       
                        return null;
                }
-                      
+
                // <summary>
-               //   Converts implicitly the resolved expression `expr' into the
-               //   `target_type'.  It returns a new expression that can be used
-               //   in a context that expects a `target_type'. 
+               //   Handles expressions like this: decimal d; d = 1;
+               //   and changes them into: decimal d; d = new System.Decimal (1);
                // </summary>
-               static public Expression ConvertImplicit (TypeContainer tc, Expression expr, Type target_type)
+               static Expression InternalTypeConstructor (TypeContainer tc, Expression expr, Type target)
                {
-                       Type expr_type = expr.Type;
-
-                       if (expr_type == target_type)
-                               return expr;
-                       
-                       //
-                       // Step 1: Perform implicit conversions as found on expr.Type
-                       //
-                       Expression imp;
+                       ArrayList args = new ArrayList ();
 
-                       imp = new UserImplicitCast (expr, target_type);
+                       args.Add (new Argument (expr, Argument.AType.Expression));
 
-                       imp = imp.Resolve (tc);
+                       Expression ne = new New (target.FullName, args,
+                                                new Location (-1));
 
-                       if (imp != null)
-                               return imp;
+                       return ne.Resolve (tc);
+               }
 
+               // <summary>
+               //   Implicit Numeric Conversions.
+               //
+               //   expr is the expression to convert, returns a new expression of type
+               //   target_type or null if an implicit conversion is not possible.
+               //
+               // </summary>
+               static public Expression ImplicitNumericConversion (TypeContainer tc, Expression expr,
+                                                                   Type target_type, Location l)
+               {
+                       Type expr_type = expr.Type;
+                       
                        //
-                       // Step 2: Built-in conversions.
-                       //
+                       // Attempt to do the implicit constant expression conversions
+
+                       if (expr is IntLiteral){
+                               Expression e;
+                               
+                               e = TryImplicitIntConversion (target_type, (IntLiteral) expr);
+                               if (e != null)
+                                       return e;
+                       } else if (expr is LongLiteral){
+                               //
+                               // Try the implicit constant expression conversion
+                               // from long to ulong, instead of a nice routine,
+                               // we just inline it
+                               //
+                               if (((LongLiteral) expr).Value > 0)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
+                       }
+                       
                        if (expr_type == TypeManager.sbyte_type){
                                //
                                // From sbyte to short, int, long, float, double.
@@ -338,13 +482,15 @@ namespace CIR {
                                if (target_type == TypeManager.int32_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_I4);
                                if (target_type == TypeManager.int64_type)
-                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U8);
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
                                if (target_type == TypeManager.double_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
                                if (target_type == TypeManager.float_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
                                if (target_type == TypeManager.short_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_I2);
+                               if (target_type == TypeManager.decimal_type)
+                                       return InternalTypeConstructor (tc, expr, target_type);
                        } else if (expr_type == TypeManager.byte_type){
                                //
                                // From byte to short, ushort, int, uint, long, ulong, float, double
@@ -364,6 +510,8 @@ namespace CIR {
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
                                if (target_type == TypeManager.double_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
+                               if (target_type == TypeManager.decimal_type)
+                                       return InternalTypeConstructor (tc, expr, target_type);
                        } else if (expr_type == TypeManager.short_type){
                                //
                                // From short to int, long, float, double
@@ -376,14 +524,17 @@ namespace CIR {
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
                                if (target_type == TypeManager.float_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
+                               if (target_type == TypeManager.decimal_type)
+                                       return InternalTypeConstructor (tc, expr, target_type);
                        } else if (expr_type == TypeManager.ushort_type){
                                //
                                // From ushort to int, uint, long, ulong, float, double
                                //
-                               if ((target_type == TypeManager.uint32_type) ||
-                                   (target_type == TypeManager.uint64_type))
+                               if (target_type == TypeManager.uint32_type)
                                        return new EmptyCast (expr, target_type);
-                                       
+
+                               if (target_type == TypeManager.uint64_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U8);
                                if (target_type == TypeManager.int32_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_I4);
                                if (target_type == TypeManager.int64_type)
@@ -392,6 +543,8 @@ namespace CIR {
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
                                if (target_type == TypeManager.float_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
+                               if (target_type == TypeManager.decimal_type)
+                                       return InternalTypeConstructor (tc, expr, target_type);
                        } else if (expr_type == TypeManager.int32_type){
                                //
                                // From int to long, float, double
@@ -402,12 +555,14 @@ namespace CIR {
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
                                if (target_type == TypeManager.float_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
+                               if (target_type == TypeManager.decimal_type)
+                                       return InternalTypeConstructor (tc, expr, target_type);
                        } else if (expr_type == TypeManager.uint32_type){
                                //
                                // From uint to long, ulong, float, double
                                //
                                if (target_type == TypeManager.int64_type)
-                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U8);
                                if (target_type == TypeManager.uint64_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_U8);
                                if (target_type == TypeManager.double_type)
@@ -416,10 +571,12 @@ namespace CIR {
                                if (target_type == TypeManager.float_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R_Un,
                                                               OpCodes.Conv_R4);
+                               if (target_type == TypeManager.decimal_type)
+                                       return InternalTypeConstructor (tc, expr, target_type);
                        } else if ((expr_type == TypeManager.uint64_type) ||
                                   (expr_type == TypeManager.int64_type)){
                                //
-                               // From long to float, double
+                               // From long/ulong to float, double
                                //
                                if (target_type == TypeManager.double_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R_Un,
@@ -427,6 +584,8 @@ namespace CIR {
                                if (target_type == TypeManager.float_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R_Un,
                                                               OpCodes.Conv_R4);        
+                               if (target_type == TypeManager.decimal_type)
+                                       return InternalTypeConstructor (tc, expr, target_type);
                        } else if (expr_type == TypeManager.char_type){
                                //
                                // From char to ushort, int, uint, long, ulong, float, double
@@ -441,52 +600,455 @@ namespace CIR {
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
                                if (target_type == TypeManager.float_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
-                               if (target_type == TypeManager.double_type)
-                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
-                       } else
-                               return ImplicitReferenceConversion (expr, target_type);
+                               if (target_type == TypeManager.double_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
+                               if (target_type == TypeManager.decimal_type)
+                                       return InternalTypeConstructor (tc, expr, target_type);
+                       } else if (expr_type == TypeManager.float_type){
+                               //
+                               // float to double
+                               //
+                               if (target_type == TypeManager.double_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
+                       }
+
+                       return null;
+               }
+
+               // <summary>
+               //   User-defined implicit conversions
+               // </summary>
+               static public Expression ImplicitUserConversion (TypeContainer tc, Expression source,
+                                                                Type target, Location l)
+               {
+                       Expression mg1, mg2;
+                       MethodBase method;
+                       ArrayList arguments;
+                       
+                       mg1 = MemberLookup (tc, source.Type, "op_Implicit", false);
+                       mg2 = MemberLookup (tc, target, "op_Implicit", false);
+                       
+                       MethodGroupExpr union = Invocation.MakeUnionSet (mg1, mg2);
+
+                       if (union != null) {
+                               arguments = new ArrayList ();
+                               arguments.Add (new Argument (source, Argument.AType.Expression));
+
+                               method = Invocation.OverloadResolve (tc, union, arguments, l, true);
+
+                               if (method != null) { 
+                                       MethodInfo mi = (MethodInfo) method;
+                                       
+                                       if (mi.ReturnType == target)
+                                               return new UserImplicitCast (mi, arguments);
+                               }
+                       }
+                       
+                       // If we have a boolean type, we need to check for the True
+                       // and False operators too.
+                       
+                       if (target == TypeManager.bool_type) {
+
+                               mg1 = MemberLookup (tc, source.Type, "op_True", false);
+                               mg2 = MemberLookup (tc, target, "op_True", false);
+                               
+                               union = Invocation.MakeUnionSet (mg1, mg2);
+
+                               if (union == null)
+                                       return null;
+
+                               arguments = new ArrayList ();
+                               arguments.Add (new Argument (source, Argument.AType.Expression));
+                       
+                               method = Invocation.OverloadResolve (tc, union, arguments, l, true);
+                               if (method != null) {
+                                       MethodInfo mi = (MethodInfo) method;
+
+                                       if (mi.ReturnType == target) 
+                                               return new UserImplicitCast (mi, arguments);
+                               }
+                       }
+                       
+                       return null;
+               }
+               
+               // <summary>
+               //   Converts implicitly the resolved expression `expr' into the
+               //   `target_type'.  It returns a new expression that can be used
+               //   in a context that expects a `target_type'. 
+               // </summary>
+               static public Expression ConvertImplicit (TypeContainer tc, Expression expr,
+                                                         Type target_type, Location l)
+               {
+                       Type expr_type = expr.Type;
+                       Expression e;
+
+                       if (expr_type == target_type)
+                               return expr;
+
+                       e = ImplicitNumericConversion (tc, expr, target_type, l);
+                       if (e != null)
+                               return e;
+
+                       e = ImplicitReferenceConversion (expr, target_type);
+                       if (e != null)
+                               return e;
+
+                       e = ImplicitUserConversion (tc, expr, target_type, l);
+                       if (e != null)
+                               return e;
+
+                       if (target_type.IsSubclassOf (TypeManager.enum_type) && expr is IntLiteral){
+                               IntLiteral i = (IntLiteral) expr;
+
+                               if (i.Value == 0)
+                                       return new EmptyCast (expr, target_type);
+                       }
+                       return null;
+               }
+
+               
+               // <summary>
+               //   Attempts to apply the `Standard Implicit
+               //   Conversion' rules to the expression `expr' into
+               //   the `target_type'.  It returns a new expression
+               //   that can be used in a context that expects a
+               //   `target_type'.
+               //
+               //   This is different from `ConvertImplicit' in that the
+               //   user defined implicit conversions are excluded. 
+               // </summary>
+               static public Expression ConvertImplicitStandard (TypeContainer tc, Expression expr,
+                                                                 Type target_type, Location l)
+               {
+                       Type expr_type = expr.Type;
+                       Expression e;
+
+                       if (expr_type == target_type)
+                               return expr;
+
+                       e = ImplicitNumericConversion (tc, expr, target_type, l);
+                       if (e != null)
+                               return e;
+
+                       e = ImplicitReferenceConversion (expr, target_type);
+                       if (e != null)
+                               return e;
+
+                       if (target_type.IsSubclassOf (TypeManager.enum_type) && expr is IntLiteral){
+                               IntLiteral i = (IntLiteral) expr;
+
+                               if (i.Value == 0)
+                                       return new EmptyCast (expr, target_type);
+                       }
+                       return null;
+               }
+               // <summary>
+               //   Attemps to perform an implict constant conversion of the IntLiteral
+               //   into a different data type using casts (See Implicit Constant
+               //   Expression Conversions)
+               // </summary>
+               static protected Expression TryImplicitIntConversion (Type target_type, IntLiteral il)
+               {
+                       int value = il.Value;
+                       
+                       if (target_type == TypeManager.sbyte_type){
+                               if (value >= SByte.MinValue && value <= SByte.MaxValue)
+                                       return il;
+                       } else if (target_type == TypeManager.byte_type){
+                               if (Byte.MinValue >= 0 && value <= Byte.MaxValue)
+                                       return il;
+                       } else if (target_type == TypeManager.short_type){
+                               if (value >= Int16.MinValue && value <= Int16.MaxValue)
+                                       return il;
+                       } else if (target_type == TypeManager.ushort_type){
+                               if (value >= UInt16.MinValue && value <= UInt16.MaxValue)
+                                       return il;
+                       } else if (target_type == TypeManager.uint32_type){
+                               //
+                               // we can optimize this case: a positive int32
+                               // always fits on a uint32
+                               //
+                               if (value >= 0)
+                                       return il;
+                       } else if (target_type == TypeManager.uint64_type){
+                               //
+                               // we can optimize this case: a positive int32
+                               // always fits on a uint64.  But we need an opcode
+                               // to do it.
+                               //
+                               if (value >= 0)
+                                       return new OpcodeCast (il, target_type, OpCodes.Conv_I8);
+                       }
+
+                       return null;
+               }
+
+               // <summary>
+               //   Attemptes to implicityly convert `target' into `type', using
+               //   ConvertImplicit.  If there is no implicit conversion, then
+               //   an error is signaled
+               // </summary>
+               static public Expression ConvertImplicitRequired (TypeContainer tc, Expression target,
+                                                                 Type type, Location l)
+               {
+                       Expression e;
+                       
+                       e = ConvertImplicit (tc, target, type, l);
+                       if (e != null)
+                               return e;
+                       
+                       string msg = "Can not convert implicitly from `"+
+                               TypeManager.CSharpName (target.Type) + "' to `" +
+                               TypeManager.CSharpName (type) + "'";
+
+                       Error (tc, 29, l, msg);
+
+                       return null;
+               }
+
+               // <summary>
+               //   Performs the explicit numeric conversions
+               // </summary>
+               static Expression ConvertNumericExplicit (TypeContainer tc, Expression expr,
+                                                         Type target_type)
+               {
+                       Type expr_type = expr.Type;
+                       
+                       if (expr_type == TypeManager.sbyte_type){
+                               //
+                               // From sbyte to byte, ushort, uint, ulong, char
+                               //
+                               if (target_type == TypeManager.byte_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U1);
+                               if (target_type == TypeManager.ushort_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U2);
+                               if (target_type == TypeManager.uint32_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U4);
+                               if (target_type == TypeManager.uint64_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
+                               if (target_type == TypeManager.char_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U2);
+                       } else if (expr_type == TypeManager.byte_type){
+                               //
+                               // From byte to sbyte and char
+                               //
+                               if (target_type == TypeManager.sbyte_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I1);
+                               if (target_type == TypeManager.char_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U2);
+                       } else if (expr_type == TypeManager.short_type){
+                               //
+                               // From short to sbyte, byte, ushort, uint, ulong, char
+                               //
+                               if (target_type == TypeManager.sbyte_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I1);
+                               if (target_type == TypeManager.byte_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U1);
+                               if (target_type == TypeManager.ushort_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U2);
+                               if (target_type == TypeManager.uint32_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U4);
+                               if (target_type == TypeManager.uint64_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
+                               if (target_type == TypeManager.char_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U2);
+                       } else if (expr_type == TypeManager.ushort_type){
+                               //
+                               // From ushort to sbyte, byte, short, char
+                               //
+                               if (target_type == TypeManager.sbyte_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I1);
+                               if (target_type == TypeManager.byte_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U1);
+                               if (target_type == TypeManager.short_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I2);
+                               if (target_type == TypeManager.char_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U2);
+                       } else if (expr_type == TypeManager.int32_type){
+                               //
+                               // From int to sbyte, byte, short, ushort, uint, ulong, char
+                               //
+                               if (target_type == TypeManager.sbyte_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I1);
+                               if (target_type == TypeManager.byte_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U1);
+                               if (target_type == TypeManager.short_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I2);
+                               if (target_type == TypeManager.ushort_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U2);
+                               if (target_type == TypeManager.uint32_type)
+                                       return new EmptyCast (expr, target_type);
+                               if (target_type == TypeManager.uint64_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
+                               if (target_type == TypeManager.char_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U2);
+                       } else if (expr_type == TypeManager.uint32_type){
+                               //
+                               // From uint to sbyte, byte, short, ushort, int, char
+                               //
+                               if (target_type == TypeManager.sbyte_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I1);
+                               if (target_type == TypeManager.byte_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U1);
+                               if (target_type == TypeManager.short_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I2);
+                               if (target_type == TypeManager.ushort_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U2);
+                               if (target_type == TypeManager.int32_type)
+                                       return new EmptyCast (expr, target_type);
+                               if (target_type == TypeManager.char_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U2);
+                       } else if (expr_type == TypeManager.int64_type){
+                               //
+                               // From long to sbyte, byte, short, ushort, int, uint, ulong, char
+                               //
+                               if (target_type == TypeManager.sbyte_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I1);
+                               if (target_type == TypeManager.byte_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U1);
+                               if (target_type == TypeManager.short_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I2);
+                               if (target_type == TypeManager.ushort_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U2);
+                               if (target_type == TypeManager.int32_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I4);
+                               if (target_type == TypeManager.uint32_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U4);
+                               if (target_type == TypeManager.uint64_type)
+                                       return new EmptyCast (expr, target_type);
+                               if (target_type == TypeManager.char_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U2);
+                       } else if (expr_type == TypeManager.uint64_type){
+                               //
+                               // From ulong to sbyte, byte, short, ushort, int, uint, long, char
+                               //
+                               if (target_type == TypeManager.sbyte_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I1);
+                               if (target_type == TypeManager.byte_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U1);
+                               if (target_type == TypeManager.short_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I2);
+                               if (target_type == TypeManager.ushort_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U2);
+                               if (target_type == TypeManager.int32_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I4);
+                               if (target_type == TypeManager.uint32_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U4);
+                               if (target_type == TypeManager.int64_type)
+                                       return new EmptyCast (expr, target_type);
+                               if (target_type == TypeManager.char_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U2);
+                       } else if (expr_type == TypeManager.char_type){
+                               //
+                               // From char to sbyte, byte, short
+                               //
+                               if (target_type == TypeManager.sbyte_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I1);
+                               if (target_type == TypeManager.byte_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U1);
+                               if (target_type == TypeManager.short_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I2);
+                       } else if (expr_type == TypeManager.float_type){
+                               //
+                               // From float to sbyte, byte, short,
+                               // ushort, int, uint, long, ulong, char
+                               // or decimal
+                               //
+                               if (target_type == TypeManager.sbyte_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I1);
+                               if (target_type == TypeManager.byte_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U1);
+                               if (target_type == TypeManager.short_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I2);
+                               if (target_type == TypeManager.ushort_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U2);
+                               if (target_type == TypeManager.int32_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I4);
+                               if (target_type == TypeManager.uint32_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U4);
+                               if (target_type == TypeManager.int64_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
+                               if (target_type == TypeManager.uint64_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U8);
+                               if (target_type == TypeManager.char_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U2);
+                               if (target_type == TypeManager.decimal_type)
+                                       return InternalTypeConstructor (tc, expr, target_type);
+                       } else if (expr_type == TypeManager.double_type){
+                               //
+                               // From double to byte, byte, short,
+                               // ushort, int, uint, long, ulong,
+                               // char, float or decimal
+                               //
+                               if (target_type == TypeManager.sbyte_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I1);
+                               if (target_type == TypeManager.byte_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U1);
+                               if (target_type == TypeManager.short_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I2);
+                               if (target_type == TypeManager.ushort_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U2);
+                               if (target_type == TypeManager.int32_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I4);
+                               if (target_type == TypeManager.uint32_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U4);
+                               if (target_type == TypeManager.int64_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
+                               if (target_type == TypeManager.uint64_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U8);
+                               if (target_type == TypeManager.char_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U2);
+                               if (target_type == TypeManager.float_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
+                               if (target_type == TypeManager.decimal_type)
+                                       return InternalTypeConstructor (tc, expr, target_type);
+                       } 
 
-                       
+                       // decimal is taken care of by the op_Explicit methods.
 
-                       //
-                       //  Could not find an implicit cast.
-                       //
                        return null;
                }
 
                // <summary>
-               //   Attemptes to implicityly convert `target' into `type', using
-               //   ConvertImplicit.  If there is no implicit conversion, then
-               //   an error is signaled
+               //   Implements Explicit Reference conversions
                // </summary>
-               static public Expression ConvertImplicitRequired (TypeContainer tc, Expression target,
-                                                                 Type type, Location l)
+               static Expression ConvertReferenceExplicit (TypeContainer tc, Expression expr,
+                                                         Type target_type)
                {
-                       Expression e;
+                       Type expr_type = expr.Type;
+                       bool target_is_value_type = target_type.IsValueType;
                        
-                       e = ConvertImplicit (tc, target, type);
-                       if (e == null){
-                               string msg = "Can not convert implicitly from `"+
-                                       TypeManager.CSharpName (target.Type) + "' to `" +
-                                       TypeManager.CSharpName (type) + "'";
+                       //
+                       // From object to any reference type
+                       //
+                       if (expr_type == TypeManager.object_type && !target_is_value_type)
+                               return new ClassCast (expr, expr_type);
 
-                               tc.RootContext.Report.Error (29, l, msg);
-                       }
-                       return e;
+                       return null;
                }
                
                // <summary>
                //   Performs an explicit conversion of the expression `expr' whose
                //   type is expr.Type to `target_type'.
                // </summary>
-               static public Expression ConvertExplicit (Expression expr, Type target_type)
+               static public Expression ConvertExplicit (TypeContainer tc, Expression expr,
+                                                         Type target_type)
                {
-                       return expr;
-               }
+                       Expression ne = ConvertImplicit (tc, expr, target_type, Location.Null);
 
-               void report (TypeContainer tc, int error, string s)
-               {
-                       tc.RootContext.Report.Error (error, s);
+                       if (ne != null)
+                               return ne;
+
+                       ne = ConvertNumericExplicit (tc, expr, target_type);
+                       if (ne != null)
+                               return ne;
+
+                       ne = ConvertReferenceExplicit (tc, expr, target_type);
+                       if (ne != null)
+                               return ne;
+                       
+                       return null;
                }
 
                static string ExprClassName (ExprClass c)
@@ -519,10 +1081,15 @@ namespace CIR {
                // <summary>
                //   Reports that we were expecting `expr' to be of class `expected'
                // </summary>
-               protected void report118 (TypeContainer tc, Expression expr, string expected)
+               protected void report118 (TypeContainer tc, Location l, Expression expr, string expected)
                {
-                       report (tc, 118, "Expression denotes a '" + ExprClassName (expr.ExprClass) +
-                               "' where an " + expected + " was expected");
+                       string kind = "Unknown";
+                       
+                       if (expr != null)
+                               kind = ExprClassName (expr.ExprClass);
+
+                       Error (tc, 118, l, "Expression denotes a '" + kind +
+                              "' where an " + expected + " was expected");
                }
        }
 
@@ -568,7 +1135,7 @@ namespace CIR {
                        this.child = child;
                }
 
-               public override Expression Resolve (TypeContainer tc)
+               public override Expression DoResolve (TypeContainer tc)
                {
                        // This should never be invoked, we are born in fully
                        // initialized state.
@@ -590,12 +1157,12 @@ namespace CIR {
        // </summary>
        public class BoxedCast : EmptyCast {
 
-               public BoxedCast (Expression expr, Type target_type)
-                       : base (expr, target_type)
+               public BoxedCast (Expression expr)
+                       : base (expr, TypeManager.object_type)
                {
                }
 
-               public override Expression Resolve (TypeContainer tc)
+               public override Expression DoResolve (TypeContainer tc)
                {
                        // This should never be invoked, we are born in fully
                        // initialized state.
@@ -609,7 +1176,6 @@ namespace CIR {
                        ec.ig.Emit (OpCodes.Box, child.Type);
                }
        }
-       
 
        // <summary>
        //   This kind of cast is used to encapsulate a child expression
@@ -637,7 +1203,7 @@ namespace CIR {
                        second_valid = true;
                }
 
-               public override Expression Resolve (TypeContainer tc)
+               public override Expression DoResolve (TypeContainer tc)
                {
                        // This should never be invoked, we are born in fully
                        // initialized state.
@@ -655,10 +1221,47 @@ namespace CIR {
                }                       
                
        }
+
+       // <summary>
+       //   This kind of cast is used to encapsulate a child and cast it
+       //   to the class requested
+       // </summary>
+       public class ClassCast : EmptyCast {
+               public ClassCast (Expression child, Type return_type)
+                       : base (child, return_type)
+                       
+               {
+               }
+
+               public override Expression DoResolve (TypeContainer tc)
+               {
+                       // This should never be invoked, we are born in fully
+                       // initialized state.
+
+                       return this;
+               }
+
+               public override void Emit (EmitContext ec)
+               {
+                       base.Emit (ec);
+
+                       ec.ig.Emit (OpCodes.Castclass, type);
+               }                       
+               
+       }
        
+       // <summary>
+       //   Unary expressions.  
+       // </summary>
+       //
+       // <remarks>
+       //   Unary implements unary expressions.   It derives from
+       //   ExpressionStatement becuase the pre/post increment/decrement
+       //   operators can be used in a statement context.
+       // </remarks>
        public class Unary : ExpressionStatement {
                public enum Operator {
-                       Add, Subtract, Negate, BitComplement,
+                       Addition, Subtraction, Negate, BitComplement,
                        Indirection, AddressOf, PreIncrement,
                        PreDecrement, PostIncrement, PostDecrement
                }
@@ -702,9 +1305,9 @@ namespace CIR {
                string OperName ()
                {
                        switch (oper){
-                       case Operator.Add:
+                       case Operator.Addition:
                                return "+";
-                       case Operator.Subtract:
+                       case Operator.Subtraction:
                                return "-";
                        case Operator.Negate:
                                return "!";
@@ -728,7 +1331,7 @@ namespace CIR {
                        if (expr.Type == target_type)
                                return expr;
 
-                       return ConvertImplicit (tc, expr, target_type);
+                       return ConvertImplicit (tc, expr, target_type, new Location (-1));
                }
 
                void report23 (Report r, Type t)
@@ -776,16 +1379,21 @@ namespace CIR {
                        else
                                op_name = "op_" + oper;
 
-                       mg = MemberLookup (tc.RootContext, expr_type, op_name, false);
+                       mg = MemberLookup (tc, expr_type, op_name, false);
+
+                       if (mg == null && expr_type != TypeManager.object_type)
+                               mg = MemberLookup (tc, expr_type.BaseType, op_name, false);
                        
                        if (mg != null) {
                                Arguments = new ArrayList ();
                                Arguments.Add (new Argument (expr, Argument.AType.Expression));
                                
-                               method = Invocation.OverloadResolve (tc, (MethodGroupExpr) mg, Arguments, location);
+                               method = Invocation.OverloadResolve (tc, (MethodGroupExpr) mg,
+                                                                    Arguments, location);
                                if (method != null) {
-                                       Method m = (Method) TypeContainer.LookupMethodByBuilder (method);
-                                       type = m.GetReturnType (tc);
+                                       MethodInfo mi = (MethodInfo) method;
+
+                                       type = mi.ReturnType;
                                        return this;
                                }
                        }
@@ -804,8 +1412,10 @@ namespace CIR {
                                if (expr_type != TypeManager.bool_type) {
                                        report23 (tc.RootContext.Report, expr.Type);
                                        return null;
-                               } else
-                                       type = TypeManager.bool_type;
+                               }
+                               
+                               type = TypeManager.bool_type;
+                               return this;
                        }
 
                        if (oper == Operator.BitComplement) {
@@ -821,7 +1431,7 @@ namespace CIR {
                                return this;
                        }
 
-                       if (oper == Operator.Add) {
+                       if (oper == Operator.Addition) {
                                //
                                // A plus in front of something is just a no-op, so return the child.
                                //
@@ -836,7 +1446,7 @@ namespace CIR {
                        // double  operator- (double d)
                        // decimal operator- (decimal d)
                        //
-                       if (oper == Operator.Subtract){
+                       if (oper == Operator.Subtraction){
                                //
                                // Fold a "- Constant" into a negative constant
                                //
@@ -873,6 +1483,8 @@ namespace CIR {
                                // It is also not clear if we should convert to Float
                                // or Double initially.
                                //
+                               Location l = new Location (-1);
+                               
                                if (expr_type == TypeManager.uint32_type){
                                        //
                                        // FIXME: handle exception to this rule that
@@ -880,7 +1492,7 @@ namespace CIR {
                                        // bt written as a decimal interger literal
                                        //
                                        type = TypeManager.int64_type;
-                                       expr = ConvertImplicit (tc, expr, type);
+                                       expr = ConvertImplicit (tc, expr, type, l);
                                        return this;
                                }
 
@@ -894,21 +1506,21 @@ namespace CIR {
                                        return null;
                                }
 
-                               e = ConvertImplicit (tc, expr, TypeManager.int32_type);
+                               e = ConvertImplicit (tc, expr, TypeManager.int32_type, l);
                                if (e != null){
                                        expr = e;
                                        type = e.Type;
                                        return this;
                                } 
 
-                               e = ConvertImplicit (tc, expr, TypeManager.int64_type);
+                               e = ConvertImplicit (tc, expr, TypeManager.int64_type, l);
                                if (e != null){
                                        expr = e;
                                        type = e.Type;
                                        return this;
                                }
 
-                               e = ConvertImplicit (tc, expr, TypeManager.double_type);
+                               e = ConvertImplicit (tc, expr, TypeManager.double_type, l);
                                if (e != null){
                                        expr = e;
                                        type = e.Type;
@@ -943,24 +1555,33 @@ namespace CIR {
                                        //
                                        throw new Exception ("Implement me");
                                } else {
-                                       report118 (tc, expr, "variable, indexer or property access");
+                                       report118 (tc, location, expr,
+                                                  "variable, indexer or property access");
                                }
                        }
 
-                       tc.RootContext.Report.Error (187, "No such operator '" + OperName () +
-                                                    "' defined for type '" +
-                                                    TypeManager.CSharpName (expr_type) + "'");
+                       if (oper == Operator.AddressOf){
+                               if (expr.ExprClass != ExprClass.Variable){
+                                       Error (tc, 211, "Cannot take the address of non-variables");
+                                       return null;
+                               }
+                               type = Type.GetType (expr.Type.ToString () + "*");
+                       }
+                       
+                       Error (tc, 187, "No such operator '" + OperName () + "' defined for type '" +
+                              TypeManager.CSharpName (expr_type) + "'");
                        return null;
 
                }
 
-               public override Expression Resolve (TypeContainer tc)
+               public override Expression DoResolve (TypeContainer tc)
                {
                        expr = expr.Resolve (tc);
 
                        if (expr == null)
                                return null;
-                       
+
+                       eclass = ExprClass.Value;
                        return ResolveOperator (tc);
                }
 
@@ -973,24 +1594,41 @@ namespace CIR {
 
                                // Note that operators are static anyway
                                
-                               if (Arguments != null) {
+                               if (Arguments != null) 
                                        Invocation.EmitArguments (ec, method, Arguments);
-                               }
+
+                               //
+                               // Post increment/decrement operations need a copy at this
+                               // point.
+                               //
+                               if (oper == Operator.PostDecrement || oper == Operator.PostIncrement)
+                                       ig.Emit (OpCodes.Dup);
                                
-                               if (method is MethodInfo)
-                                       ig.Emit (OpCodes.Call, (MethodInfo) method);
-                               else
-                                       ig.Emit (OpCodes.Call, (ConstructorInfo) method);
 
-                               return;
+                               ig.Emit (OpCodes.Call, (MethodInfo) method);
 
+                               //
+                               // Pre Increment and Decrement operators
+                               //
+                               if (oper == Operator.PreIncrement || oper == Operator.PreDecrement){
+                                       ig.Emit (OpCodes.Dup);
+                               }
+                               
+                               //
+                               // Increment and Decrement should store the result
+                               //
+                               if (oper == Operator.PreDecrement || oper == Operator.PreIncrement ||
+                                   oper == Operator.PostDecrement || oper == Operator.PostIncrement){
+                                       ((LValue) expr).Store (ec);
+                               }
+                               return;
                        }
                        
                        switch (oper) {
-                       case Operator.Add:
+                       case Operator.Addition:
                                throw new Exception ("This should be caught by Resolve");
                                
-                       case Operator.Subtract:
+                       case Operator.Subtraction:
                                expr.Emit (ec);
                                ig.Emit (OpCodes.Neg);
                                break;
@@ -1007,7 +1645,8 @@ namespace CIR {
                                break;
                                
                        case Operator.AddressOf:
-                               throw new Exception ("Not implemented yet");
+                               ((LValue)expr).AddressOf (ec);
+                               break;
                                
                        case Operator.Indirection:
                                throw new Exception ("Not implemented yet");
@@ -1015,22 +1654,18 @@ namespace CIR {
                        case Operator.PreIncrement:
                        case Operator.PreDecrement:
                                if (expr.ExprClass == ExprClass.Variable){
-                                       if (expr_type == TypeManager.decimal_type){
-                                               throw new Exception ("FIXME: Add pre inc/dec for decimals");
-                                       } else {
-                                               //
-                                               // Resolve already verified that it is an "incrementable"
-                                               // 
-                                               expr.Emit (ec);
-                                               ig.Emit (OpCodes.Ldc_I4_1);
-                                               
-                                               if (oper == Operator.PreDecrement)
-                                                       ig.Emit (OpCodes.Sub);
-                                               else
-                                                       ig.Emit (OpCodes.Add);
-                                               ((LValue) expr).Store (ig);
-                                               ig.Emit (OpCodes.Dup);
-                                       } 
+                                       //
+                                       // Resolve already verified that it is an "incrementable"
+                                       // 
+                                       expr.Emit (ec);
+                                       ig.Emit (OpCodes.Ldc_I4_1);
+                                       
+                                       if (oper == Operator.PreDecrement)
+                                               ig.Emit (OpCodes.Sub);
+                                       else
+                                               ig.Emit (OpCodes.Add);
+                                       ig.Emit (OpCodes.Dup);
+                                       ((LValue) expr).Store (ec);
                                } else {
                                        throw new Exception ("Handle Indexers and Properties here");
                                }
@@ -1039,22 +1674,18 @@ namespace CIR {
                        case Operator.PostIncrement:
                        case Operator.PostDecrement:
                                if (expr.ExprClass == ExprClass.Variable){
-                                       if (expr_type == TypeManager.decimal_type){
-                                               throw new Exception ("FIXME: Add pre inc/dec for decimals");
-                                       } else {
-                                               //
-                                               // Resolve already verified that it is an "incrementable"
-                                               // 
-                                               expr.Emit (ec);
-                                               ig.Emit (OpCodes.Dup);
-                                               ig.Emit (OpCodes.Ldc_I4_1);
-                                               
-                                               if (oper == Operator.PostDecrement)
-                                                       ig.Emit (OpCodes.Sub);
-                                               else
-                                                       ig.Emit (OpCodes.Add);
-                                               ((LValue) expr).Store (ig);
-                                       } 
+                                       //
+                                       // Resolve already verified that it is an "incrementable"
+                                       // 
+                                       expr.Emit (ec);
+                                       ig.Emit (OpCodes.Dup);
+                                       ig.Emit (OpCodes.Ldc_I4_1);
+                                       
+                                       if (oper == Operator.PostDecrement)
+                                               ig.Emit (OpCodes.Sub);
+                                       else
+                                               ig.Emit (OpCodes.Add);
+                                       ((LValue) expr).Store (ec);
                                } else {
                                        throw new Exception ("Handle Indexers and Properties here");
                                }
@@ -1080,55 +1711,69 @@ namespace CIR {
        }
        
        public class Probe : Expression {
-               string probe_type;
+               public readonly string ProbeType;
+               public readonly Operator Oper;
                Expression expr;
-               Operator oper;
-
+               Type probe_type;
+               
                public enum Operator {
                        Is, As
                }
                
                public Probe (Operator oper, Expression expr, string probe_type)
                {
-                       this.oper = oper;
-                       this.probe_type = probe_type;
+                       Oper = oper;
+                       ProbeType = probe_type;
                        this.expr = expr;
                }
 
-               public Operator Oper {
-                       get {
-                               return oper;
-                       }
-               }
-
                public Expression Expr {
                        get {
                                return expr;
                        }
                }
+               
+               public override Expression DoResolve (TypeContainer tc)
+               {
+                       probe_type = tc.LookupType (ProbeType, false);
 
-               public string ProbeType {
-                       get {
-                               return probe_type;
-                       }
-               }
+                       if (probe_type == null)
+                               return null;
 
-               public override Expression Resolve (TypeContainer tc)
-               {
-                       // FIXME: Implement;
-                       throw new Exception ("Unimplemented");
-                       // return this;
+                       expr = expr.Resolve (tc);
+                       
+                       type = TypeManager.bool_type;
+                       eclass = ExprClass.Value;
+
+                       return this;
                }
 
                public override void Emit (EmitContext ec)
                {
+                       ILGenerator ig = ec.ig;
+                       
+                       expr.Emit (ec);
+                       
+                       if (Oper == Operator.Is){
+                               ig.Emit (OpCodes.Isinst, probe_type);
+                               ig.Emit (OpCodes.Ldnull);
+                               ig.Emit (OpCodes.Cgt_Un);
+                       } else {
+                               ig.Emit (OpCodes.Isinst, probe_type);
+                       }
                }
        }
-       
+
+       // <summary>
+       //   This represents a typecast in the source language.
+       //
+       //   FIXME: Cast expressions have an unusual set of parsing
+       //   rules, we need to figure those out.
+       // </summary>
        public class Cast : Expression {
                string target_type;
                Expression expr;
-               
+                       
                public Cast (string cast_type, Expression expr)
                {
                        this.target_type = cast_type;
@@ -1150,32 +1795,39 @@ namespace CIR {
                        }
                }
                
-               public override Expression Resolve (TypeContainer tc)
+               public override Expression DoResolve (TypeContainer tc)
                {
+                       expr = expr.Resolve (tc);
+                       if (expr == null)
+                               return null;
+                       
                        type = tc.LookupType (target_type, false);
                        eclass = ExprClass.Value;
                        
                        if (type == null)
                                return null;
 
-                       //
-                       // FIXME: Unimplemented
-                       //
-                       throw new Exception ("FINISH ME");
+                       expr = ConvertExplicit (tc, expr, type);
+
+                       return expr;
                }
 
                public override void Emit (EmitContext ec)
                {
+                       //
+                       // This one will never happen
+                       //
+                       throw new Exception ("Should not happen");
                }
        }
 
        public class Binary : Expression {
                public enum Operator {
-                       Multiply, Divide, Modulo,
-                       Add, Subtract,
-                       ShiftLeft, ShiftRight,
-                       LessThan, GreaterThan, LessOrEqual, GreaterOrEqual, 
-                       Equal, NotEqual,
+                       Multiply, Division, Modulus,
+                       Addition, Subtraction,
+                       LeftShift, RightShift,
+                       LessThan, GreaterThan, LessThanOrEqual, GreaterThanOrEqual, 
+                       Equality, Inequality,
                        BitwiseAnd,
                        ExclusiveOr,
                        BitwiseOr,
@@ -1234,29 +1886,29 @@ namespace CIR {
                        switch (oper){
                        case Operator.Multiply:
                                return "*";
-                       case Operator.Divide:
+                       case Operator.Division:
                                return "/";
-                       case Operator.Modulo:
+                       case Operator.Modulus:
                                return "%";
-                       case Operator.Add:
+                       case Operator.Addition:
                                return "+";
-                       case Operator.Subtract:
+                       case Operator.Subtraction:
                                return "-";
-                       case Operator.ShiftLeft:
+                       case Operator.LeftShift:
                                return "<<";
-                       case Operator.ShiftRight:
+                       case Operator.RightShift:
                                return ">>";
                        case Operator.LessThan:
                                return "<";
                        case Operator.GreaterThan:
                                return ">";
-                       case Operator.LessOrEqual:
+                       case Operator.LessThanOrEqual:
                                return "<=";
-                       case Operator.GreaterOrEqual:
+                       case Operator.GreaterThanOrEqual:
                                return ">=";
-                       case Operator.Equal:
+                       case Operator.Equality:
                                return "==";
-                       case Operator.NotEqual:
+                       case Operator.Inequality:
                                return "!=";
                        case Operator.BitwiseAnd:
                                return "&";
@@ -1278,7 +1930,7 @@ namespace CIR {
                        if (expr.Type == target_type)
                                return expr;
 
-                       return ConvertImplicit (tc, expr, target_type);
+                       return ConvertImplicit (tc, expr, target_type, new Location (-1));
                }
                
                //
@@ -1293,9 +1945,9 @@ namespace CIR {
                                // conveted to type double.
                                //
                                if (r != TypeManager.double_type)
-                                       right = ConvertImplicit (tc, right, TypeManager.double_type);
+                                       right = ConvertImplicit (tc, right, TypeManager.double_type, location);
                                if (l != TypeManager.double_type)
-                                       left = ConvertImplicit (tc, left, TypeManager.double_type);
+                                       left = ConvertImplicit (tc, left, TypeManager.double_type, location);
                                
                                type = TypeManager.double_type;
                        } else if (l == TypeManager.float_type || r == TypeManager.float_type){
@@ -1304,22 +1956,34 @@ namespace CIR {
                                // converd to type float.
                                //
                                if (r != TypeManager.double_type)
-                                       right = ConvertImplicit (tc, right, TypeManager.float_type);
+                                       right = ConvertImplicit (tc, right, TypeManager.float_type, location);
                                if (l != TypeManager.double_type)
-                                       left = ConvertImplicit (tc, left, TypeManager.float_type);
+                                       left = ConvertImplicit (tc, left, TypeManager.float_type, location);
                                type = TypeManager.float_type;
                        } else if (l == TypeManager.uint64_type || r == TypeManager.uint64_type){
+                               Expression e;
+                               Type other;
                                //
                                // If either operand is of type ulong, the other operand is
                                // converted to type ulong.  or an error ocurrs if the other
                                // operand is of type sbyte, short, int or long
                                //
-                               Type other = null;
                                
-                               if (l == TypeManager.uint64_type)
-                                       other = r;
-                               else if (r == TypeManager.uint64_type)
-                                       other = l;
+                               if (l == TypeManager.uint64_type){
+                                       if (r != TypeManager.uint64_type && right is IntLiteral){
+                                               e = TryImplicitIntConversion (l, (IntLiteral) right);
+                                               if (e != null)
+                                                       right = e;
+                                       }
+                                       other = right.Type;
+                               } else {
+                                       if (left is IntLiteral){
+                                               e = TryImplicitIntConversion (r, (IntLiteral) left);
+                                               if (e != null)
+                                                       left = e;
+                                       }
+                                       other = left.Type;
+                               }
 
                                if ((other == TypeManager.sbyte_type) ||
                                    (other == TypeManager.short_type) ||
@@ -1327,11 +1991,11 @@ namespace CIR {
                                    (other == TypeManager.int64_type)){
                                        string oper = OperName ();
                                        
-                                       tc.RootContext.Report.Error (34, "Operator `" + OperName ()
-                                                                    + "' is ambiguous on operands of type `"
-                                                                    + TypeManager.CSharpName (l) + "' "
-                                                                    + "and `" + TypeManager.CSharpName (r)
-                                                                    + "'");
+                                       Error (tc, 34, location, "Operator `" + OperName ()
+                                              + "' is ambiguous on operands of type `"
+                                              + TypeManager.CSharpName (l) + "' "
+                                              + "and `" + TypeManager.CSharpName (r)
+                                              + "'");
                                }
                                type = TypeManager.uint64_type;
                        } else if (l == TypeManager.int64_type || r == TypeManager.int64_type){
@@ -1340,9 +2004,9 @@ namespace CIR {
                                // to type long.
                                //
                                if (l != TypeManager.int64_type)
-                                       left = ConvertImplicit (tc, left, TypeManager.int64_type);
+                                       left = ConvertImplicit (tc, left, TypeManager.int64_type, location);
                                if (r != TypeManager.int64_type)
-                                       right = ConvertImplicit (tc, right, TypeManager.int64_type);
+                                       right = ConvertImplicit (tc, right, TypeManager.int64_type, location);
 
                                type = TypeManager.int64_type;
                        } else if (l == TypeManager.uint32_type || r == TypeManager.uint32_type){
@@ -1370,9 +2034,16 @@ namespace CIR {
                                        // operand is converd to type uint
                                        //
                                        left = ForceConversion (tc, left, TypeManager.uint32_type);
-                                       right = ForceConversion (tc, left, TypeManager.uint32_type);
+                                       right = ForceConversion (tc, right, TypeManager.uint32_type);
                                        type = TypeManager.uint32_type;
                                } 
+                       } else if (l == TypeManager.decimal_type || r == TypeManager.decimal_type){
+                               if (l != TypeManager.decimal_type)
+                                       left = ConvertImplicit (tc, left, TypeManager.decimal_type, location);
+                               if (r != TypeManager.decimal_type)
+                                       right = ConvertImplicit (tc, right, TypeManager.decimal_type, location);
+
+                               type = TypeManager.decimal_type;
                        } else {
                                left = ForceConversion (tc, left, TypeManager.int32_type);
                                right = ForceConversion (tc, right, TypeManager.int32_type);
@@ -1382,11 +2053,10 @@ namespace CIR {
 
                void error19 (TypeContainer tc)
                {
-                       tc.RootContext.Report.Error (
-                               19,
-                               "Operator " + OperName () + " cannot be applied to operands of type `" +
-                               TypeManager.CSharpName (left.Type) + "' and `" +
-                               TypeManager.CSharpName (right.Type) + "'");
+                       Error (tc, 19,
+                              "Operator " + OperName () + " cannot be applied to operands of type `" +
+                              TypeManager.CSharpName (left.Type) + "' and `" +
+                              TypeManager.CSharpName (right.Type) + "'");
                                                     
                }
                
@@ -1403,11 +2073,14 @@ namespace CIR {
                        }
                        right = e;
 
-                       if (((e = ConvertImplicit (tc, left, TypeManager.int32_type)) != null) ||
-                           ((e = ConvertImplicit (tc, left, TypeManager.uint32_type)) != null) ||
-                           ((e = ConvertImplicit (tc, left, TypeManager.int64_type)) != null) ||
-                           ((e = ConvertImplicit (tc, left, TypeManager.uint64_type)) != null)){
+                       Location loc = location;
+                       
+                       if (((e = ConvertImplicit (tc, left, TypeManager.int32_type, loc)) != null) ||
+                           ((e = ConvertImplicit (tc, left, TypeManager.uint32_type, loc)) != null) ||
+                           ((e = ConvertImplicit (tc, left, TypeManager.int64_type, loc)) != null) ||
+                           ((e = ConvertImplicit (tc, left, TypeManager.uint64_type, loc)) != null)){
                                left = e;
+                               type = e.Type;
 
                                return this;
                        }
@@ -1427,49 +2100,32 @@ namespace CIR {
                        
                        string op = "op_" + oper;
 
-                       left_expr = MemberLookup (tc.RootContext, l, op, false);
-
-                       right_expr = MemberLookup (tc.RootContext, r, op, false);
-
-                       if (left_expr != null || right_expr != null) {
-                               //
-                               // Now we need to form the union of these two sets and
-                               // then call OverloadResolve on that.
-                               //
-                               MethodGroupExpr left_set = null, right_set = null;
-                               int length1 = 0, length2 = 0;
+                       left_expr = MemberLookup (tc, l, op, false);
 
-                               if (left_expr != null) {
-                                       left_set = (MethodGroupExpr) left_expr;
-                                       length1 = left_set.Methods.Length;
-                               }
+                       if (left_expr == null && l != TypeManager.object_type)
+                               left_expr = MemberLookup (tc, l.BaseType, op, false);
+                       
+                       right_expr = MemberLookup (tc, r, op, false);
+                       if (right_expr != null && r != TypeManager.object_type)
+                               right_expr = MemberLookup (tc, r.BaseType, op, false);
+                       
 
-                               if (right_expr != null) {
-                                       right_set = (MethodGroupExpr) right_expr;
-                                       length2 = right_set.Methods.Length;
-                               }
+                       MethodGroupExpr union = Invocation.MakeUnionSet (left_expr, right_expr);
 
-                               MemberInfo [] mi = new MemberInfo [length1 + length2];
-                               if (left_set != null)
-                                       left_set.Methods.CopyTo (mi, 0);
-                               if (right_set != null)
-                                       right_set.Methods.CopyTo (mi, length1);
-                               
-                               MethodGroupExpr union = new MethodGroupExpr (mi);
-                               
+                       if (union != null) {
                                Arguments = new ArrayList ();
                                Arguments.Add (new Argument (left, Argument.AType.Expression));
                                Arguments.Add (new Argument (right, Argument.AType.Expression));
-
                        
                                method = Invocation.OverloadResolve (tc, union, Arguments, location);
                                if (method != null) {
-                                       Method m = (Method) TypeContainer.LookupMethodByBuilder (method);
-                                       type = m.GetReturnType (tc);
+                                       MethodInfo mi = (MethodInfo) method;
+                                       
+                                       type = mi.ReturnType;
                                        return this;
                                }
-                       }
-
+                       }       
+                       
                        //
                        // Step 2: Default operations on CLI native types.
                        //
@@ -1477,14 +2133,62 @@ namespace CIR {
                        // Only perform numeric promotions on:
                        // +, -, *, /, %, &, |, ^, ==, !=, <, >, <=, >=
                        //
-                       if (oper == Operator.ShiftLeft || oper == Operator.ShiftRight){
+                       if (oper == Operator.Addition){
+                               //
+                               // If any of the arguments is a string, cast to string
+                               //
+                               if (l == TypeManager.string_type){
+                                       if (r == TypeManager.string_type){
+                                               // string + string
+                                               method = TypeManager.string_concat_string_string;
+                                       } else {
+                                               // string + object
+                                               method = TypeManager.string_concat_object_object;
+                                               right = ConvertImplicit (tc, right,
+                                                                        TypeManager.object_type, location);
+                                       }
+                                       type = TypeManager.string_type;
+
+                                       Arguments = new ArrayList ();
+                                       Arguments.Add (new Argument (left, Argument.AType.Expression));
+                                       Arguments.Add (new Argument (right, Argument.AType.Expression));
+
+                                       return this;
+                                       
+                               } else if (r == TypeManager.string_type){
+                                       // object + string
+                                       method = TypeManager.string_concat_object_object;
+                                       Arguments = new ArrayList ();
+                                       Arguments.Add (new Argument (left, Argument.AType.Expression));
+                                       Arguments.Add (new Argument (right, Argument.AType.Expression));
+
+                                       left = ConvertImplicit (tc, left, TypeManager.object_type, location);
+                                       type = TypeManager.string_type;
+
+                                       return this;
+                               }
+
+                               //
+                               // FIXME: is Delegate operator + (D x, D y) handled?
+                               //
+                       }
+                       
+                       if (oper == Operator.LeftShift || oper == Operator.RightShift)
                                return CheckShiftArguments (tc);
-                       } else if (oper == Operator.LogicalOr || oper == Operator.LogicalAnd){
 
+                       if (oper == Operator.LogicalOr || oper == Operator.LogicalAnd){
                                if (l != TypeManager.bool_type || r != TypeManager.bool_type)
                                        error19 (tc);
-                       } else
-                               DoNumericPromotions (tc, l, r);
+
+                               type = TypeManager.bool_type;
+                               return this;
+                       } 
+
+                       //
+                       // We are dealing with numbers
+                       //
+
+                       DoNumericPromotions (tc, l, r);
 
                        if (left == null || right == null)
                                return null;
@@ -1499,13 +2203,14 @@ namespace CIR {
                                        error19 (tc);
                                        return null;
                                }
+                               type = l;
                        }
 
-                       if (oper == Operator.Equal ||
-                           oper == Operator.NotEqual ||
-                           oper == Operator.LessOrEqual ||
+                       if (oper == Operator.Equality ||
+                           oper == Operator.Inequality ||
+                           oper == Operator.LessThanOrEqual ||
                            oper == Operator.LessThan ||
-                           oper == Operator.GreaterOrEqual ||
+                           oper == Operator.GreaterThanOrEqual ||
                            oper == Operator.GreaterThan){
                                type = TypeManager.bool_type;
                        }
@@ -1513,7 +2218,7 @@ namespace CIR {
                        return this;
                }
                
-               public override Expression Resolve (TypeContainer tc)
+               public override Expression DoResolve (TypeContainer tc)
                {
                        left = left.Resolve (tc);
                        right = right.Resolve (tc);
@@ -1521,17 +2226,28 @@ namespace CIR {
                        if (left == null || right == null)
                                return null;
 
+                       if (left.Type == null)
+                               throw new Exception (
+                                       "Resolve returned non null, but did not set the type! (" +
+                                       left + ")");
+                       if (right.Type == null)
+                               throw new Exception (
+                                       "Resolve returned non null, but did not set the type! (" +
+                                       right + ")");
+
+                       eclass = ExprClass.Value;
+
                        return ResolveOperator (tc);
                }
 
                public bool IsBranchable ()
                {
-                       if (oper == Operator.Equal ||
-                           oper == Operator.NotEqual ||
+                       if (oper == Operator.Equality ||
+                           oper == Operator.Inequality ||
                            oper == Operator.LessThan ||
                            oper == Operator.GreaterThan ||
-                           oper == Operator.LessOrEqual ||
-                           oper == Operator.GreaterOrEqual){
+                           oper == Operator.LessThanOrEqual ||
+                           oper == Operator.GreaterThanOrEqual){
                                return true;
                        } else
                                return false;
@@ -1559,14 +2275,14 @@ namespace CIR {
                        right.Emit (ec);
                        
                        switch (oper){
-                       case Operator.Equal:
+                       case Operator.Equality:
                                if (close_target)
                                        opcode = OpCodes.Beq_S;
                                else
                                        opcode = OpCodes.Beq;
                                break;
 
-                       case Operator.NotEqual:
+                       case Operator.Inequality:
                                if (close_target)
                                        opcode = OpCodes.Bne_Un_S;
                                else
@@ -1587,14 +2303,14 @@ namespace CIR {
                                        opcode = OpCodes.Bgt;
                                break;
 
-                       case Operator.LessOrEqual:
+                       case Operator.LessThanOrEqual:
                                if (close_target)
                                        opcode = OpCodes.Ble_S;
                                else
                                        opcode = OpCodes.Ble;
                                break;
 
-                       case Operator.GreaterOrEqual:
+                       case Operator.GreaterThanOrEqual:
                                if (close_target)
                                        opcode = OpCodes.Bge_S;
                                else
@@ -1648,21 +2364,21 @@ namespace CIR {
 
                                break;
 
-                       case Operator.Divide:
+                       case Operator.Division:
                                if (l == TypeManager.uint32_type || l == TypeManager.uint64_type)
                                        opcode = OpCodes.Div_Un;
                                else
                                        opcode = OpCodes.Div;
                                break;
 
-                       case Operator.Modulo:
+                       case Operator.Modulus:
                                if (l == TypeManager.uint32_type || l == TypeManager.uint64_type)
                                        opcode = OpCodes.Rem_Un;
                                else
                                        opcode = OpCodes.Rem;
                                break;
 
-                       case Operator.Add:
+                       case Operator.Addition:
                                if (ec.CheckState){
                                        if (l == TypeManager.int32_type || l == TypeManager.int64_type)
                                                opcode = OpCodes.Add_Ovf;
@@ -1674,7 +2390,7 @@ namespace CIR {
                                        opcode = OpCodes.Add;
                                break;
 
-                       case Operator.Subtract:
+                       case Operator.Subtraction:
                                if (ec.CheckState){
                                        if (l == TypeManager.int32_type || l == TypeManager.int64_type)
                                                opcode = OpCodes.Sub_Ovf;
@@ -1686,19 +2402,19 @@ namespace CIR {
                                        opcode = OpCodes.Sub;
                                break;
 
-                       case Operator.ShiftRight:
+                       case Operator.RightShift:
                                opcode = OpCodes.Shr;
                                break;
                                
-                       case Operator.ShiftLeft:
+                       case Operator.LeftShift:
                                opcode = OpCodes.Shl;
                                break;
 
-                       case Operator.Equal:
+                       case Operator.Equality:
                                opcode = OpCodes.Ceq;
                                break;
 
-                       case Operator.NotEqual:
+                       case Operator.Inequality:
                                ec.ig.Emit (OpCodes.Ceq);
                                ec.ig.Emit (OpCodes.Ldc_I4_0);
                                
@@ -1713,14 +2429,14 @@ namespace CIR {
                                opcode = OpCodes.Cgt;
                                break;
 
-                       case Operator.LessOrEqual:
+                       case Operator.LessThanOrEqual:
                                ec.ig.Emit (OpCodes.Cgt);
                                ec.ig.Emit (OpCodes.Ldc_I4_0);
                                
                                opcode = OpCodes.Ceq;
                                break;
 
-                       case Operator.GreaterOrEqual:
+                       case Operator.GreaterThanOrEqual:
                                ec.ig.Emit (OpCodes.Clt);
                                ec.ig.Emit (OpCodes.Ldc_I4_1);
                                
@@ -1752,12 +2468,14 @@ namespace CIR {
 
        public class Conditional : Expression {
                Expression expr, trueExpr, falseExpr;
+               Location l;
                
-               public Conditional (Expression expr, Expression trueExpr, Expression falseExpr)
+               public Conditional (Expression expr, Expression trueExpr, Expression falseExpr, Location l)
                {
                        this.expr = expr;
                        this.trueExpr = trueExpr;
                        this.falseExpr = falseExpr;
+                       this.l = l;
                }
 
                public Expression Expr {
@@ -1778,15 +2496,62 @@ namespace CIR {
                        }
                }
 
-               public override Expression Resolve (TypeContainer tc)
+               public override Expression DoResolve (TypeContainer tc)
                {
-                       // FIXME: Implement;
-                       throw new Exception ("Unimplemented");
-                       // return this;
+                       expr = expr.Resolve (tc);
+
+                       if (expr.Type != TypeManager.bool_type)
+                               expr = Expression.ConvertImplicitRequired (
+                                       tc, expr, TypeManager.bool_type, l);
+                       
+                       trueExpr = trueExpr.Resolve (tc);
+                       falseExpr = falseExpr.Resolve (tc);
+
+                       if (expr == null || trueExpr == null || falseExpr == null)
+                               return null;
+                       
+                       if (trueExpr.Type == falseExpr.Type)
+                               type = trueExpr.Type;
+                       else {
+                               Expression conv;
+
+                               //
+                               // First, if an implicit conversion exists from trueExpr
+                               // to falseExpr, then the result type is of type falseExpr.Type
+                               //
+                               conv = ConvertImplicit (tc, trueExpr, falseExpr.Type, l);
+                               if (conv != null){
+                                       type = falseExpr.Type;
+                                       trueExpr = conv;
+                               } else if ((conv = ConvertImplicit (tc,falseExpr,trueExpr.Type,l)) != null){
+                                       type = trueExpr.Type;
+                                       falseExpr = conv;
+                               } else {
+                                       Error (tc, 173, l, "The type of the conditional expression can " +
+                                              "not be computed because there is no implicit conversion" +
+                                              " from `" + TypeManager.CSharpName (trueExpr.Type) + "'" +
+                                              " and `" + TypeManager.CSharpName (falseExpr.Type) + "'");
+                                       return null;
+                               }
+                       }
+
+                       eclass = ExprClass.Value;
+                       return this;
                }
 
                public override void Emit (EmitContext ec)
                {
+                       ILGenerator ig = ec.ig;
+                       Label false_target = ig.DefineLabel ();
+                       Label end_target = ig.DefineLabel ();
+
+                       expr.Emit (ec);
+                       ig.Emit (OpCodes.Brfalse, false_target);
+                       trueExpr.Emit (ec);
+                       ig.Emit (OpCodes.Br, end_target);
+                       ig.MarkLabel (false_target);
+                       falseExpr.Emit (ec);
+                       ig.MarkLabel (end_target);
                }
        }
 
@@ -1846,7 +2611,7 @@ namespace CIR {
                        Expression e;
                        Report r = tc.RootContext.Report;
 
-                       e = MemberLookup (tc.RootContext, tc.TypeBuilder, Name, true);
+                       e = MemberLookup (tc, tc.TypeBuilder, Name, true);
                        if (e != null){
                                if (e is TypeExpr)
                                        return e;
@@ -1868,8 +2633,8 @@ namespace CIR {
                        //
                        // FIXME: implement me.
 
-                       r.Error (103, Location, "The name `" + Name + "' does not exist in the class `" +
-                                tc.Name + "'");
+                       Error (tc, 103, Location, "The name `" + Name + "' does not exist in the class `" +
+                              tc.Name + "'");
 
                        return null;
                }
@@ -1880,7 +2645,7 @@ namespace CIR {
                // simple_names and qualified_identifiers are placed on
                // the tree equally.
                //
-               public override Expression Resolve (TypeContainer tc)
+               public override Expression DoResolve (TypeContainer tc)
                {
                        if (Name.IndexOf (".") != -1)
                                return ResolveMemberAccess (tc, Name);
@@ -1898,7 +2663,19 @@ namespace CIR {
        //   A simple interface that should be implemeneted by LValues
        // </summary>
        public interface LValue {
-               void Store (ILGenerator ig);
+
+               // <summary>
+               //   The Store method should store the contents of the top
+               //   of the stack into the storage that is implemented by
+               //   the particular implementation of LValue
+               // </summary>
+               void Store     (EmitContext ec);
+
+               // <summary>
+               //   The AddressOf method should generate code that loads
+               //   the address of the LValue and leaves it on the stack
+               // </summary>
+               void AddressOf (EmitContext ec);
        }
        
        public class LocalVariableReference : Expression, LValue {
@@ -1918,7 +2695,7 @@ namespace CIR {
                        }
                }
                
-               public override Expression Resolve (TypeContainer tc)
+               public override Expression DoResolve (TypeContainer tc)
                {
                        VariableInfo vi = Block.GetVariableInfo (Name);
 
@@ -1932,6 +2709,8 @@ namespace CIR {
                        ILGenerator ig = ec.ig;
                        int idx = vi.Idx;
 
+                       vi.Used = true;
+                       
                        switch (idx){
                        case 0:
                                ig.Emit (OpCodes.Ldloc_0);
@@ -1950,19 +2729,21 @@ namespace CIR {
                                break;
 
                        default:
-                               if (idx < 255)
-                                       ig.Emit (OpCodes.Ldloc_S, idx);
+                               if (idx <= 255)
+                                       ig.Emit (OpCodes.Ldloc_S, (byte) idx);
                                else
                                        ig.Emit (OpCodes.Ldloc, idx);
                                break;
                        }
                }
 
-               public void Store (ILGenerator ig)
+               public void Store (EmitContext ec)
                {
+                       ILGenerator ig = ec.ig;
                        VariableInfo vi = VariableInfo;
                        int idx = vi.Idx;
-                                       
+
+                       vi.Assigned = true;
                        switch (idx){
                        case 0:
                                ig.Emit (OpCodes.Stloc_0);
@@ -1981,13 +2762,27 @@ namespace CIR {
                                break;
                                
                        default:
-                               if (idx < 255)
-                                       ig.Emit (OpCodes.Stloc_S, idx);
+                               if (idx <= 255)
+                                       ig.Emit (OpCodes.Stloc_S, (byte) idx);
                                else
                                        ig.Emit (OpCodes.Stloc, idx);
                                break;
                        }
                }
+
+               public void AddressOf (EmitContext ec)
+               {
+                       VariableInfo vi = VariableInfo;
+                       int idx = vi.Idx;
+
+                       vi.Used = true;
+                       vi.Assigned = true;
+                       
+                       if (idx <= 255)
+                               ec.ig.Emit (OpCodes.Ldloca_S, (byte) idx);
+                       else
+                               ec.ig.Emit (OpCodes.Ldloca, idx);
+               }
        }
 
        public class ParameterReference : Expression, LValue {
@@ -2003,7 +2798,7 @@ namespace CIR {
                        eclass = ExprClass.Variable;
                }
 
-               public override Expression Resolve (TypeContainer tc)
+               public override Expression DoResolve (TypeContainer tc)
                {
                        Type [] types = Pars.GetParameterInfo (tc);
 
@@ -2014,20 +2809,28 @@ namespace CIR {
 
                public override void Emit (EmitContext ec)
                {
-                       if (Idx < 255)
-                               ec.ig.Emit (OpCodes.Ldarg_S, Idx);
+                       if (Idx <= 255)
+                               ec.ig.Emit (OpCodes.Ldarg_S, (byte) Idx);
                        else
                                ec.ig.Emit (OpCodes.Ldarg, Idx);
                }
 
-               public void Store (ILGenerator ig)
+               public void Store (EmitContext ec)
                {
-                       if (Idx < 255)
-                               ig.Emit (OpCodes.Starg_S, Idx);
+                       if (Idx <= 255)
+                               ec.ig.Emit (OpCodes.Starg_S, (byte) Idx);
                        else
-                               ig.Emit (OpCodes.Starg, Idx);
+                               ec.ig.Emit (OpCodes.Starg, Idx);
                        
                }
+
+               public void AddressOf (EmitContext ec)
+               {
+                       if (Idx <= 255)
+                               ec.ig.Emit (OpCodes.Ldarga_S, (byte) Idx);
+                       else
+                               ec.ig.Emit (OpCodes.Ldarga, Idx);
+               }
        }
        
        // <summary>
@@ -2109,91 +2912,6 @@ namespace CIR {
                        }
                }
 
-               /// <summary>
-               ///   Computes whether Argument `a' and the Type t of the  ParameterInfo `pi' are
-               ///   compatible, and if so, how good is the match (in terms of
-               ///   "better conversions" (7.4.2.3).
-               ///
-               ///   0   is the best possible match.
-               ///   -1  represents a type mismatch.
-               ///   -2  represents a ref/out mismatch.
-               /// </summary>
-               static int Badness (Argument a, Type t)
-               {
-                       Expression argument_expr = a.Expr;
-                       Type argument_type = argument_expr.Type;
-
-                       if (argument_type == null){
-                               throw new Exception ("Expression of type " + a.Expr + " does not resolve its type");
-                       }
-                       
-                       if (t == argument_type) 
-                               return 0;
-
-                       //
-                       // Now probe whether an implicit constant expression conversion
-                       // can be used.
-                       //
-                       // An implicit constant expression conversion permits the following
-                       // conversions:
-                       //
-                       //    * A constant-expression of type `int' can be converted to type
-                       //      sbyte, byute, short, ushort, uint, ulong provided the value of
-                       //      of the expression is withing the range of the destination type.
-                       //
-                       //    * A constant-expression of type long can be converted to type
-                       //      ulong, provided the value of the constant expression is not negative
-                       //
-                       // FIXME: Note that this assumes that constant folding has
-                       // taken place.  We dont do constant folding yet.
-                       //
-
-                       if (argument_type == TypeManager.int32_type && argument_expr is IntLiteral){
-                               IntLiteral ei = (IntLiteral) argument_expr;
-                               int value = ei.Value;
-                               
-                               if (t == TypeManager.sbyte_type){
-                                       if (value >= SByte.MinValue && value <= SByte.MaxValue)
-                                               return 1;
-                               } else if (t == TypeManager.byte_type){
-                                       if (Byte.MinValue >= 0 && value <= Byte.MaxValue)
-                                               return 1;
-                               } else if (t == TypeManager.short_type){
-                                       if (value >= Int16.MinValue && value <= Int16.MaxValue)
-                                               return 1;
-                               } else if (t == TypeManager.ushort_type){
-                                       if (value >= UInt16.MinValue && value <= UInt16.MaxValue)
-                                               return 1;
-                               } else if (t == TypeManager.uint32_type){
-                                       //
-                                       // we can optimize this case: a positive int32
-                                       // always fits on a uint32
-                                       //
-                                       if (value >= 0)
-                                               return 1;
-                               } else if (t == TypeManager.uint64_type){
-                                       //
-                                       // we can optimize this case: a positive int32
-                                       // always fits on a uint64
-                                       //
-                                       if (value >= 0)
-                                               return 1;
-                               }
-                       } else if (argument_type == TypeManager.int64_type && argument_expr is LongLiteral){
-                               LongLiteral ll = (LongLiteral) argument_expr;
-                               
-                               if (t == TypeManager.uint64_type){
-                                       if (ll.Value > 0)
-                                               return 1;
-                               }
-                       }
-                       
-                       // FIXME: Implement user-defined implicit conversions here.
-                       // FIXME: Implement better conversion here.
-                       
-                       return -1;
-               }
-
                // <summary>
                //   Returns the Parameters (a ParameterData interface) for the
                //   Method `mb'
@@ -2221,13 +2939,19 @@ namespace CIR {
                        }
                }
 
+               // <summary>
+               //   Tells whether a user defined conversion from Type `from' to
+               //   Type `to' exists.
+               //
+               //   FIXME: we could implement a cache here. 
+               // </summary>
                static bool ConversionExists (TypeContainer tc, Type from, Type to)
                {
                        // Locate user-defined implicit operators
 
                        Expression mg;
                        
-                       mg = MemberLookup (tc.RootContext, to, "op_Implicit", false);
+                       mg = MemberLookup (tc, to, "op_Implicit", false);
 
                        if (mg != null) {
                                MethodGroupExpr me = (MethodGroupExpr) mg;
@@ -2242,7 +2966,7 @@ namespace CIR {
                                }
                        }
 
-                       mg = MemberLookup (tc.RootContext, from, "op_Implicit", false);
+                       mg = MemberLookup (tc, from, "op_Implicit", false);
 
                        if (mg != null) {
                                MethodGroupExpr me = (MethodGroupExpr) mg;
@@ -2250,9 +2974,9 @@ namespace CIR {
                                for (int i = me.Methods.Length; i > 0;) {
                                        i--;
                                        MethodBase mb = me.Methods [i];
-                                       Method method = (Method) TypeContainer.LookupMethodByBuilder (mb);
+                                       MethodInfo mi = (MethodInfo) mb;
                                        
-                                       if (method.GetReturnType (tc) == to)
+                                       if (mi.ReturnType == to)
                                                return true;
                                }
                        }
@@ -2265,7 +2989,7 @@ namespace CIR {
                //  Returns : 1 if a->p is better
                //            0 if a->q or neither is better 
                // </summary>
-               static int BetterConversion (TypeContainer tc, Argument a, Type p, Type q)
+               static int BetterConversion (TypeContainer tc, Argument a, Type p, Type q, bool use_standard)
                {
                        
                        Type argument_type = a.Expr.Type;
@@ -2273,11 +2997,10 @@ namespace CIR {
 
                        if (argument_type == null)
                                throw new Exception ("Expression of type " + a.Expr + " does not resolve its type");
-                       
-                       
+
                        if (p == q)
                                return 0;
-
+                       
                        if (argument_type == p)
                                return 1;
 
@@ -2302,7 +3025,7 @@ namespace CIR {
                        // taken place.  We dont do constant folding yet.
                        //
 
-                       if (argument_type == TypeManager.int32_type && argument_expr is IntLiteral){
+                       if (argument_expr is IntLiteral){
                                IntLiteral ei = (IntLiteral) argument_expr;
                                int value = ei.Value;
                                
@@ -2342,16 +3065,29 @@ namespace CIR {
                                }
                        }
 
-                       // User-defined Implicit conversions come here
-                       
-                       if (q != null)
-                               if (ConversionExists (tc, p, q) == true &&
-                                   ConversionExists (tc, q, p) == false)
+                       if (q == null) {
+
+                               Expression tmp;
+
+                               if (use_standard)
+                                       tmp = ConvertImplicitStandard (tc, argument_expr, p, Location.Null);
+                               else
+                                       tmp = ConvertImplicit (tc, argument_expr, p, Location.Null);
+
+                               if (tmp != null)
                                        return 1;
-                       
+                               else
+                                       return 0;
+
+                       }
+
+                       if (ConversionExists (tc, p, q) == true &&
+                           ConversionExists (tc, q, p) == false)
+                               return 1;
+
                        if (p == TypeManager.sbyte_type)
                                if (q == TypeManager.byte_type || q == TypeManager.ushort_type ||
-                                   q == TypeManager.uint32_type || q == TypeManager.uint64_type) 
+                                   q == TypeManager.uint32_type || q == TypeManager.uint64_type)
                                        return 1;
 
                        if (p == TypeManager.short_type)
@@ -2375,7 +3111,9 @@ namespace CIR {
                //  0 if candidate ain't better
                //  1 if candidate is better than the current best match
                // </summary>
-               static int BetterFunction (TypeContainer tc, ArrayList args, MethodBase candidate, MethodBase best)
+               static int BetterFunction (TypeContainer tc, ArrayList args,
+                                          MethodBase candidate, MethodBase best,
+                                          bool use_standard)
                {
                        ParameterData candidate_pd = GetParameterData (candidate);
                        ParameterData best_pd;
@@ -2397,11 +3135,11 @@ namespace CIR {
                                                
                                                Argument a = (Argument) args [j];
                                                
-                                               x = BetterConversion (tc, a, candidate_pd.ParameterType (j), null);
+                                               x = BetterConversion (
+                                                       tc, a, candidate_pd.ParameterType (j), null,
+                                                       use_standard);
                                                
-                                               if (x > 0)
-                                                       continue;
-                                               else 
+                                               if (x <= 0)
                                                        break;
                                        }
                                        
@@ -2426,9 +3164,9 @@ namespace CIR {
                                        Argument a = (Argument) args [j];
 
                                        x = BetterConversion (tc, a, candidate_pd.ParameterType (j),
-                                                             best_pd.ParameterType (j));
+                                                             best_pd.ParameterType (j), use_standard);
                                        y = BetterConversion (tc, a, best_pd.ParameterType (j),
-                                                             candidate_pd.ParameterType (j));
+                                                             candidate_pd.ParameterType (j), use_standard);
                                        
                                        rating1 += x;
                                        rating2 += y;
@@ -2459,7 +3197,41 @@ namespace CIR {
                        sb.Append (")");
                        return sb.ToString ();
                }
-               
+
+               public static MethodGroupExpr MakeUnionSet (Expression mg1, Expression mg2)
+               {
+
+                       if (mg1 != null || mg2 != null) {
+                                       
+                               MethodGroupExpr left_set = null, right_set = null;
+                               int length1 = 0, length2 = 0;
+                               
+                               if (mg1 != null) {
+                                       left_set = (MethodGroupExpr) mg1;
+                                       length1 = left_set.Methods.Length;
+                               }
+                               
+                               if (mg2 != null) {
+                                       right_set = (MethodGroupExpr) mg2;
+                                       length2 = right_set.Methods.Length;
+                               }
+                               
+                               MemberInfo [] miset = new MemberInfo [length1 + length2];
+                               if (left_set != null)
+                                       left_set.Methods.CopyTo (miset, 0);
+                               if (right_set != null)
+                                       right_set.Methods.CopyTo (miset, length1);
+                               
+                               MethodGroupExpr union = new MethodGroupExpr (miset);
+
+                               return union;
+                               
+                       }
+
+                       return null;
+
+               }
+
                // <summary>
                //   Find the Applicable Function Members (7.4.2.1)
                //
@@ -2469,12 +3241,19 @@ namespace CIR {
                //
                //   Arguments: ArrayList containing resolved Argument objects.
                //
+               //   loc: The location if we want an error to be reported, or a Null
+               //        location for "probing" purposes.
+               //
+               //   inside_user_defined: controls whether OverloadResolve should use the 
+               //   ConvertImplicit or ConvertImplicitStandard during overload resolution.
+               //
                //   Returns: The MethodBase (either a ConstructorInfo or a MethodInfo)
                //            that is the best match of me on Arguments.
                //
                // </summary>
                public static MethodBase OverloadResolve (TypeContainer tc, MethodGroupExpr me,
-                                                         ArrayList Arguments, Location loc)
+                                                         ArrayList Arguments, Location loc,
+                                                         bool use_standard)
                {
                        ArrayList afm = new ArrayList ();
                        int best_match_idx = -1;
@@ -2485,8 +3264,8 @@ namespace CIR {
                                i--;
                                MethodBase candidate  = me.Methods [i];
                                int x;
-                               
-                               x = BetterFunction (tc, Arguments, candidate, method);
+
+                               x = BetterFunction (tc, Arguments, candidate, method, use_standard);
                                
                                if (x == 0)
                                        continue;
@@ -2495,34 +3274,34 @@ namespace CIR {
                                        method = me.Methods [best_match_idx];
                                }
                        }
-                       
-                       if (best_match_idx != -1)
-                               return method;
-
-                       // Now we see if we can at least find a method with the same number of arguments
-                       // and then try doing implicit conversion on the arguments
 
                        if (Arguments == null)
                                argument_count = 0;
                        else
                                argument_count = Arguments.Count;
-
-                       ParameterData pd = null;
                        
-                       for (int i = me.Methods.Length; i > 0;) {
-                               i--;
-                               MethodBase mb = me.Methods [i];
-                               pd = GetParameterData (mb);
+                       ParameterData pd;
+                       
+                       // Now we see if we can at least find a method with the same number of arguments
+                       // and then try doing implicit conversion on the arguments
+                       if (best_match_idx == -1) {
+                               
+                               for (int i = me.Methods.Length; i > 0;) {
+                                       i--;
+                                       MethodBase mb = me.Methods [i];
+                                       pd = GetParameterData (mb);
+                                       
+                                       if (pd.Count == argument_count) {
+                                               best_match_idx = i;
+                                               method = me.Methods [best_match_idx];
+                                               break;
+                                       } else
+                                               continue;
+                               }
 
-                               if (pd.Count == argument_count) {
-                                       best_match_idx = i;
-                                       method = me.Methods [best_match_idx];
-                                       break;
-                               } else
-                                       continue;
                        }
 
-                       if (best_match_idx == -1)
+                       if (method == null)
                                return null;
 
                        // And now convert implicitly, each argument to the required type
@@ -2533,32 +3312,48 @@ namespace CIR {
                                j--;
                                Argument a = (Argument) Arguments [j];
                                Expression a_expr = a.Expr;
+                               Type parameter_type = pd.ParameterType (j);
                                
-                               Expression conv = ConvertImplicit (tc, a_expr, pd.ParameterType (j));
-
-                               if (conv == null) {
-                                       tc.RootContext.Report.Error (1502, loc,
-                                              "The best overloaded match for method '" + FullMethodDesc (method) +
-                                              "' has some invalid arguments");
-                                       tc.RootContext.Report.Error (1503, loc,
-                                              "Argument " + (j+1) +
-                                              " : Cannot convert from '" + TypeManager.CSharpName (a_expr.Type)
-                                              + "' to '" + TypeManager.CSharpName (pd.ParameterType (j)) + "'");
-                                       return null;
-                               }
+                               if (a_expr.Type != parameter_type){
+                                       Expression conv;
 
-                               //
-                               // Update the argument with the implicit conversion
-                               //
-                               if (a_expr != conv)
-                                       a.Expr = conv;
+                                       if (use_standard)
+                                               conv = ConvertImplicitStandard (tc, a_expr, parameter_type,
+                                                                               Location.Null);
+                                       else
+                                               conv = ConvertImplicit (tc, a_expr, parameter_type,
+                                                                       Location.Null);
+
+                                       if (conv == null){
+                                               if (!Location.IsNull (loc)) {
+                                                       Error (tc, 1502, loc,
+                                                              "The best overloaded match for method '" + FullMethodDesc (method) +
+                                                              "' has some invalid arguments");
+                                                       Error (tc, 1503, loc,
+                                                              "Argument " + (j+1) +
+                                                              ": Cannot convert from '" + TypeManager.CSharpName (a_expr.Type)
+                                                              + "' to '" + TypeManager.CSharpName (pd.ParameterType (j)) + "'");
+                                               }
+                                               return null;
+                                       }
+                                       //
+                                       // Update the argument with the implicit conversion
+                                       //
+                                       if (a_expr != conv)
+                                               a.Expr = conv;
+                               }
                        }
                        
                        return method;
                }
 
+               public static MethodBase OverloadResolve (TypeContainer tc, MethodGroupExpr me,
+                                                         ArrayList Arguments, Location loc)
+               {
+                       return OverloadResolve (tc, me, Arguments, loc, false);
+               }
                        
-               public override Expression Resolve (TypeContainer tc)
+               public override Expression DoResolve (TypeContainer tc)
                {
                        //
                        // First, resolve the expression that is used to
@@ -2569,7 +3364,7 @@ namespace CIR {
                                return null;
 
                        if (!(this.expr is MethodGroupExpr)){
-                               report118 (tc, this.expr, "method group");
+                               report118 (tc, Location, this.expr, "method group");
                                return null;
                        }
 
@@ -2586,10 +3381,11 @@ namespace CIR {
                                }
                        }
 
-                       method = OverloadResolve (tc, (MethodGroupExpr) this.expr, Arguments, Location);
+                       method = OverloadResolve (tc, (MethodGroupExpr) this.expr, Arguments,
+                                                 Location);
 
                        if (method == null){
-                               tc.RootContext.Report.Error (-6, Location,
+                               Error (tc, -6, Location,
                                       "Could not find any applicable function for this argument list");
                                return null;
                        }
@@ -2597,6 +3393,7 @@ namespace CIR {
                        if (method is MethodInfo)
                                type = ((MethodInfo)method).ReturnType;
 
+                       eclass = ExprClass.Value;
                        return this;
                }
 
@@ -2612,8 +3409,6 @@ namespace CIR {
                        for (int i = 0; i < top; i++){
                                Argument a = (Argument) Arguments [i];
 
-                               Console.WriteLine ("Perform the actual type widening of arguments here for things like: void fn (sbyte s);  ... fn (1)");
-                               
                                a.Emit (ec);
                        }
                }
@@ -2625,11 +3420,17 @@ namespace CIR {
                        if (!is_static){
                                MethodGroupExpr mg = (MethodGroupExpr) this.expr;
 
+                               //
+                               // If this is ourselves, push "this"
+                               //
                                if (mg.InstanceExpression == null){
-                                       throw new Exception ("Internal compiler error.  Should check in the method groups for static/instance");
+                                       ec.ig.Emit (OpCodes.Ldarg_0);
+                               } else {
+                                       //
+                                       // Push the instance expression
+                                       //
+                                       mg.InstanceExpression.Emit (ec);
                                }
-
-                               mg.InstanceExpression.Emit (ec);
                        }
 
                        if (Arguments != null)
@@ -2698,7 +3499,7 @@ namespace CIR {
                        Location      = loc;
                }
                
-               public override Expression Resolve (TypeContainer tc)
+               public override Expression DoResolve (TypeContainer tc)
                {
                        type = tc.LookupType (RequestedType, false);
 
@@ -2707,14 +3508,14 @@ namespace CIR {
 
                        Expression ml;
 
-                       ml = MemberLookup (tc.RootContext, type, ".ctor", false,
+                       ml = MemberLookup (tc, type, ".ctor", false,
                                           MemberTypes.Constructor, AllBindingsFlags);
 
                        if (! (ml is MethodGroupExpr)){
                                //
                                // FIXME: Find proper error
                                //
-                               report118 (tc, ml, "method group");
+                               report118 (tc, Location, ml, "method group");
                                return null;
                        }
                        
@@ -2728,14 +3529,16 @@ namespace CIR {
                                }
                        }
 
-                       method = Invocation.OverloadResolve (tc, (MethodGroupExpr) ml, Arguments, Location);
+                       method = Invocation.OverloadResolve (tc, (MethodGroupExpr) ml, Arguments,
+                                                            Location);
 
                        if (method == null) {
-                               tc.RootContext.Report.Error (-6, Location,
-                               "New invocation: Can not find a constructor for this argument list");
+                               Error (tc, -6, Location,
+                                      "New invocation: Can not find a constructor for this argument list");
                                return null;
                        }
-                       
+
+                       eclass = ExprClass.Value;
                        return this;
                }
 
@@ -2756,7 +3559,7 @@ namespace CIR {
        // Represents the `this' construct
        //
        public class This : Expression, LValue {
-               public override Expression Resolve (TypeContainer tc)
+               public override Expression DoResolve (TypeContainer tc)
                {
                        eclass = ExprClass.Variable;
                        type = tc.TypeBuilder;
@@ -2772,38 +3575,51 @@ namespace CIR {
                        ec.ig.Emit (OpCodes.Ldarg_0);
                }
 
-               public void Store (ILGenerator ig)
+               public void Store (EmitContext ec)
                {
                        //
-                       // Assignment to the "this" variable
+                       // Assignment to the "this" variable.
                        //
-                       ig.Emit (OpCodes.Starg, 0);
+                       // FIXME: Apparently this is a bug that we
+                       // must catch as `this' seems to be readonly ;-)
+                       //
+                       ec.ig.Emit (OpCodes.Starg, 0);
+               }
+
+               public void AddressOf (EmitContext ec)
+               {
+                       ec.ig.Emit (OpCodes.Ldarga_S, (byte) 0);
                }
        }
 
+       // <summary>
+       //   Implements the typeof operator
+       // </summary>
        public class TypeOf : Expression {
                public readonly string QueriedType;
+               Type typearg;
                
                public TypeOf (string queried_type)
                {
                        QueriedType = queried_type;
                }
 
-               public override Expression Resolve (TypeContainer tc)
+               public override Expression DoResolve (TypeContainer tc)
                {
-                       type = tc.LookupType (QueriedType, false);
+                       typearg = tc.LookupType (QueriedType, false);
 
-                       if (type == null)
+                       if (typearg == null)
                                return null;
-                       
+
+                       type = TypeManager.type_type;
                        eclass = ExprClass.Type;
                        return this;
                }
 
                public override void Emit (EmitContext ec)
                {
-                       throw new Exception ("Implement me");
-                       // FIXME: Implement.
+                       ec.ig.Emit (OpCodes.Ldtoken, typearg);
+                       ec.ig.Emit (OpCodes.Call, TypeManager.system_type_get_type_from_handle);
                }
        }
 
@@ -2815,7 +3631,7 @@ namespace CIR {
                        this.QueriedType = queried_type;
                }
 
-               public override Expression Resolve (TypeContainer tc)
+               public override Expression DoResolve (TypeContainer tc)
                {
                        // FIXME: Implement;
                        throw new Exception ("Unimplemented");
@@ -2845,14 +3661,14 @@ namespace CIR {
                        }
                }
                
-               public override Expression Resolve (TypeContainer tc)
+               public override Expression DoResolve (TypeContainer tc)
                {
                        Expression new_expression = expr.Resolve (tc);
 
                        if (new_expression == null)
                                return null;
 
-                       member_lookup = MemberLookup (tc.RootContext, expr.Type, Identifier, false);
+                       member_lookup = MemberLookup (tc, expr.Type, Identifier, false);
 
                        if (member_lookup is MethodGroupExpr){
                                MethodGroupExpr mg = (MethodGroupExpr) member_lookup;
@@ -2887,7 +3703,7 @@ namespace CIR {
 
                public override void Emit (EmitContext ec)
                {
-                       throw new Exception ("Implement me");
+                       throw new Exception ("Should not happen I think");
                }
 
        }
@@ -2908,7 +3724,7 @@ namespace CIR {
                        eclass = ExprClass.Namespace;
                }
 
-               public override Expression Resolve (TypeContainer tc)
+               public override Expression DoResolve (TypeContainer tc)
                {
                        return this;
                }
@@ -2929,7 +3745,7 @@ namespace CIR {
                        eclass = ExprClass.Type;
                }
 
-               override public Expression Resolve (TypeContainer tc)
+               override public Expression DoResolve (TypeContainer tc)
                {
                        return this;
                }
@@ -2969,7 +3785,7 @@ namespace CIR {
                        }
                }
                
-               override public Expression Resolve (TypeContainer tc)
+               override public Expression DoResolve (TypeContainer tc)
                {
                        return this;
                }
@@ -2980,31 +3796,6 @@ namespace CIR {
                }
        }
        
-       public class BuiltinTypeAccess : Expression {
-               public readonly string AccessBase;
-               public readonly string Method;
-               
-               public BuiltinTypeAccess (string type, string method)
-               {
-                       System.Console.WriteLine ("DUDE! This type should be fully resolved!");
-                       AccessBase = type;
-                       Method = method;
-               }
-
-               public override Expression Resolve (TypeContainer tc)
-               {
-                       // FIXME: Implement;
-                       throw new Exception ("Unimplemented");
-                       // return this;
-               }
-
-               public override void Emit (EmitContext ec)
-               {
-                       throw new Exception ("Unimplemented");
-               }
-       }
-
-
        //   Fully resolved expression that evaluates to a Field
        // </summary>
        public class FieldExpr : Expression, LValue {
@@ -3018,7 +3809,7 @@ namespace CIR {
                        type = fi.FieldType;
                }
 
-               override public Expression Resolve (TypeContainer tc)
+               override public Expression DoResolve (TypeContainer tc)
                {
                        if (!FieldInfo.IsStatic){
                                if (Instance == null){
@@ -3048,12 +3839,22 @@ namespace CIR {
                        }
                }
 
-               public void Store (ILGenerator ig)
+               public void Store (EmitContext ec)
                {
                        if (FieldInfo.IsStatic)
-                               ig.Emit (OpCodes.Stsfld, FieldInfo);
+                               ec.ig.Emit (OpCodes.Stsfld, FieldInfo);
                        else
-                               ig.Emit (OpCodes.Stfld, FieldInfo);
+                               ec.ig.Emit (OpCodes.Stfld, FieldInfo);
+               }
+
+               public void AddressOf (EmitContext ec)
+               {
+                       if (FieldInfo.IsStatic)
+                               ec.ig.Emit (OpCodes.Ldsflda, FieldInfo);
+                       else {
+                               Instance.Emit (ec);
+                               ec.ig.Emit (OpCodes.Ldflda, FieldInfo);
+                       }
                }
        }
        
@@ -3079,7 +3880,7 @@ namespace CIR {
                        type = pi.PropertyType;
                }
 
-               override public Expression Resolve (TypeContainer tc)
+               override public Expression DoResolve (TypeContainer tc)
                {
                        // We are born in resolved state. 
                        return this;
@@ -3093,7 +3894,7 @@ namespace CIR {
        }
 
        // <summary>
-       //   Fully resolved expression that evaluates to a Property
+       //   Fully resolved expression that evaluates to a Expression
        // </summary>
        public class EventExpr : Expression {
                public readonly EventInfo EventInfo;
@@ -3104,7 +3905,7 @@ namespace CIR {
                        eclass = ExprClass.EventAccess;
                }
 
-               override public Expression Resolve (TypeContainer tc)
+               override public Expression DoResolve (TypeContainer tc)
                {
                        // We are born in resolved state. 
                        return this;
@@ -3126,7 +3927,7 @@ namespace CIR {
                        Expr = e;
                }
 
-               public override Expression Resolve (TypeContainer tc)
+               public override Expression DoResolve (TypeContainer tc)
                {
                        Expr = Expr.Resolve (tc);
 
@@ -3158,7 +3959,7 @@ namespace CIR {
                        Expr = e;
                }
 
-               public override Expression Resolve (TypeContainer tc)
+               public override Expression DoResolve (TypeContainer tc)
                {
                        Expr = Expr.Resolve (tc);
 
@@ -3192,7 +3993,7 @@ namespace CIR {
                        Arguments = e_list;
                }
 
-               public override Expression Resolve (TypeContainer tc)
+               public override Expression DoResolve (TypeContainer tc)
                {
                        // FIXME: Implement;
                        throw new Exception ("Unimplemented");
@@ -3226,7 +4027,7 @@ namespace CIR {
                        
                }
 
-               public override Expression Resolve (TypeContainer tc)
+               public override Expression DoResolve (TypeContainer tc)
                {
                        // FIXME: Implement;
                        throw new Exception ("Unimplemented");
@@ -3240,73 +4041,38 @@ namespace CIR {
        }
 
        public class UserImplicitCast : Expression {
-
-               Expression source;
-               Type       target; 
                MethodBase method;
                ArrayList  arguments;
                
-               public UserImplicitCast (Expression source, Type target)
+               public UserImplicitCast (MethodInfo method, ArrayList arguments)
                {
-                       this.source = source;
-                       this.target = target;
+                       this.method = method;
+                       this.arguments = arguments;
+                       type = method.ReturnType;
+                       eclass = ExprClass.Value;
                }
 
-               public override Expression Resolve (TypeContainer tc)
+               public override Expression DoResolve (TypeContainer tc)
                {
-                       source = source.Resolve (tc);
-
-                       if (source == null)
-                               return null;
-
-                       Expression mg;
-
-                       mg = MemberLookup (tc.RootContext, source.Type, "op_Implicit", false);
-
-                       if (mg != null) {
-                               
-                               MethodGroupExpr me = (MethodGroupExpr) mg;
-
-                               arguments = new ArrayList ();
-                               arguments.Add (new Argument (source, Argument.AType.Expression));
-
-                               method = Invocation.OverloadResolve (tc, me, arguments, new Location ("", 0,0));
-                       
-                               if (method != null) {
-                                       Method m = (Method) TypeContainer.LookupMethodByBuilder (method);
-                                       type = m.GetReturnType (tc);
-
-                                       if (type != target)
-                                               return null;
-                                       
-                                       return this;
-                               } else
-                                       return null;
-
-                       } else
-                               return null;
+                       //
+                       // We are born in a fully resolved state
+                       //
+                       return this;
                }
-               
+
                public override void Emit (EmitContext ec)
                {
                        ILGenerator ig = ec.ig;
                        
-                       if (method != null) {
-
-                               // Note that operators are static anyway
-                               
-                               if (arguments != null) 
-                                       Invocation.EmitArguments (ec, method, arguments);
+                       // Note that operators are static anyway
                                
-                               if (method is MethodInfo)
-                                       ig.Emit (OpCodes.Call, (MethodInfo) method);
-                               else
-                                       ig.Emit (OpCodes.Call, (ConstructorInfo) method);
-
-                               return;
-                       }
-
-                       throw new Exception ("Implement me");
+                       if (arguments != null) 
+                               Invocation.EmitArguments (ec, method, arguments);
+                       
+                       if (method is MethodInfo)
+                               ig.Emit (OpCodes.Call, (MethodInfo) method);
+                       else
+                               ig.Emit (OpCodes.Call, (ConstructorInfo) method);
                }
 
        }