Add GErrorModule

2008-11-03  Jürg Billeter  <j@bitron.ch>

	* gobject/Makefile.am:
	* gobject/valaccodegenerator.vala:
	* gobject/valaccodemodule.vala:
	* gobject/valagerrormodule.vala:
	* gobject/valagtypemodule.vala:

	Add GErrorModule

svn path=/trunk/; revision=1963

6 files changed, 156 insertions, 102 deletions

diff --git a/ChangeLog b/ChangeLog
index e458f7025..01152956a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2008-11-03  Jürg Billeter  <j@bitron.ch>
 
+	* gobject/Makefile.am:
+	* gobject/valaccodegenerator.vala:
+	* gobject/valaccodemodule.vala:
+	* gobject/valagerrormodule.vala:
+	* gobject/valagtypemodule.vala:
+
+	Add GErrorModule
+
+2008-11-03  Jürg Billeter  <j@bitron.ch>
+
 	* gobject/valaccodearraymodule.vala:
 	* gobject/valaccodeassignmentmodule.vala:
 	* gobject/valaccodedynamicpropertymodule.vala:
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 7b0b8e530..ca7f940e9 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -27,6 +27,7 @@ libvala_la_VALASOURCES = \
 	valaclassregisterfunction.vala \
 	valadbusclientmodule.vala \
 	valadbusservermodule.vala \
+	valagerrormodule.vala \
 	valagirwriter.vala \
 	valagobjectmodule.vala \
 	valagsignalmodule.vala \
diff --git a/gobject/valaccodegenerator.vala b/gobject/valaccodegenerator.vala
index c2d0ee55c..a4a3642f0 100644
--- a/gobject/valaccodegenerator.vala
+++ b/gobject/valaccodegenerator.vala
@@ -153,6 +153,7 @@ public class Vala.CCodeGenerator : CodeGenerator {
 		head = new CCodeArrayModule (this, head);
 		head = new CCodeDynamicPropertyModule (this, head);
 		head = new CCodeDynamicSignalModule (this, head);
+		head = new GErrorModule (this, head);
 		head = new GTypeModule (this, head);
 		head = new GObjectModule (this, head);
 		head = new GSignalModule (this, head);
@@ -1329,7 +1330,7 @@ public class Vala.CCodeGenerator : CodeGenerator {
 		cfrag.append (cdecl);
 
 		if (local.initializer != null && local.initializer.tree_can_fail) {
-			add_simple_check (local.initializer, cfrag);
+			head.add_simple_check (local.initializer, cfrag);
 		}
 
 		/* try to initialize uninitialized variables */
@@ -1812,87 +1813,6 @@ public class Vala.CCodeGenerator : CodeGenerator {
 		}
 	}
 
-	private void add_simple_check (CodeNode node, CCodeFragment cfrag) {
-		current_method_inner_error = true;
-
-		var cprint_frag = new CCodeFragment ();
-		var ccritical = new CCodeFunctionCall (new CCodeIdentifier ("g_critical"));
-		ccritical.add_argument (new CCodeConstant ("\"file %s: line %d: uncaught error: %s\""));
-		ccritical.add_argument (new CCodeConstant ("__FILE__"));
-		ccritical.add_argument (new CCodeConstant ("__LINE__"));
-		ccritical.add_argument (new CCodeMemberAccess.pointer (new CCodeIdentifier ("inner_error"), "message"));
-		cprint_frag.append (new CCodeExpressionStatement (ccritical));
-		var cclear = new CCodeFunctionCall (new CCodeIdentifier ("g_clear_error"));
-		cclear.add_argument (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeIdentifier ("inner_error")));
-		cprint_frag.append (new CCodeExpressionStatement (cclear));
-
-		if (current_try != null) {
-			// surrounding try found
-			// TODO might be the wrong one when using nested try statements
-
-			var cerror_block = new CCodeBlock ();
-			foreach (CatchClause clause in current_try.get_catch_clauses ()) {
-				// go to catch clause if error domain matches
-				var cgoto_stmt = new CCodeGotoStatement (clause.clabel_name);
-
-				if (clause.error_type.equals (gerror_type)) {
-					// general catch clause
-					cerror_block.add_statement (cgoto_stmt);
-				} else {
-					var ccond = new CCodeBinaryExpression (CCodeBinaryOperator.EQUALITY, new CCodeMemberAccess.pointer (new CCodeIdentifier ("inner_error"), "domain"), new CCodeIdentifier (clause.error_type.data_type.get_upper_case_cname ()));
-
-					var cgoto_block = new CCodeBlock ();
-					cgoto_block.add_statement (cgoto_stmt);
-
-					cerror_block.add_statement (new CCodeIfStatement (ccond, cgoto_block));
-				}
-			}
-			// print critical message if no catch clause matches
-			cerror_block.add_statement (cprint_frag);
-
-			// check error domain if expression failed
-			var ccond = new CCodeBinaryExpression (CCodeBinaryOperator.INEQUALITY, new CCodeIdentifier ("inner_error"), new CCodeConstant ("NULL"));
-
-			cfrag.append (new CCodeIfStatement (ccond, cerror_block));
-		} else if (current_method != null && current_method.get_error_types ().size > 0) {
-			// current method can fail, propagate error
-			// TODO ensure one of the error domains matches
-
-			var cpropagate = new CCodeFunctionCall (new CCodeIdentifier ("g_propagate_error"));
-			cpropagate.add_argument (new CCodeIdentifier ("error"));
-			cpropagate.add_argument (new CCodeIdentifier ("inner_error"));
-
-			var cerror_block = new CCodeBlock ();
-			cerror_block.add_statement (new CCodeExpressionStatement (cpropagate));
-
-			// free local variables
-			var free_frag = new CCodeFragment ();
-			append_local_free (current_symbol, free_frag, false);
-			cerror_block.add_statement (free_frag);
-
-			if (current_return_type is VoidType) {
-				cerror_block.add_statement (new CCodeReturnStatement ());
-			} else {
-				cerror_block.add_statement (new CCodeReturnStatement (default_value_for_type (current_return_type, false)));
-			}
-
-			var ccond = new CCodeBinaryExpression (CCodeBinaryOperator.INEQUALITY, new CCodeIdentifier ("inner_error"), new CCodeConstant ("NULL"));
-
-			cfrag.append (new CCodeIfStatement (ccond, cerror_block));
-		} else {
-			// unhandled error
-
-			var cerror_block = new CCodeBlock ();
-			// print critical message
-			cerror_block.add_statement (cprint_frag);
-
-			// check error domain if expression failed
-			var ccond = new CCodeBinaryExpression (CCodeBinaryOperator.INEQUALITY, new CCodeIdentifier ("inner_error"), new CCodeConstant ("NULL"));
-
-			cfrag.append (new CCodeIfStatement (ccond, cerror_block));
-		}
-	}
-
 	public override void visit_expression_statement (ExpressionStatement stmt) {
 		if (stmt.expression.error) {
 			stmt.error = true;
@@ -1927,7 +1847,7 @@ public class Vala.CCodeGenerator : CodeGenerator {
 
 			cfrag.append (stmt.ccodenode);
 
-			add_simple_check (stmt.expression, cfrag);
+			head.add_simple_check (stmt.expression, cfrag);
 
 			stmt.ccodenode = cfrag;
 		}
@@ -1956,7 +1876,7 @@ public class Vala.CCodeGenerator : CodeGenerator {
 		temp_ref_vars.clear ();
 	}
 	
-	private void create_temp_decl (Statement stmt, Gee.List<LocalVariable> temp_vars) {
+	public void create_temp_decl (Statement stmt, Gee.List<LocalVariable> temp_vars) {
 		/* declare temporary variables */
 		
 		if (temp_vars.size == 0) {
@@ -2226,7 +2146,7 @@ public class Vala.CCodeGenerator : CodeGenerator {
 		if (stmt.tree_can_fail && stmt.collection.tree_can_fail) {
 			// exception handling
 			var cfrag = new CCodeFragment ();
-			add_simple_check (stmt.collection, cfrag);
+			head.add_simple_check (stmt.collection, cfrag);
 			cblock.add_statement (cfrag);
 		}
 
@@ -2513,7 +2433,7 @@ public class Vala.CCodeGenerator : CodeGenerator {
 		create_local_free (stmt, true);
 	}
 
-	private void append_local_free (Symbol sym, CCodeFragment cfrag, bool stop_at_loop) {
+	public void append_local_free (Symbol sym, CCodeFragment cfrag, bool stop_at_loop) {
 		var b = (Block) sym;
 
 		var local_vars = b.get_local_variables ();
@@ -2735,7 +2655,7 @@ public class Vala.CCodeGenerator : CodeGenerator {
 
 			cfrag.append (stmt.ccodenode);
 
-			add_simple_check (stmt.yield_expression, cfrag);
+			head.add_simple_check (stmt.yield_expression, cfrag);
 
 			stmt.ccodenode = cfrag;
 		}
@@ -2765,20 +2685,7 @@ public class Vala.CCodeGenerator : CodeGenerator {
 	}
 
 	public override void visit_throw_statement (ThrowStatement stmt) {
-		stmt.accept_children (this);
-
-		var cfrag = new CCodeFragment ();
-
-		// method will fail
-		current_method_inner_error = true;
-		var cassign = new CCodeAssignment (new CCodeIdentifier ("inner_error"), (CCodeExpression) stmt.error_expression.ccodenode);
-		cfrag.append (new CCodeExpressionStatement (cassign));
-
-		add_simple_check (stmt, cfrag);
-
-		stmt.ccodenode = cfrag;
-
-		create_temp_decl (stmt, stmt.error_expression.temp_vars);
+		head.visit_throw_statement (stmt);
 	}
 
 	public override void visit_try_statement (TryStatement stmt) {
diff --git a/gobject/valaccodemodule.vala b/gobject/valaccodemodule.vala
index b8c8cec45..005bfafb0 100644
--- a/gobject/valaccodemodule.vala
+++ b/gobject/valaccodemodule.vala
@@ -171,4 +171,12 @@ public abstract class Vala.CCodeModule {
 	public virtual CCodeExpression get_array_length_cexpression (Expression array_expr, int dim = -1) {
 		return next.get_array_length_cexpression (array_expr, dim);
 	}
+
+	public virtual void visit_throw_statement (ThrowStatement stmt) {
+		next.visit_throw_statement (stmt);
+	}
+
+	public virtual void add_simple_check (CodeNode node, CCodeFragment cfrag) {
+		next.add_simple_check (node, cfrag);
+	}
 }
diff --git a/gobject/valagerrormodule.vala b/gobject/valagerrormodule.vala
new file mode 100644
index 000000000..fed349c92
--- /dev/null
+++ b/gobject/valagerrormodule.vala
@@ -0,0 +1,128 @@
+/* valagerrormodule.vala
+ *
+ * Copyright (C) 2008  Jürg Billeter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ *
+ * Author:
+ * 	Jürg Billeter <j@bitron.ch>
+ */
+
+using GLib;
+using Gee;
+
+public class Vala.GErrorModule : CCodeDynamicSignalModule {
+	public GErrorModule (CCodeGenerator codegen, CCodeModule? next) {
+		base (codegen, next);
+	}
+
+	public override void visit_throw_statement (ThrowStatement stmt) {
+		stmt.accept_children (codegen);
+
+		var cfrag = new CCodeFragment ();
+
+		// method will fail
+		codegen.current_method_inner_error = true;
+		var cassign = new CCodeAssignment (new CCodeIdentifier ("inner_error"), (CCodeExpression) stmt.error_expression.ccodenode);
+		cfrag.append (new CCodeExpressionStatement (cassign));
+
+		head.add_simple_check (stmt, cfrag);
+
+		stmt.ccodenode = cfrag;
+
+		codegen.create_temp_decl (stmt, stmt.error_expression.temp_vars);
+	}
+
+	public override void add_simple_check (CodeNode node, CCodeFragment cfrag) {
+		codegen.current_method_inner_error = true;
+
+		var cprint_frag = new CCodeFragment ();
+		var ccritical = new CCodeFunctionCall (new CCodeIdentifier ("g_critical"));
+		ccritical.add_argument (new CCodeConstant ("\"file %s: line %d: uncaught error: %s\""));
+		ccritical.add_argument (new CCodeConstant ("__FILE__"));
+		ccritical.add_argument (new CCodeConstant ("__LINE__"));
+		ccritical.add_argument (new CCodeMemberAccess.pointer (new CCodeIdentifier ("inner_error"), "message"));
+		cprint_frag.append (new CCodeExpressionStatement (ccritical));
+		var cclear = new CCodeFunctionCall (new CCodeIdentifier ("g_clear_error"));
+		cclear.add_argument (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeIdentifier ("inner_error")));
+		cprint_frag.append (new CCodeExpressionStatement (cclear));
+
+		if (codegen.current_try != null) {
+			// surrounding try found
+			// TODO might be the wrong one when using nested try statements
+
+			var cerror_block = new CCodeBlock ();
+			foreach (CatchClause clause in codegen.current_try.get_catch_clauses ()) {
+				// go to catch clause if error domain matches
+				var cgoto_stmt = new CCodeGotoStatement (clause.clabel_name);
+
+				if (clause.error_type.equals (codegen.gerror_type)) {
+					// general catch clause
+					cerror_block.add_statement (cgoto_stmt);
+				} else {
+					var ccond = new CCodeBinaryExpression (CCodeBinaryOperator.EQUALITY, new CCodeMemberAccess.pointer (new CCodeIdentifier ("inner_error"), "domain"), new CCodeIdentifier (clause.error_type.data_type.get_upper_case_cname ()));
+
+					var cgoto_block = new CCodeBlock ();
+					cgoto_block.add_statement (cgoto_stmt);
+
+					cerror_block.add_statement (new CCodeIfStatement (ccond, cgoto_block));
+				}
+			}
+			// print critical message if no catch clause matches
+			cerror_block.add_statement (cprint_frag);
+
+			// check error domain if expression failed
+			var ccond = new CCodeBinaryExpression (CCodeBinaryOperator.INEQUALITY, new CCodeIdentifier ("inner_error"), new CCodeConstant ("NULL"));
+
+			cfrag.append (new CCodeIfStatement (ccond, cerror_block));
+		} else if (codegen.current_method != null && codegen.current_method.get_error_types ().size > 0) {
+			// current method can fail, propagate error
+			// TODO ensure one of the error domains matches
+
+			var cpropagate = new CCodeFunctionCall (new CCodeIdentifier ("g_propagate_error"));
+			cpropagate.add_argument (new CCodeIdentifier ("error"));
+			cpropagate.add_argument (new CCodeIdentifier ("inner_error"));
+
+			var cerror_block = new CCodeBlock ();
+			cerror_block.add_statement (new CCodeExpressionStatement (cpropagate));
+
+			// free local variables
+			var free_frag = new CCodeFragment ();
+			codegen.append_local_free (codegen.current_symbol, free_frag, false);
+			cerror_block.add_statement (free_frag);
+
+			if (codegen.current_return_type is VoidType) {
+				cerror_block.add_statement (new CCodeReturnStatement ());
+			} else {
+				cerror_block.add_statement (new CCodeReturnStatement (codegen.default_value_for_type (codegen.current_return_type, false)));
+			}
+
+			var ccond = new CCodeBinaryExpression (CCodeBinaryOperator.INEQUALITY, new CCodeIdentifier ("inner_error"), new CCodeConstant ("NULL"));
+
+			cfrag.append (new CCodeIfStatement (ccond, cerror_block));
+		} else {
+			// unhandled error
+
+			var cerror_block = new CCodeBlock ();
+			// print critical message
+			cerror_block.add_statement (cprint_frag);
+
+			// check error domain if expression failed
+			var ccond = new CCodeBinaryExpression (CCodeBinaryOperator.INEQUALITY, new CCodeIdentifier ("inner_error"), new CCodeConstant ("NULL"));
+
+			cfrag.append (new CCodeIfStatement (ccond, cerror_block));
+		}
+	}
+}
diff --git a/gobject/valagtypemodule.vala b/gobject/valagtypemodule.vala
index 2a2ba8f89..1ddef2d44 100644
--- a/gobject/valagtypemodule.vala
+++ b/gobject/valagtypemodule.vala
@@ -23,7 +23,7 @@
 
 using GLib;
 
-public class Vala.GTypeModule : CCodeDynamicSignalModule {
+public class Vala.GTypeModule : GErrorModule {
 	public GTypeModule (CCodeGenerator codegen, CCodeModule? next) {
 		base (codegen, next);
 	}