add CCodeArrayCreationExpressionBinding class and move relevant code from

2007-09-27  Juerg Billeter  <j@bitron.ch>

	* gobject/Makefile.am,
	  gobject/valaccodearraycreationexpressionbinding.vala,
	  gobject/valaccodegenerator.vala: add
	  CCodeArrayCreationExpressionBinding class and move relevant code from
	  CCodeGenerator to CCodeArrayCreationExpressionBinding

svn path=/trunk/; revision=633

ChangeLog

+2007-09-27  Jürg Billeter  <j@bitron.ch>
+
+	* gobject/Makefile.am,
+	  gobject/valaccodearraycreationexpressionbinding.vala,
+	  gobject/valaccodegenerator.vala: add
+	  CCodeArrayCreationExpressionBinding class and move relevant code from
+	  CCodeGenerator to CCodeArrayCreationExpressionBinding
+
 2007-09-27  Jürg Billeter  <j@bitron.ch>
 
 	* gobject/valaccodeassignmentbinding.vala: refactor emit method

gobject/Makefile.am

@@ -13,6 +13,9 @@ lib_LTLIBRARIES = \
 
 libvala_la_SOURCES = \
 	gobject.vala.stamp \
+	valaccodearraycreationexpressionbinding.c \
+	valaccodearraycreationexpressionbinding.h \
+	valaccodearraycreationexpressionbinding.vala \
 	valaccodeassignmentbinding.c \
 	valaccodeassignmentbinding.h \
 	valaccodeassignmentbinding.vala \
@@ -75,6 +78,7 @@ libvala_la_SOURCES = \
 gobjectincludedir = $(includedir)/vala-1.0/gobject
 
 gobjectinclude_HEADERS = \
+	valaccodearraycreationexpressionbinding.h \
 	valaccodeassignmentbinding.h \
 	valaccodebinding.h \
 	valaccodecompiler.h \

gobject/valaccodearraycreationexpressionbinding.vala

+/* valaccodearraycreationexpressionbinding.vala
+ *
+ * Copyright (C) 2006-2007  Jürg Billeter, Raffaele Sandrini
+ *
+ * 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>
+ *	Raffaele Sandrini <raffaele@sandrini.ch>
+ */
+
+using GLib;
+using Gee;
+
+/**
+ * The link between an assignment and generated code.
+ */
+public class Vala.CCodeArrayCreationExpressionBinding : CCodeExpressionBinding {
+	public ArrayCreationExpression! array_creation_expression { get; set; }
+
+	public CCodeArrayCreationExpressionBinding (construct CodeGenerator! codegen, construct ArrayCreationExpression! array_creation_expression) {
+	}
+
+	public override void emit () {
+		var expr = array_creation_expression;
+
+		expr.accept_children (codegen);
+
+		var gnew = new CCodeFunctionCall (new CCodeIdentifier ("g_new0"));
+		gnew.add_argument (new CCodeIdentifier (expr.element_type.get_cname ()));
+		bool first = true;
+		CCodeExpression cexpr = null;
+		foreach (Expression size in expr.get_sizes ()) {
+			CCodeExpression csize;
+			if (expr.element_type.data_type != null && expr.element_type.data_type.is_reference_type ()) {
+				// add extra item to have array NULL-terminated for all reference types
+				csize = new CCodeBinaryExpression (CCodeBinaryOperator.PLUS, (CCodeExpression) size.ccodenode, new CCodeConstant ("1"));
+			} else {
+				csize = (CCodeExpression) size.ccodenode;
+			}
+
+			if (first) {
+				cexpr = csize;
+				first = false;
+			} else {
+				cexpr = new CCodeBinaryExpression (CCodeBinaryOperator.MUL, cexpr, csize);
+			}
+		}
+		gnew.add_argument (cexpr);
+
+		if (expr.initializer_list != null) {
+			// FIXME rank > 1 not supported yet
+			if (expr.rank > 1) {
+				expr.error = true;
+				Report.error (expr.source_reference, "Creating arrays with rank greater than 1 with initializers is not supported yet");
+			}
+
+			var ce = new CCodeCommaExpression ();
+			var temp_var = codegen.get_temp_variable_declarator (expr.static_type, true, expr);
+			var name_cnode = new CCodeIdentifier (temp_var.name);
+			int i = 0;
+			
+			codegen.temp_vars.insert (0, temp_var);
+			
+			ce.append_expression (new CCodeAssignment (name_cnode, gnew));
+			
+			foreach (Expression e in expr.initializer_list.get_initializers ()) {
+				ce.append_expression (new CCodeAssignment (new CCodeElementAccess (name_cnode, new CCodeConstant (i.to_string ())), (CCodeExpression) e.ccodenode));
+				i++;
+			}
+			
+			ce.append_expression (name_cnode);
+			
+			codenode = ce;
+		} else {
+			codenode = gnew;
+		}
+
+		expr.ccodenode = codenode;
+	}
+}

gobject/valaccodegenerator.vala

@@ -1997,64 +1997,9 @@ public class Vala.CCodeGenerator : CodeGenerator {
 		
 		stmt.ccodenode = cn;
 	}
-	
-	/**
-	 * Visit operations called for array creation expresions.
-	 *
-	 * @param expr an array creation expression
-	 */
-	public override void visit_array_creation_expression (ArrayCreationExpression! expr) {
-		expr.accept_children (this);
-
-		var gnew = new CCodeFunctionCall (new CCodeIdentifier ("g_new0"));
-		gnew.add_argument (new CCodeIdentifier (expr.element_type.get_cname ()));
-		bool first = true;
-		CCodeExpression cexpr = null;
-		foreach (Expression size in expr.get_sizes ()) {
-			CCodeExpression csize;
-			if (expr.element_type.data_type != null && expr.element_type.data_type.is_reference_type ()) {
-				// add extra item to have array NULL-terminated for all reference types
-				csize = new CCodeBinaryExpression (CCodeBinaryOperator.PLUS, (CCodeExpression) size.ccodenode, new CCodeConstant ("1"));
-			} else {
-				csize = (CCodeExpression) size.ccodenode;
-			}
 
-			if (first) {
-				cexpr = csize;
-				first = false;
-			} else {
-				cexpr = new CCodeBinaryExpression (CCodeBinaryOperator.MUL, cexpr, csize);
-			}
-		}
-		gnew.add_argument (cexpr);
-
-		if (expr.initializer_list != null) {
-			// FIXME rank > 1 not supported yet
-			if (expr.rank > 1) {
-				expr.error = true;
-				Report.error (expr.source_reference, "Creating arrays with rank greater than 1 with initializers is not supported yet");
-			}
-
-			var ce = new CCodeCommaExpression ();
-			var temp_var = get_temp_variable_declarator (expr.static_type, true, expr);
-			var name_cnode = new CCodeIdentifier (temp_var.name);
-			int i = 0;
-			
-			temp_vars.insert (0, temp_var);
-			
-			ce.append_expression (new CCodeAssignment (name_cnode, gnew));
-			
-			foreach (Expression e in expr.initializer_list.get_initializers ()) {
-				ce.append_expression (new CCodeAssignment (new CCodeElementAccess (name_cnode, new CCodeConstant (i.to_string ())), (CCodeExpression) e.ccodenode));
-				i++;
-			}
-			
-			ce.append_expression (name_cnode);
-			
-			expr.ccodenode = ce;
-		} else {
-			expr.ccodenode = gnew;
-		}
+	public override void visit_array_creation_expression (ArrayCreationExpression! expr) {
+		expr.code_binding.emit ();
 	}
 
 	public override void visit_boolean_literal (BooleanLiteral! expr) {
@@ -3035,7 +2980,7 @@ public class Vala.CCodeGenerator : CodeGenerator {
 	}
 
 	public override CodeBinding create_array_creation_expression_binding (ArrayCreationExpression! node) {
-		return null;
+		return new CCodeArrayCreationExpressionBinding (this, node);
 	}
 
 	public override CodeBinding create_boolean_literal_binding (BooleanLiteral! node) {