vala r2217 - in trunk: . vala

[juergbi svn gnome org]

Author: juergbi
Date: Fri Dec 19 12:37:24 2008
New Revision: 2217
URL: http://svn.gnome.org/viewvc/vala?rev=2217&view=rev

Log:
2008-12-19  JÃrg Billeter  <j bitron ch>

	* vala/valacodewriter.vala:

	Update syntax to use owned and unowned where appropriate


Modified:
   trunk/ChangeLog
   trunk/vala/valacodewriter.vala

Modified: trunk/vala/valacodewriter.vala
==============================================================================
--- trunk/vala/valacodewriter.vala	(original)
+++ trunk/vala/valacodewriter.vala	Fri Dec 19 12:37:24 2008
@@ -730,23 +730,23 @@
 				write_string ("params ");
 			}
 
-			if (param.direction != ParameterDirection.IN) {
+			if (param.direction == ParameterDirection.IN) {
+				if (param.parameter_type.value_owned) {
+					write_string ("owned ");
+				}
+			} else {
 				if (param.direction == ParameterDirection.REF) {
 					write_string ("ref ");
 				} else if (param.direction == ParameterDirection.OUT) {
 					write_string ("out ");
 				}
 				if (is_weak (param.parameter_type)) {
-					write_string ("weak ");
+					write_string ("unowned ");
 				}
 			}
 
 			write_type (param.parameter_type);
 
-			if (param.direction == ParameterDirection.IN && param.parameter_type.value_owned) {
-				write_string ("#");
-			}
-
 			write_string (" ");
 			write_identifier (param.name);
 			
@@ -953,12 +953,12 @@
 			write_string ("virtual ");
 		}
 
-		write_type (prop.property_type);
-
 		if (prop.property_type.value_owned) {
-			write_string ("#");
+			write_string ("owned ");
 		}
 
+		write_type (prop.property_type);
+
 		write_string (" ");
 		write_identifier (prop.name);
 		write_string (" {");
@@ -1393,7 +1393,7 @@
 	}
 
 	public override void visit_reference_transfer_expression (ReferenceTransferExpression expr) {
-		write_string ("#");
+		write_string ("(owned) ");
 		expr.inner.accept (this);
 	}
 
@@ -1516,7 +1516,7 @@
 
 	private void write_return_type (DataType type) {
 		if (is_weak (type)) {
-			write_string ("weak ");
+			write_string ("unowned ");
 		}
 
 		write_type (type);