vala r1928 - in trunk: . gobject vala

[juergbi svn gnome org]

Author: juergbi
Date: Sat Oct 25 18:41:00 2008
New Revision: 1928
URL: http://svn.gnome.org/viewvc/vala?rev=1928&view=rev

Log:
2008-10-25  JÃrg Billeter  <j bitron ch>

	* vala/valadelegate.vala:
	* gobject/valaccodegenerator.vala:
	* gobject/valaccodeinvocationexpressionmodule.vala:

	Next attempt to correct parameter positions for instance and
	error parameters in delegate wrappers


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

Modified: trunk/gobject/valaccodegenerator.vala
==============================================================================
--- trunk/gobject/valaccodegenerator.vala	(original)
+++ trunk/gobject/valaccodegenerator.vala	Sat Oct 25 18:41:00 2008
@@ -3925,7 +3925,7 @@
 
 		if (m.get_error_types ().size > 0) {
 			var cparam = new CCodeFormalParameter ("error", "GError**");
-			cparam_map.set (get_param_pos (-2), cparam);
+			cparam_map.set (get_param_pos (-1), cparam);
 		}
 
 		// append C parameters in the right order

Modified: trunk/gobject/valaccodeinvocationexpressionmodule.vala
==============================================================================
--- trunk/gobject/valaccodeinvocationexpressionmodule.vala	(original)
+++ trunk/gobject/valaccodeinvocationexpressionmodule.vala	Sat Oct 25 18:41:00 2008
@@ -366,7 +366,7 @@
 			// method can fail
 			codegen.current_method_inner_error = true;
 			// add &inner_error before the ellipsis arguments
-			carg_map.set (codegen.get_param_pos (-2), new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeIdentifier ("inner_error")));
+			carg_map.set (codegen.get_param_pos (-1), new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeIdentifier ("inner_error")));
 		}
 
 		if (ellipsis) {

Modified: trunk/vala/valadelegate.vala
==============================================================================
--- trunk/vala/valadelegate.vala	(original)
+++ trunk/vala/valadelegate.vala	Sat Oct 25 18:41:00 2008
@@ -100,7 +100,8 @@
 		this.return_type = return_type;
 		this.source_reference = source_reference;
 
-		cinstance_parameter_position = -1;
+		// error is -1 (right of user_data)
+		cinstance_parameter_position = -2;
 		carray_length_parameter_position = -3;
 		cdelegate_target_parameter_position = -3;
 	}