* mcs/flowanalysis.cs (UsageVector.MergeOrigins): Reorganize.
[mono.git] / mcs / gmcs / support.cs
index 18cccd88f083605506a725bd0c28f5747bd7a79d..18ef9affaac1c0d8c5097939d9f6ce74d96c2acf 100644 (file)
@@ -20,7 +20,7 @@ namespace Mono.CSharp {
 
        public interface ParameterData {
                Type ParameterType (int pos);
-               GenericConstraints GenericConstraints (int pos);
+               Type [] Types { get; }
                int  Count { get; }
                bool HasParams { get; }
                string ParameterName (int pos);
@@ -31,7 +31,7 @@ namespace Mono.CSharp {
 
        public class ReflectionParameters : ParameterData {
                ParameterInfo [] pi;
-               Type[] type_params;
+               Type [] types;
                bool last_arg_is_params = false;
                bool is_varargs = false;
                ParameterData gpd;
@@ -46,20 +46,24 @@ namespace Mono.CSharp {
                        this.pi = pi;
                        int count = pi.Length-1;
 
+                       if (pi.Length == 0) {
+                               types = Type.EmptyTypes;
+                       } else {
+                               types = new Type [pi.Length];
+                               for (int i = 0; i < pi.Length; i++)
+                                       types [i] = pi [i].ParameterType;
+                       }
+
                        if (count < 0)
                                return;
 
-                       if (mb.Mono_IsInflatedMethod) {
-                               MethodInfo generic = mb.GetGenericMethodDefinition ();
+                       MethodBase generic = TypeManager.DropGenericMethodArguments (mb);
+                       if (generic != mb) {
                                gpd = TypeManager.GetParameterData (generic);
-
                                last_arg_is_params = gpd.HasParams;
                                return;
                        }
 
-                       if (mb.IsGenericMethodDefinition)
-                               type_params = mb.GetGenericArguments ();
-
                        attrs = pi [count].GetCustomAttributes (TypeManager.param_array_type, true);
                        if (attrs == null)
                                return;
@@ -78,6 +82,11 @@ namespace Mono.CSharp {
                                        sb.Append (", ");
                                sb.Append (ParameterDesc (i));
                        }
+                       if (is_varargs) {
+                               if (pi.Length > 0)
+                                       sb.Append (", ");
+                               sb.Append ("__arglist");
+                       }
                        sb.Append (')');
                        return sb.ToString ();
                }
@@ -95,17 +104,6 @@ namespace Mono.CSharp {
                        }
                }
 
-               public GenericConstraints GenericConstraints (int pos)
-               {
-                       if (gpd != null)
-                               return gpd.GenericConstraints (pos);
-
-                       if (type_params == null)
-                               return null;
-
-                       return new ReflectionConstraints (type_params [pos]);
-               }
-
                public string ParameterName (int pos)
                {
                        if (gpd != null)
@@ -140,7 +138,7 @@ namespace Mono.CSharp {
 
                        if (pos >= pi.Length - 1 && last_arg_is_params)
                                sb.Append ("params ");
-                       
+
                        sb.Append (TypeManager.CSharpName (partype).Replace ("&", ""));
 
                        return sb.ToString ();
@@ -160,9 +158,9 @@ namespace Mono.CSharp {
                        Type t = pi [pos].ParameterType;
                        if (t.IsByRef){
                                if ((pi [pos].Attributes & (ParameterAttributes.Out|ParameterAttributes.In)) == ParameterAttributes.Out)
-                                       return Parameter.Modifier.ISBYREF | Parameter.Modifier.OUT;
+                                       return Parameter.Modifier.OUT;
                                else
-                                       return Parameter.Modifier.ISBYREF | Parameter.Modifier.REF;
+                                       return Parameter.Modifier.REF;
                        }
                        
                        return Parameter.Modifier.NONE;
@@ -179,139 +177,12 @@ namespace Mono.CSharp {
                                return this.last_arg_is_params;
                        }
                }
-       }
-
-       public class InternalParameters : ParameterData {
-               Type [] param_types;
-               bool has_varargs;
-               int count;
 
-               public readonly Parameters Parameters;
-               public readonly TypeParameter[] TypeParameters;
-               
-               public InternalParameters (Type [] param_types, Parameters parameters)
-               {
-                       this.param_types = param_types;
-                       this.Parameters = parameters;
-
-                       has_varargs = parameters.HasArglist;
-
-                       if (param_types == null)
-                               count = 0;
-                       else
-                               count = param_types.Length;
-               }
-
-               public InternalParameters (Type [] param_types, Parameters parameters,
-                                          TypeParameter [] type_params)
-                       : this (param_types, parameters)
-               {
-                       this.TypeParameters = type_params;
-               }
-
-               public int Count {
-                       get {
-                               return has_varargs ? count + 1 : count;
-                       }
-               }
-
-               public bool HasParams {
+               public Type[] Types {
                        get {
-                               return Parameters.ArrayParameter != null;
+                               return types;
                        }
-               }
-
-               Parameter GetParameter (int pos)
-               {
-                       Parameter [] fixed_pars = Parameters.FixedParameters;
-                       if (fixed_pars != null){
-                               int len = fixed_pars.Length;
-                               if (pos < len)
-                                       return Parameters.FixedParameters [pos];
-                       }
-
-                       return Parameters.ArrayParameter;
-               }
-
-               public string GetSignatureForError ()
-               {
-                       StringBuilder sb = new StringBuilder ("(");
-                       for (int i = 0; i < count; ++i) {
-                               if (i != 0)
-                                       sb.Append (", ");
-                               sb.Append (ParameterDesc (i));
-                       }
-                       sb.Append (')');
-                       return sb.ToString ();
-               }
-
-               public Type ParameterType (int pos)
-               {
-                       if (has_varargs && pos >= count)
-                               return TypeManager.runtime_argument_handle_type;
-
-                       if (param_types == null)
-                               return null;
-
-                       return GetParameter (pos).ExternalType ();
-               }
-
-               public GenericConstraints GenericConstraints (int pos)
-               {
-                       if (TypeParameters == null)
-                               return null;
-
-                       return TypeParameters [pos].Constraints;
-               }
-
-               public string ParameterName (int pos)
-               {
-                       if (has_varargs && pos >= count)
-                               return "__arglist";
-
-                       return GetParameter (pos).Name;
-               }
-
-               public string ParameterDesc (int pos)
-               {
-                       if (has_varargs && pos >= count)
-                               return "__arglist";
-
-                       Type t = ParameterType (pos);
-                       return (ModifierDesc (pos) + " " + TypeManager.CSharpName (t).Replace ("&", "")).TrimStart ();
-               }
-
-               public string ModifierDesc (int pos)
-               {
-                       Parameter p = GetParameter (pos);
-
-                       //
-                       // We need to and for REF/OUT, because if either is set the
-                       // extra flag ISBYREF will be set as well
-                       //
-                       if ((p.ModFlags & Parameter.Modifier.REF) != 0)
-                               return "ref";
-                       if ((p.ModFlags & Parameter.Modifier.OUT) != 0)
-                               return "out";
-                       if (p.ModFlags == Parameter.Modifier.PARAMS)
-                               return "params";
-
-                       return "";
-               }
-
-               public Parameter.Modifier ParameterModifier (int pos)
-               {
-                       if (has_varargs && pos >= count)
-                               return Parameter.Modifier.ARGLIST;
-
-                       Parameter.Modifier mod = GetParameter (pos).ModFlags;
-
-                       if ((mod & (Parameter.Modifier.REF | Parameter.Modifier.OUT)) != 0)
-                               mod |= Parameter.Modifier.ISBYREF;
-
-                       return mod;
-               }
-               
+               }               
        }
 
        public class ReflectionConstraints : GenericConstraints
@@ -322,17 +193,26 @@ namespace Mono.CSharp {
                Type[] iface_constraints;
                string name;
 
-               public ReflectionConstraints (Type t)
+               public static GenericConstraints GetConstraints (Type t)
                {
-                       name = t.Name;
-                       Type[] constraints = t.GetGenericParameterConstraints ();
+                       Type [] constraints = t.GetGenericParameterConstraints ();
+                       GenericParameterAttributes attrs = t.GenericParameterAttributes;
+                       if (constraints.Length == 0 && attrs == GenericParameterAttributes.None)
+                               return null;
+                       return new ReflectionConstraints (t.Name, constraints, attrs);
+               }
+
+               private ReflectionConstraints (string name, Type [] constraints, GenericParameterAttributes attrs)
+               {
+                       this.name = name;
+                       this.attrs = attrs;
+
                        if ((constraints.Length > 0) && !constraints [0].IsInterface) {
                                class_constraint = constraints [0];
                                iface_constraints = new Type [constraints.Length - 1];
                                Array.Copy (constraints, 1, iface_constraints, 0, constraints.Length - 1);
                        } else
                                iface_constraints = constraints;
-                       attrs = t.GenericParameterAttributes;
 
                        if (HasValueTypeConstraint)
                                base_type = TypeManager.value_type;