From: Juerg Billeter Date: Fri, 21 Sep 2007 08:44:31 +0000 (+0000) Subject: add missing parent field for derived non-GObject classes X-Git-Tag: VALA_0_1_4~22 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9204c84c2aaf486605de91c35fa2125f8673217c;p=thirdparty%2Fvala.git add missing parent field for derived non-GObject classes 2007-09-21 Juerg Billeter * gobject/valaccodegeneratorclass.vala: add missing parent field for derived non-GObject classes svn path=/trunk/; revision=626 --- diff --git a/ChangeLog b/ChangeLog index 33b52f4ea..c09649bb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-09-21 Jürg Billeter + + * gobject/valaccodegeneratorclass.vala: add missing parent field for + derived non-GObject classes + 2007-09-20 Raffaele Sandrini * vala/valasemanticanalyzer.vala, gobject/valaccodegenerator.vala: diff --git a/gobject/valaccodegeneratorclass.vala b/gobject/valaccodegeneratorclass.vala index cfeb47fef..d41af8c3c 100644 --- a/gobject/valaccodegeneratorclass.vala +++ b/gobject/valaccodegeneratorclass.vala @@ -95,13 +95,16 @@ public class Vala.CCodeGenerator { decl_frag.append (new CCodeTypeDefinition ("struct %s".printf (instance_struct.name), new CCodeVariableDeclarator (cl.get_cname ()))); } + if (cl.base_class != null) { + instance_struct.add_field (cl.base_class.get_cname (), "parent"); + } + if (is_gobject) { if (cl.source_reference.file.cycle == null) { decl_frag.append (new CCodeTypeDefinition ("struct %s".printf (type_struct.name), new CCodeVariableDeclarator ("%sClass".printf (cl.get_cname ())))); } decl_frag.append (new CCodeTypeDefinition ("struct %s".printf (instance_priv_struct.name), new CCodeVariableDeclarator ("%sPrivate".printf (cl.get_cname ())))); - instance_struct.add_field (cl.base_class.get_cname (), "parent"); instance_struct.add_field ("%sPrivate *".printf (cl.get_cname ()), "priv"); type_struct.add_field ("%sClass".printf (cl.base_class.get_cname ()), "parent"); }