From 5885e3d63169daf47e839860e41a6a694a4ae5f7 Mon Sep 17 00:00:00 2001 From: Juerg Billeter Date: Fri, 29 Feb 2008 22:45:05 +0000 Subject: [PATCH] fix error when using type parameter in generic type methods 2008-02-29 Juerg Billeter * vala/valasemanticanalyzer.vala: fix error when using type parameter in generic type methods svn path=/trunk/; revision=1071 --- ChangeLog | 5 +++++ vala/valasemanticanalyzer.vala | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ec905d..4832916 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2008-02-29 Jürg Billeter + * vala/valasemanticanalyzer.vala: fix error when using type + parameter in generic type methods + +2008-02-29 Jürg Billeter + * gobject/valaccodegenerator.vala, gobject/valaccodegeneratormethod.vala: support methods throwing exceptions and returning generic type parameter diff --git a/vala/valasemanticanalyzer.vala b/vala/valasemanticanalyzer.vala index 8f9c931..e95111b 100644 --- a/vala/valasemanticanalyzer.vala +++ b/vala/valasemanticanalyzer.vala @@ -1922,9 +1922,8 @@ public class Vala.SemanticAnalyzer : CodeVisitor { actual_type = (DataType) instance_type.get_type_arguments ().get (param_index); } if (actual_type == null) { - Report.error (node_reference.source_reference, "internal error: no actual argument found for type parameter %s".printf (generic_type.type_parameter.name)); - node_reference.error = true; - return null; + // no actual type available + return generic_type; } actual_type = actual_type.copy (); actual_type.transfers_ownership = actual_type.takes_ownership && generic_type.transfers_ownership; -- 2.7.4