vala: Improve error message for wrong number of type-arguments

diff --git a/vala/valadatatype.vala b/vala/valadatatype.vala
index 9f612fa1729118b3e809ca918c327dc7c1021007..a7ba03856c76248657d72b7cd3f7fa4c2fa410c8 100644 (file)
--- a/vala/valadatatype.vala
+++ b/vala/valadatatype.vala
@@ -693,11 +693,11 @@ public abstract class Vala.DataType : CodeNode {
 
                if ((!allow_none || n_type_args > 0) && n_type_args < expected_n_type_args) {
                        error = true;
-                       Report.error (source_reference, "too few type arguments for `%s'", type_symbol.get_full_name ());
+                       Report.error (source_reference, "too few type arguments for `%s'", type_symbol.to_string ());
                        return false;
                } else if ((!allow_none || n_type_args > 0) && n_type_args > expected_n_type_args) {
                        error = true;
-                       Report.error (source_reference, "too many type arguments for `%s'", type_symbol.get_full_name ());
+                       Report.error (source_reference, "too many type arguments for `%s'", type_symbol.to_string ());
                        return false;
                }
 

diff --git a/vala/valamethodcall.vala b/vala/valamethodcall.vala
index 75bf6b3a16261f408e67fa5e8c3d10b781893a1f..7333891b412289ef2724bf11209f6404b2f2a1e1 100644 (file)
--- a/vala/valamethodcall.vala
+++ b/vala/valamethodcall.vala
@@ -379,11 +379,11 @@ public class Vala.MethodCall : Expression, CallableExpression {
                        int n_type_args = ma.get_type_arguments ().size;
                        if (n_type_args > 0 && n_type_args < n_type_params) {
                                error = true;
-                               Report.error (ma.source_reference, "too few type arguments");
+                               Report.error (ma.source_reference, "too few type arguments for `%s'", m.to_string ());
                                return false;
                        } else if (n_type_args > 0 && n_type_args > n_type_params) {
                                error = true;
-                               Report.error (ma.source_reference, "too many type arguments");
+                               Report.error (ma.source_reference, "too many type arguments for `%s'", m.to_string ());
                                return false;
                        }
                }