From: Jürg Billeter <j@bitron.ch>
Date: Fri, 19 Dec 2008 12:44:28 +0000 (+0000)
Subject: Remove support for deprecated syntax for construct parameters
X-Git-Tag: VALA_0_5_4~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de4aae7e4f186090aa8e340dcdb6067b736fde8a;p=thirdparty%2Fvala.git

Remove support for deprecated syntax for construct parameters

2008-12-19  Jürg Billeter  <j@bitron.ch>

	* vala/valaformalparameter.vala:
	* vala/valagenieparser.vala:
	* vala/valaparser.vala:

	Remove support for deprecated syntax for construct parameters

	* tests/arrays.test:
	* tests/objects/test-029.test:

	Update syntax used in test cases

svn path=/trunk/; revision=2218
---

diff --git a/ChangeLog b/ChangeLog
index e424949ed..5d7662524 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-12-19  Jürg Billeter  <j@bitron.ch>
+
+	* vala/valaformalparameter.vala:
+	* vala/valagenieparser.vala:
+	* vala/valaparser.vala:
+
+	Remove support for deprecated syntax for construct parameters
+
+	* tests/arrays.test:
+	* tests/objects/test-029.test:
+
+	Update syntax used in test cases
+
 2008-12-19  Jürg Billeter  <j@bitron.ch>
 
 	* vala/valacodewriter.vala:
diff --git a/tests/arrays.test b/tests/arrays.test
index 3e05b5e4a..87bedf4f6 100644
--- a/tests/arrays.test
+++ b/tests/arrays.test
@@ -4,7 +4,8 @@ Program: test
 using GLib;
 
 class Maman.Foo : Object {
-	public Foo (construct string bar) {
+	public Foo (string bar) {
+		this.bar = bar;
 	}
 
 	public string bar { get; set; }
diff --git a/tests/objects/test-029.test b/tests/objects/test-029.test
index bb13e2673..ff36beda6 100644
--- a/tests/objects/test-029.test
+++ b/tests/objects/test-029.test
@@ -7,8 +7,9 @@ class Maman.Foo : Object {
 	public int p1 { get; set; }
 	public int p2 { get; set; }
 	
-	public Foo (int i, construct int p2) {
+	public Foo (int i, int p2) {
 		p1 = 2 * i;
+		this.p2 = p2;
 	}
 	
 	public static int main (string[] args) {
diff --git a/vala/valaformalparameter.vala b/vala/valaformalparameter.vala
index cba860f72..1905b0cdc 100644
--- a/vala/valaformalparameter.vala
+++ b/vala/valaformalparameter.vala
@@ -64,12 +64,6 @@ public class Vala.FormalParameter : Symbol {
 	 * if the parameter type is an array.
 	 */
 	public bool no_array_length { get; set; }
-	
-	/**
-	 * Specifies whether this parameter holds a value to be assigned to a
-	 * construct property. This is only allowed in CreationMethod headers.
-	 */
-	public bool construct_parameter { get; set; }
 
 	/**
 	 * Specifies the position of the parameter in the C function.
@@ -234,20 +228,6 @@ public class Vala.FormalParameter : Symbol {
 			}
 		}
 
-		/* special treatment for construct formal parameters used in creation methods */
-		if (construct_parameter) {
-			if (!(parent_symbol is CreationMethod)) {
-				error = true;
-				Report.error (source_reference, "construct parameters are only allowed in type creation methods");
-			}
-
-			var method_body = ((CreationMethod) parent_symbol).body;
-			var left = new MemberAccess (new MemberAccess.simple ("this"), name);
-			var right = new MemberAccess.simple (name);
-
-			method_body.add_statement (new ExpressionStatement (new Assignment (left, right), source_reference));
-		}
-
 		analyzer.current_source_file = old_source_file;
 		analyzer.current_symbol = old_symbol;
 
diff --git a/vala/valagenieparser.vala b/vala/valagenieparser.vala
index 9dc35e76b..4dc94164e 100644
--- a/vala/valagenieparser.vala
+++ b/vala/valagenieparser.vala
@@ -3234,7 +3234,6 @@ public class Vala.Genie.Parser : CodeVisitor {
 		var param = new FormalParameter (id, type, get_src (begin));
 		set_attributes (param, attrs);
 		param.direction = direction;
-		param.construct_parameter = false;
 		if (accept (TokenType.ASSIGN)) {
 			param.default_expression = parse_expression ();
 		}
diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index 3d7259c41..44286a5dc 100644
--- a/vala/valaparser.vala
+++ b/vala/valaparser.vala
@@ -2679,11 +2679,6 @@ public class Vala.Parser : CodeVisitor {
 			return new FormalParameter.with_ellipsis (get_src (begin));
 		}
 		bool params_array = accept (TokenType.PARAMS);
-		bool construct_param = false;
-		if (accept (TokenType.CONSTRUCT)) {
-			Report.warning (get_last_src (), "deprecated syntax, use assignments in the method body");
-			construct_param = true;
-		}
 		var direction = ParameterDirection.IN;
 		if (accept (TokenType.OUT)) {
 			direction = ParameterDirection.OUT;
@@ -2704,7 +2699,6 @@ public class Vala.Parser : CodeVisitor {
 		set_attributes (param, attrs);
 		param.direction = direction;
 		param.params_array = params_array;
-		param.construct_parameter = construct_param;
 		if (accept (TokenType.ASSIGN)) {
 			param.default_expression = parse_expression ();
 		}