vala r1117 - in trunk: . vala

[juergbi svn gnome org]

Author: juergbi
Date: Sat Mar  8 22:16:26 2008
New Revision: 1117
URL: http://svn.gnome.org/viewvc/vala?rev=1117&view=rev

Log:
2008-03-08  Juerg Billeter  <j bitron ch>

	* vala/valaarray.vala: minor code cleanup,
	  based on patch by Andreas Brauchli


Modified:
   trunk/ChangeLog
   trunk/vala/valaarray.vala

Modified: trunk/vala/valaarray.vala
==============================================================================
--- trunk/vala/valaarray.vala	(original)
+++ trunk/vala/valaarray.vala	Sat Mar  8 22:16:26 2008
@@ -63,32 +63,15 @@
 	}
 
 	construct {
-		/* FIXME: this implementation reveals compiler bugs 
-		string commas = "";
-		int i = rank - 1;
-		
-		while (i > 0) {
-			string += ",";
-			i--;
-		}
-			
-		name = "%s[%s]".printf (element_type.name, commas); */
-		
-		if (rank < 1) {
-			Report.error (null, "internal: attempt to create an array with rank smaller than 1");
-		}
-		
-		int i = rank - 1;
+		assert (rank >= 1);
+
+		string commas = string.nfill (rank - 1, ',');
+
 		if (element_type != null) {
-			name = "%s[".printf (element_type.name);
+			name = "%s[%s]".printf (element_type.name, commas);
 		} else {
-			name = "%s[".printf (element_type_parameter.name);
-		}
-		while (i > 0) {
-			name = "%s,".printf (name);
-			i--;
+			name = "%s[%s]".printf (element_type_parameter.name, commas);
 		}
-		name = "%s]".printf (name);
 	}
 
 	public override string get_cname (bool const_type = false) {