2009-01-02 Ivan N. Zlatev <contact@i-nz.net>

[mono.git] / mcs / mcs / parameter.cs

diff --git a/mcs/mcs/parameter.cs b/mcs/mcs/parameter.cs
index b854eca940b5a7ebb770f59e0e567fc97055692c..e5fcae8576581a39864147e9bb03609758788fe2 100644 (file)
--- a/mcs/mcs/parameter.cs
+++ b/mcs/mcs/parameter.cs
@@ -442,16 +442,16 @@ namespace Mono.CSharp {
                public static string GetModifierSignature (Modifier mod)
                {
                        switch (mod) {
-                               case Modifier.OUT:
-                                       return "out";
-                               case Modifier.PARAMS:
-                                       return "params";
-                               case Modifier.REF:
-                                       return "ref";
-                               case Modifier.This:
-                                       return "this";
-                               default:
-                                       return "";
+                       case Modifier.OUT:
+                               return "out";
+                       case Modifier.PARAMS:
+                               return "params";
+                       case Modifier.REF:
+                               return "ref";
+                       case Modifier.This:
+                               return "this";
+                       default:
+                               return "";
                        }
                }
 
@@ -725,6 +725,38 @@ namespace Mono.CSharp {
                        get { return types; }
                        set { types = value; }
                }
+
+#if MS_COMPATIBLE
+               public AParametersCollection InflateTypes (Type[] genArguments, Type[] argTypes)
+               {
+                       AParametersCollection p = (AParametersCollection) MemberwiseClone (); // Clone ();
+
+                       for (int i = 0; i < Count; ++i) {
+                               if (types[i].IsGenericType) {
+                                       Type[] gen_arguments_open = new Type[types[i].GetGenericTypeDefinition ().GetGenericArguments ().Length];
+                                       Type[] gen_arguments = types[i].GetGenericArguments ();
+                                       for (int ii = 0; ii < gen_arguments_open.Length; ++ii) {
+                                               if (gen_arguments[ii].IsGenericParameter) {
+                                                       Type t = argTypes[gen_arguments[ii].GenericParameterPosition];
+                                                       gen_arguments_open[ii] = t;
+                                               } else
+                                                       gen_arguments_open[ii] = gen_arguments[ii];
+                                       }
+
+                                       p.types[i] = types[i].GetGenericTypeDefinition ().MakeGenericType (gen_arguments_open);
+                                       continue;
+                               }
+
+                               if (types[i].IsGenericParameter) {
+                                       Type gen_argument = argTypes[types[i].GenericParameterPosition];
+                                       p.types[i] = gen_argument;
+                                       continue;
+                               }
+                       }
+
+                       return p;
+               }
+#endif
        }
 
        //
@@ -843,6 +875,9 @@ namespace Mono.CSharp {
        /// </summary>
        public class Parameters : AParametersCollection {
                public static readonly Parameters EmptyReadOnlyParameters = new Parameters ();
+               
+               // Used by C# 2.0 delegates
+               public static readonly Parameters Undefined = new Parameters ();
 
                private Parameters ()
                {
@@ -880,8 +915,7 @@ namespace Mono.CSharp {
                                        if (base_name != parameters [j].Name)
                                                continue;
 
-                                       Report.Error (100, parameters [i].Location,
-                                               "The parameter name `{0}' is a duplicate", base_name);
+                                       ErrorDuplicateName (parameters [i]);
                                        i = j;
                                }
                        }
@@ -949,35 +983,24 @@ namespace Mono.CSharp {
                        return parameters;
                }
 
-               /// <summary>
-               ///    Returns the paramenter information based on the name
-               /// </summary>
-               public Parameter GetParameterByName (string name, out int idx)
+               protected virtual void ErrorDuplicateName (Parameter p)
                {
-                       idx = 0;
-
-                       if (Count == 0)
-                               return null;
-
-                       int i = 0;
-
-                       foreach (Parameter par in FixedParameters){
-                               if (par.Name == name){
-                                       idx = i;
-                                       return par;
-                               }
-                               i++;
-                       }
-                       return null;
+                       Report.Error (100, p.Location, "The parameter name `{0}' is a duplicate", p.Name);
                }
 
-               public Parameter GetParameterByName (string name)
+               /// <summary>
+               ///    Returns the parameter information based on the name
+               /// </summary>
+               public int GetParameterIndexByName (string name)
                {
-                       int idx;
+                       for (int idx = 0; idx < Count; ++idx) {
+                               if (parameters [idx].Name == name)
+                                       return idx;
+                       }
 
-                       return GetParameterByName (name, out idx);
+                       return -1;
                }
-               
+
                public bool Resolve (IResolveContext ec)
                {
                        if (types != null)
@@ -1033,37 +1056,6 @@ namespace Mono.CSharp {
                        }
                }
 
-#if MS_COMPATIBLE
-               public AParametersCollection InflateTypes (Type[] genArguments, Type[] argTypes)
-               {
-                       Parameters p = Clone ();
-                       for (int i = 0; i < Count; ++i) {
-                               if (types[i].IsGenericType) {
-                                       Type[] gen_arguments_open = new Type [types[i].GetGenericTypeDefinition ().GetGenericArguments ().Length];
-                                       Type[] gen_arguments = types[i].GetGenericArguments ();
-                                       for (int ii = 0; ii < gen_arguments_open.Length; ++ii) {
-                                               if (gen_arguments[ii].IsGenericParameter) {
-                                                       Type t = argTypes[gen_arguments[ii].GenericParameterPosition];
-                                                       gen_arguments_open[ii] = t;
-                                               } else
-                                                       gen_arguments_open[ii] = gen_arguments[ii];
-                                       }
-
-                                       p.types[i] = types[i].GetGenericTypeDefinition ().MakeGenericType (gen_arguments_open);
-                                       continue;
-                               }
-
-                               if (types[i].IsGenericParameter) {
-                                       Type gen_argument = argTypes[types[i].GenericParameterPosition];
-                                       p.types[i] = gen_argument;
-                                       continue;
-                               }
-                       }
-
-                       return p;
-               }
-#endif
-
                public void VerifyClsCompliance ()
                {
                        foreach (Parameter p in FixedParameters)
@@ -1096,14 +1088,13 @@ namespace Mono.CSharp {
 
                public Parameters Clone ()
                {
-                       Parameter [] parameters_copy = new Parameter [FixedParameters.Length];
-                       int i = 0;
-                       foreach (Parameter p in FixedParameters)
-                               parameters_copy [i++] = p.Clone ();
-                       Parameters ps = new Parameters (parameters_copy, HasArglist);
-                       if (types != null)
-                               ps.types = (Type[])types.Clone ();
-                       return ps;
+                       Parameters p = (Parameters) MemberwiseClone ();
+
+                       p.parameters = new IParameterData [parameters.Length];
+                       for (int i = 0; i < Count; ++i)
+                               p.parameters [i] = this [i].Clone ();
+
+                       return p;
                }
        }
 }