[vala] Support return statements in constructors and destructors

[Jürg Billeter <juergbi src gnome org>]

commit 2ef5b2ca13572bef194df3af65f4cced13ef4be7
Author: Jürg Billeter <j bitron ch>
Date:   Thu Oct 21 10:08:04 2010 +0200

    Support return statements in constructors and destructors
    
    Fixes bug 573763.

 codegen/valaccodebasemodule.vala |   34 +++++++++++++++++++++++++++++++++-
 codegen/valagtypemodule.vala     |    3 +++
 vala/valasemanticanalyzer.vala   |   15 +++++++++++++++
 3 files changed, 51 insertions(+), 1 deletions(-)
---
diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index a1bc699..561f535 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -121,10 +121,36 @@ public class Vala.CCodeBaseModule : CodeGenerator {
 				}
 			}
 
+			if (is_in_constructor () || is_in_destructor ()) {
+				return void_type;
+			}
+
 			return null;
 		}
 	}
 
+	bool is_in_constructor () {
+		var sym = current_symbol;
+		while (sym != null) {
+			if (sym is Constructor) {
+				return true;
+			}
+			sym = sym.parent_symbol;
+		}
+		return false;
+	}
+
+	bool is_in_destructor () {
+		var sym = current_symbol;
+		while (sym != null) {
+			if (sym is Destructor) {
+				return true;
+			}
+			sym = sym.parent_symbol;
+		}
+		return false;
+	}
+
 	public Block? current_closure_block {
 		get {
 			return next_closure_block (current_symbol);
@@ -3326,7 +3352,13 @@ public class Vala.CCodeBaseModule : CodeGenerator {
 			}
 		}
 
-		if (current_method is CreationMethod) {
+		if (is_in_constructor ()) {
+			ccode.add_return (new CCodeIdentifier ("obj"));
+		} else if (is_in_destructor ()) {
+			// do not call return as member cleanup and chain up to base finalizer
+			// stil need to be executed
+			ccode.add_goto ("_return");
+		} else if (current_method is CreationMethod) {
 			ccode.add_return (new CCodeIdentifier ("self"));
 		} else if (current_method != null && current_method.coroutine) {
 		} else if (current_return_type is VoidType || current_return_type.is_real_non_null_struct_type ()) {
diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala
index e5d0bc4..61c61f1 100644
--- a/codegen/valagtypemodule.vala
+++ b/codegen/valagtypemodule.vala
@@ -1653,6 +1653,9 @@ public class Vala.GTypeModule : GErrorModule {
 			if (current_method_inner_error) {
 				ccode.add_declaration ("GError *", new CCodeVariableDeclarator.zero ("_inner_error_", new CCodeConstant ("NULL")));
 			}
+
+			// support return statements in destructors
+			ccode.add_label ("_return");
 		}
 
 		pop_context ();
diff --git a/vala/valasemanticanalyzer.vala b/vala/valasemanticanalyzer.vala
index c6b718b..22d394f 100644
--- a/vala/valasemanticanalyzer.vala
+++ b/vala/valasemanticanalyzer.vala
@@ -123,6 +123,10 @@ public class Vala.SemanticAnalyzer : CodeVisitor {
 				}
 			}
 
+			if (is_in_constructor () || is_in_destructor ()) {
+				return void_type;
+			}
+
 			return null;
 		}
 	}
@@ -885,4 +889,15 @@ public class Vala.SemanticAnalyzer : CodeVisitor {
 		}
 		return false;
 	}
+
+	public bool is_in_destructor () {
+		var sym = current_symbol;
+		while (sym != null) {
+			if (sym is Destructor) {
+				return true;
+			}
+			sym = sym.parent_symbol;
+		}
+		return false;
+	}
 }