Ooops, I'm too stupid for this world ;-)

svn path=/trunk/mcs/; revision=31258

diff --git a/mcs/gmcs/decl.cs b/mcs/gmcs/decl.cs
index 6da5d388bc1d9ebe4ca3fb6fa69be3eaed02a5d0..c2892b14fcf89286708b42bed9299cd358025992 100755 (executable)
--- a/mcs/gmcs/decl.cs
+++ b/mcs/gmcs/decl.cs
@@ -100,6 +100,14 @@ namespace Mono.CSharp {
                                return full_name;
                }
 
+               public static string MakeName (string name, TypeArguments args)
+               {
+                       if (args == null)
+                               return name;
+                       else
+                               return name + "!" + args.Count;
+               }
+
                public static string MakeName (string name, int count)
                {
                        return name + "!" + count;
@@ -110,9 +118,9 @@ namespace Mono.CSharp {
                        string suffix = "";
                        if (Left != null)
                                return Left.GetTypeName () + "." +
-                                       MakeName (Name, TypeArguments.Count);
+                                       MakeName (Name, TypeArguments);
                        else
-                               return MakeName (Name, TypeArguments.Count);
+                               return MakeName (Name, TypeArguments);
                }
 
                public Expression GetTypeExpression (Location loc)
@@ -132,7 +140,7 @@ namespace Mono.CSharp {
                public string Basename {
                        get {
                                if (TypeArguments != null)
-                                       return MakeName (Name, TypeArguments.Count);
+                                       return MakeName (Name, TypeArguments);
                                else
                                        return Name;
                        }

diff --git a/mcs/gmcs/expression.cs b/mcs/gmcs/expression.cs
index ae83f005f430367dbcf14bbe00090876ba2a84ac..c2053208af295a437e6fe0351ca2adaf22910bc4 100755 (executable)
--- a/mcs/gmcs/expression.cs
+++ b/mcs/gmcs/expression.cs
@@ -7509,7 +7509,7 @@ namespace Mono.CSharp {
                        member_lookup = MemberLookup (
                                ec, expr_type, expr_type, Identifier, loc);
                        if ((member_lookup == null) && (args != null)) {
-                               string lookup_id = MemberName.MakeName (Identifier, args.Count);
+                               string lookup_id = MemberName.MakeName (Identifier, args);
                                member_lookup = MemberLookup (
                                        ec, expr_type, expr_type, lookup_id, loc);
                        }
@@ -7592,8 +7592,7 @@ namespace Mono.CSharp {
                                else
                                        fname = full_expr.Identifier;
 
-                               if (args != null)
-                                       fname = MemberName.MakeName (fname, args.Count);
+                               fname = MemberName.MakeName (fname, args);
 
                                if (full_expr.Expr is SimpleName) {
                                        string full_name = String.Concat (((SimpleName) full_expr.Expr).Name, ".", fname);
@@ -7628,10 +7627,7 @@ namespace Mono.CSharp {
 
                        Expression member_lookup;
                        string lookup_id;
-                       if (args != null)
-                               lookup_id = MemberName.MakeName (Identifier, args.Count);
-                       else
-                               lookup_id = Identifier;
+                       lookup_id = MemberName.MakeName (Identifier, args);
                        member_lookup = MemberLookupFinal (
                                ec, expr_type, expr_type, lookup_id, loc);
                        if (member_lookup == null)
@@ -7673,10 +7669,7 @@ namespace Mono.CSharp {
 
                public override string ToString ()
                {
-                       if (args != null)
-                               return expr + "." + MemberName.MakeName (Identifier, args.Count);
-                       else
-                               return expr + "." + Identifier;
+                       return expr + "." + MemberName.MakeName (Identifier, args);
                }
        }