vala r852 - in trunk: . gobject

[juergbi svn gnome org]

Author: juergbi
Date: Fri Jan 18 16:59:12 2008
New Revision: 852
URL: http://svn.gnome.org/viewvc/vala?rev=852&view=rev

Log:
2008-01-18  Juerg Billeter  <j bitron ch>

	* gobject/valaccodegenerator.vala: fix iteration over collections
	  passed by ref parameter using foreach,
	  patch by Hans Vercammen, fixes bug 510419


Modified:
   trunk/ChangeLog
   trunk/gobject/valaccodegenerator.vala

Modified: trunk/gobject/valaccodegenerator.vala
==============================================================================
--- trunk/gobject/valaccodegenerator.vala	(original)
+++ trunk/gobject/valaccodegenerator.vala	Fri Jan 18 16:59:12 2008
@@ -1520,7 +1520,10 @@
 		cblock.add_statement (cfrag);
 		
 		var collection_backup = stmt.collection_variable_declarator;
-		var ccoldecl = new CCodeDeclaration (collection_backup.type_reference.get_cname ());
+		var collection_type = collection_backup.type_reference.copy ();
+		collection_type.is_ref = false;
+		collection_type.is_out = false;
+		var ccoldecl = new CCodeDeclaration (collection_type.get_cname ());
 		var ccolvardecl = new CCodeVariableDeclarator.with_initializer (collection_backup.name, (CCodeExpression) stmt.collection.ccodenode);
 		ccolvardecl.line = cblock.line;
 		ccoldecl.add_declarator (ccolvardecl);
@@ -1542,7 +1545,7 @@
 			if (array_len is CCodeConstant) {
 				var it_name = "%s_it".printf (stmt.variable_name);
 			
-				var citdecl = new CCodeDeclaration (stmt.collection.static_type.get_cname ());
+				var citdecl = new CCodeDeclaration (collection_type.get_cname ());
 				citdecl.add_declarator (new CCodeVariableDeclarator (it_name));
 				cblock.add_statement (citdecl);
 				
@@ -1640,7 +1643,7 @@
 		           stmt.collection.static_type.data_type == gslist_type) {
 			var it_name = "%s_it".printf (stmt.variable_name);
 		
-			var citdecl = new CCodeDeclaration (stmt.collection.static_type.get_cname ());
+			var citdecl = new CCodeDeclaration (collection_type.get_cname ());
 			var citvardecl = new CCodeVariableDeclarator (it_name);
 			citvardecl.line = cblock.line;
 			citdecl.add_declarator (citvardecl);