From: Jürg Billeter <j@bitron.ch>
Date: Sun, 10 Oct 2010 09:51:39 +0000 (+0200)
Subject: codegen: Use builder API for dup func wrapper
X-Git-Tag: 0.11.1~148
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0101ddaef2ee975d898d64a7ee7fcd1a364955a;p=thirdparty%2Fvala.git

codegen: Use builder API for dup func wrapper
---

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index b520fb4f5..c6e861230 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -2534,15 +2534,11 @@ public class Vala.CCodeBaseModule : CodeGenerator {
 			return destroy_func;
 		}
 
-		// declaration
-
 		var function = new CCodeFunction (destroy_func, type.get_cname ());
 		function.modifiers = CCodeModifiers.STATIC;
 		function.add_parameter (new CCodeFormalParameter ("self", type.get_cname ()));
 
-		// definition
-
-		var block = new CCodeBlock ();
+		push_function (function);
 
 		var cl = type.data_type as Class;
 		assert (cl != null && cl.is_gboxed);
@@ -2551,13 +2547,11 @@ public class Vala.CCodeBaseModule : CodeGenerator {
 		free_call.add_argument (new CCodeIdentifier (cl.get_type_id ()));
 		free_call.add_argument (new CCodeIdentifier ("self"));
 
-		block.add_statement (new CCodeReturnStatement (free_call));
+		ccode.add_return (free_call);
 
-		// append to file
+		pop_function ();
 
 		cfile.add_function_declaration (function);
-
-		function.block = block;
 		cfile.add_function (function);
 
 		return destroy_func;