[vala/staging] codegen: cast instead of trying to guess *_CLASS macro name

[Evan Nemerson <evann src gnome org>]

commit f950ff331c1619f865591fc35d01cecc22b4542e
Author: Evan Nemerson <evan nemerson com>
Date:   Sun Jun 29 00:26:39 2014 -0700

    codegen: cast instead of trying to guess *_CLASS macro name
    
    Fixes bug 732413

 codegen/valagtypemodule.vala |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala
index 02c5b6e..c2c8230 100644
--- a/codegen/valagtypemodule.vala
+++ b/codegen/valagtypemodule.vala
@@ -1230,9 +1230,8 @@ public class Vala.GTypeModule : GErrorModule {
                                fundamental_class = fundamental_class.base_class;
                        }
 
-                       ccall = new CCodeFunctionCall (new CCodeIdentifier ("%s_CLASS".printf 
(get_ccode_upper_case_name (fundamental_class, null))));
-                       ccall.add_argument (new CCodeIdentifier ("klass"));
-                       var finalize_assignment = new CCodeAssignment (new CCodeMemberAccess.pointer (ccall, 
"finalize"), new CCodeIdentifier (get_ccode_lower_case_prefix (cl) + "finalize"));
+                       var ccast = new CCodeCastExpression (new CCodeIdentifier ("klass"), get_ccode_name 
(fundamental_class) + "Class *");
+                       var finalize_assignment = new CCodeAssignment (new CCodeMemberAccess.pointer (ccast, 
"finalize"), new CCodeIdentifier (get_ccode_lower_case_prefix (cl) + "finalize"));
                        ccode.add_expression (finalize_assignment);
                }
 
@@ -1253,9 +1252,7 @@ public class Vala.GTypeModule : GErrorModule {
 
                        // there is currently no default handler for abstract async methods
                        if (!m.is_abstract || !m.coroutine) {
-                               var ccast = new CCodeFunctionCall (new CCodeIdentifier ("%s_CLASS".printf 
(get_ccode_upper_case_name (base_type))));
-                               ccast.add_argument (new CCodeIdentifier ("klass"));
-
+                               var ccast = new CCodeCastExpression (new CCodeIdentifier ("klass"), 
get_ccode_name (base_type) + "Class *");
                                ccode.add_assignment (new CCodeMemberAccess.pointer (ccast, 
get_ccode_vfunc_name (m.base_method)), new CCodeIdentifier (get_ccode_real_name (m)));
 
                                if (m.coroutine) {
@@ -1269,8 +1266,7 @@ public class Vala.GTypeModule : GErrorModule {
                        if (sig.default_handler == null) {
                                continue;
                        }
-                       var ccast = new CCodeFunctionCall (new CCodeIdentifier ("%s_CLASS".printf 
(get_ccode_upper_case_name (cl, null))));
-                       ccast.add_argument (new CCodeIdentifier ("klass"));
+                       var ccast = new CCodeCastExpression (new CCodeIdentifier ("klass"), get_ccode_name 
(cl) + "Class *");
                        ccode.add_assignment (new CCodeMemberAccess.pointer (ccast, get_ccode_vfunc_name 
(sig.default_handler)), new CCodeIdentifier (get_ccode_real_name (sig.default_handler)));
                }