2003-09-07 Martin Baulig <martin@ximian.com>

	* generic.cs (ConstructedType.ResolveAsTypeStep): Report a CS8217
	if the number of type parameters doesn't match.

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

diff --git a/mcs/gmcs/ChangeLog b/mcs/gmcs/ChangeLog
index 3d68a11bd905db13847ac33cca2f4b8c318425d1..0449242d0f15995a87cb51e516f918e05e0fe698 100755 (executable)
--- a/mcs/gmcs/ChangeLog
+++ b/mcs/gmcs/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-07  Martin Baulig  <martin@ximian.com>
+
+       * generic.cs (ConstructedType.ResolveAsTypeStep): Report a CS8217
+       if the number of type parameters doesn't match.
+
 2003-09-04  Martin Baulig  <martin@ximian.com>
 
        * expression.cs (ComposedCast.ResolveAsTypeStep): Added support

diff --git a/mcs/gmcs/generic.cs b/mcs/gmcs/generic.cs
index 3d68e623849eab84c32b4112c571f68a5130208b..816246adeb489ca77c39308902eb8443cf3288be 100644 (file)
--- a/mcs/gmcs/generic.cs
+++ b/mcs/gmcs/generic.cs
@@ -220,6 +220,14 @@ namespace Mono.CSharp {
 
                        Type gt = resolved.Type.GetGenericTypeDefinition ();
 
+                       Type[] gen_params = gt.GetGenericParameters ();
+                       if (args.Arguments.Length != gen_params.Length) {
+                               Report.Error (-217, loc, "Generic type `" + gt.Name + "' takes " +
+                                             gen_params.Length + " type parameters, but specified " +
+                                             args.Arguments.Length + ".");
+                               return null;
+                       }
+
                        //
                        // Now bind the parameters.
                        //