vala r2119 - in trunk: . gobject

[juergbi svn gnome org]

Author: juergbi
Date: Fri Dec  5 21:28:53 2008
New Revision: 2119
URL: http://svn.gnome.org/viewvc/vala?rev=2119&view=rev

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

	* gobject/valaccodebasemodule.vala:

	Fix struct constants


Modified:
   trunk/ChangeLog
   trunk/gobject/valaccodebasemodule.vala

Modified: trunk/gobject/valaccodebasemodule.vala
==============================================================================
--- trunk/gobject/valaccodebasemodule.vala	(original)
+++ trunk/gobject/valaccodebasemodule.vala	Fri Dec  5 21:28:53 2008
@@ -715,14 +715,7 @@
 	public override void visit_constant (Constant c) {
 		c.accept_children (codegen);
 
-		if (!(c.type_reference is ArrayType)) {
-			var cdefine = new CCodeMacroReplacement.with_expression (c.get_cname (), (CCodeExpression) c.initializer.ccodenode);
-			if (!c.is_internal_symbol ()) {
-				header_type_member_declaration.append (cdefine);
-			} else {
-				source_type_member_declaration.append (cdefine);
-			}
-		} else {
+		if (c.initializer is InitializerList) {
 			var cdecl = new CCodeDeclaration (c.type_reference.get_const_cname ());
 			var arr = "";
 			if (c.type_reference is ArrayType) {
@@ -736,6 +729,13 @@
 			} else {
 				source_constant_declaration.append (cdecl);
 			}
+		} else {
+			var cdefine = new CCodeMacroReplacement.with_expression (c.get_cname (), (CCodeExpression) c.initializer.ccodenode);
+			if (!c.is_internal_symbol ()) {
+				header_type_member_declaration.append (cdefine);
+			} else {
+				source_type_member_declaration.append (cdefine);
+			}
 		}
 	}