Report error when trying to use unowned variables as argument for owned

2008-06-01  Jürg Billeter  <j@bitron.ch>

	* vala/valasemanticanalyzer.vala:

	Report error when trying to use unowned variables as argument
	for owned reference and output parameters

svn path=/trunk/; revision=1526

diff --git a/ChangeLog b/ChangeLog
index eff74336dcb8913f5a5deddbad9d671748ede87a..d01abb1546686cf2516a75bd0f79ff02b8743f31 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-01  Jürg Billeter  <j@bitron.ch>
+
+       * vala/valasemanticanalyzer.vala:
+
+       Report error when trying to use unowned variables as argument
+       for owned reference and output parameters
+
 2008-06-01  Jürg Billeter  <j@bitron.ch>
 
        * vala/valasemanticanalyzer.vala:

diff --git a/vala/valasemanticanalyzer.vala b/vala/valasemanticanalyzer.vala
index f54d2bda2a184bc235623a560f8274de6a445627..d2a38eaa8911ebedda6f9473fc574f3b1a725cf0 100644 (file)
--- a/vala/valasemanticanalyzer.vala
+++ b/vala/valasemanticanalyzer.vala
@@ -2042,12 +2042,32 @@ public class Vala.SemanticAnalyzer : CodeVisitor {
                                                        Report.error (arg.source_reference, "Argument %d: Cannot pass ref argument to non-reference parameter".printf (i + 1));
                                                        return false;
                                                }
+
+                                               // weak variables can only be used with weak ref parameters
+                                               if (param.parameter_type.is_disposable ()) {
+                                                       if (!(arg.value_type is PointerType) && !arg.value_type.value_owned) {
+                                                               /* variable doesn't own the value */
+                                                               expr.error = true;
+                                                               Report.error (arg.source_reference, "Invalid assignment from owned expression to unowned variable");
+                                                               return false;
+                                                       }
+                                               }
                                        } else if (arg_type == 3) {
                                                if (param.direction != ParameterDirection.OUT) {
                                                        expr.error = true;
                                                        Report.error (arg.source_reference, "Argument %d: Cannot pass out argument to non-output parameter".printf (i + 1));
                                                        return false;
                                                }
+
+                                               // weak variables can only be used with weak out parameters
+                                               if (param.parameter_type.is_disposable ()) {
+                                                       if (!(arg.value_type is PointerType) && !arg.value_type.value_owned) {
+                                                               /* variable doesn't own the value */
+                                                               expr.error = true;
+                                                               Report.error (arg.source_reference, "Invalid assignment from owned expression to unowned variable");
+                                                               return false;
+                                                       }
+                                               }
                                        }
                                }