pass non-simple structs always by reference

2007-11-30  Juerg Billeter  <j@bitron.ch>

	* gobject/valaccodegenerator.vala,
	  gobject/valaccodegeneratorinvocationexpression.vala,
	  gobject/valaccodegeneratormethod.vala: pass non-simple structs always
	  by reference

	* tests/structs.exp, tests/structs.vala: test struct parameters

svn path=/trunk/; revision=742

diff --git a/ChangeLog b/ChangeLog
index 19ee83e8b82ed66c8312d792078d0fa5505b7534..3876ea76e384a19338116ff1bfabf27a39557f06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-30  Jürg Billeter  <j@bitron.ch>
+
+       * gobject/valaccodegenerator.vala,
+         gobject/valaccodegeneratorinvocationexpression.vala,
+         gobject/valaccodegeneratormethod.vala: pass non-simple structs always
+         by reference
+
+       * tests/structs.exp, tests/structs.vala: test struct parameters
+
 2007-11-30  Jürg Billeter  <j@bitron.ch>
 
        * vala/valasemanticanalyzer.vala: check interfaces before base class

diff --git a/gobject/valaccodegenerator.vala b/gobject/valaccodegenerator.vala
index 12d804765c1d0ac5f8fde59baf11443affc92c0f..33c57853b0899a256e6b31fefe38979f635a847b 100644 (file)
--- a/gobject/valaccodegenerator.vala
+++ b/gobject/valaccodegenerator.vala
@@ -527,7 +527,19 @@ public class Vala.CCodeGenerator : CodeGenerator {
                p.accept_children (this);
 
                if (!p.ellipsis) {
-                       p.ccodenode = new CCodeFormalParameter (p.name, p.type_reference.get_cname (false, !p.type_reference.takes_ownership));
+                       string ctypename = p.type_reference.get_cname (false, !p.type_reference.takes_ownership);
+                       string cname = p.name;
+
+                       // pass non-simple structs always by reference
+                       if (p.type_reference.data_type is Struct) {
+                               var st = (Struct) p.type_reference.data_type;
+                               if (!st.is_simple_type () && !p.type_reference.is_ref && !p.type_reference.is_out) {
+                                       ctypename += "*";
+                                       cname = "_%s_p".printf (p.name);
+                               }
+                       }
+
+                       p.ccodenode = new CCodeFormalParameter (cname, ctypename);
                }
        }
 

diff --git a/gobject/valaccodegeneratorinvocationexpression.vala b/gobject/valaccodegeneratorinvocationexpression.vala
index 621b17445ebeef41964a68b799873a522bc41b83..d5536dd21ab843eff3fbcbaf51500c2f5401ab4b 100644 (file)
--- a/gobject/valaccodegeneratorinvocationexpression.vala
+++ b/gobject/valaccodegeneratorinvocationexpression.vala
@@ -233,6 +233,14 @@ public class Vala.CCodeGenerator {
                                                        }
                                                }
                                                cexpr = get_implicit_cast_expression (cexpr, arg.static_type, param.type_reference);
+
+                                               // pass non-simple struct instances always by reference
+                                               if (param.type_reference.data_type is Struct && !((Struct) param.type_reference.data_type).is_simple_type ()) {
+                                                       // we already use a reference for arguments of ref and out parameters
+                                                       if (!param.type_reference.is_ref && !param.type_reference.is_out) {
+                                                               cexpr = new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, cexpr);
+                                                       }
+                                               }
                                        }
                                }
                        }

diff --git a/gobject/valaccodegeneratormethod.vala b/gobject/valaccodegeneratormethod.vala
index ce0b830c5f48754a7d779e682fca61abd6eaa884..dff2d3926dd7c2325599095f3a4f760e96c1679d 100644 (file)
--- a/gobject/valaccodegeneratormethod.vala
+++ b/gobject/valaccodegeneratormethod.vala
@@ -270,6 +270,13 @@ public class Vala.CCodeGenerator {
                                                        type_check.line = function.line;
                                                        cinit.append (type_check);
                                                }
+                                       } else if (t is Struct) {
+                                               var st = (Struct) t;
+                                               if (!st.is_simple_type () && !param.type_reference.is_ref && !param.type_reference.is_out) {
+                                                       var cdecl = new CCodeDeclaration (param.type_reference.get_cname ());
+                                                       cdecl.add_declarator (new CCodeVariableDeclarator.with_initializer (param.name, new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, new CCodeIdentifier ("_%s_p".printf (param.name)))));
+                                                       cinit.append (cdecl);
+                                               }
                                        }
                                }
 

diff --git a/tests/structs.exp b/tests/structs.exp
index f59c798ac39b052502a5cef7984cb7743c02dea7..ffcbbef5905414c988c3714743ae0cf72cf4d42d 100644 (file)
--- a/tests/structs.exp
+++ b/tests/structs.exp
@@ -7,4 +7,8 @@ new StructWithNamedCreationMethod ()
 StructWithNamedCreationMethod
 new SimpleStruct () { field = 1 }
 simple_struct.field = 1
+test_in_parameter: st.field = 1
+test_ref_parameter: st.field = 1
+after test_ref_parameter: st.field = 2
+after test_out_parameter: st.field = 3
 .

diff --git a/tests/structs.vala b/tests/structs.vala
index 2f5d1efd952902b906c4aac6177706942a6af8c2..5f096f88503d149c439678dfcdc60a02f5370fc3 100644 (file)
--- a/tests/structs.vala
+++ b/tests/structs.vala
@@ -25,6 +25,20 @@ struct StructWithNamedCreationMethod {
 }
 
 static class StructsTest {
+       static void test_in_parameter (SimpleStruct st) {
+               stdout.printf ("test_in_parameter: st.field = %d\n", st.field);
+       }
+
+       static void test_ref_parameter (ref SimpleStruct st) {
+               stdout.printf ("test_ref_parameter: st.field = %d\n", st.field);
+               st.field++;
+       }
+
+       static void test_out_parameter (out SimpleStruct st) {
+               st = new SimpleStruct ();
+               st.field = 3;
+       }
+
        static int main (string[] args) {
                stdout.printf ("Structs Test:\n");
 
@@ -41,6 +55,12 @@ static class StructsTest {
                simple_struct = new SimpleStruct () { field = 1 };
                stdout.printf ("simple_struct.field = %d\n", simple_struct.field);
 
+               test_in_parameter (simple_struct);
+               test_ref_parameter (ref simple_struct);
+               stdout.printf ("after test_ref_parameter: st.field = %d\n", simple_struct.field);
+               test_out_parameter (out simple_struct);
+               stdout.printf ("after test_out_parameter: st.field = %d\n", simple_struct.field);
+
                stdout.printf (".\n");
 
                return 0;