Style.

src/common/classes/string_test.cpp

@@ -50,7 +50,8 @@ typedef string AbstractString;
 #include <time.h>
 
 #ifdef DEV_BUILD
-void CheckStr(const AbstractString& check, const char* want, int line) {
+void CheckStr(const AbstractString& check, const char* want, int line)
+{
 	if (strlen(check.c_str()) != check.length()) {
 		printf("Length error at %d\n\n", line);
 	}
@@ -64,8 +65,9 @@ void CheckStr(const AbstractString& check, const char* want, int line) {
 #define check(a, b)
 #endif
 
-void test(void) {
+void test()
 {
+	{
 		string a;
 		validate(a, "");
 		a = lbl;
@@ -83,8 +85,9 @@ void test(void) {
 #endif
 		string j(&lbl[3], &lbl[5]);
 		validate(j, "34");
-}
+	}
-{
+
+	{
 		string a = lbl;
 		string b;
 		b = a;
@@ -107,44 +110,51 @@ void test(void) {
 		*z = 0;
 		b = y;
 		validate(b, lbl);
-}
+	}
+
 #ifdef FULL_FIRE
-{
+	{
 		const string a = lbl;
 		string b = a.at(5);
 		validate(b, "5");
-}
+	}
-{
+
+	{
 		string a = lbl;
 		string b = a.at(5);
 		validate(b, "5");
-}
+	}
 #endif
-// conflict with J. requirement to string class - operator const char* {
+
-//	string a = lbl;
+	// conflict with J. requirement to string class - operator const char*
-//	char c = a[5];
+	//	{
-//	a[5] = 'u';
+	//	string a = lbl;
-//	validate(a, "01234u6789");
+	//	char c = a[5];
-//}
+	//	a[5] = 'u';
-{
+	//	validate(a, "01234u6789");
+	//	}
+	{
 		string a = lbl;
 		char c = a[5];  // via operator const char*
 		a.at(5) = 'u';
 		a.at(7) = c;
 		validate(a, "01234u6589");
-}
+	}
+
 #ifdef CHECK_FATAL_RANGE_EXCEPTION
-{
+	{
 		const string a = lbl;
 		string b = a.at(15);
-}
+	}
 #endif
-{
+
+	{
 		string a = lbl;
 		a.resize(15, 'u');
 		validate(a, "0123456789uuuuu");
-}
+	}
-{
+
+	{
 		string a;
 		string x = lbl;
 		x += lbl;
@@ -167,8 +177,9 @@ void test(void) {
 		x += lbl; //40 bytes
 		a = x;
 		validate(a, x.c_str());
-}
+	}
-{
+
+	{
 		string a = lbl;
 		const string b = a;
 		a += b;
@@ -181,8 +192,9 @@ void test(void) {
 		a = lbl;
 		a += 'u';
 		validate(a, "0123456789u");
-}
+	}
-{
+
+	{
 		string a, b, c;
 
 		a = "uuu";
@@ -204,8 +216,9 @@ void test(void) {
 
 		validate(a, "uuu");
 		validate(b, lbl);
-}
+	}
-{
+
+	{
 		string a = lbl;
 		const string b = a;
 		a.append(b);
@@ -250,8 +263,9 @@ void test(void) {
 		validate(a, "0123456789Something reaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaally long");
 		a = c;
 		validate(a, c.c_str());
-}
+	}
-{
+
+	{
 		string a, b;
 		b = lbl;
 
@@ -276,8 +290,9 @@ void test(void) {
 		string::iterator y = b.end();
 		a.assign(x, y);
 		validate(a, lbl);
-}
+	}
-{
+
+	{
 		string a, b = lbl;
 
 		a = lbl;
@@ -348,8 +363,9 @@ void test(void) {
 		y -= 2;
 		a.erase(x, y);
 		validate(a, "01289");
-}
+	}
-{
+
+	{
 		string a;
 		const string b = lbl;
 		string::iterator f0, t0;
@@ -410,8 +426,9 @@ void test(void) {
 		a = lbl;
 		a.replace(2, 1, "Something reaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaally long");
 		validate(a, "01Something reaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaally long3456789");
-}
+	}
-{
+
+	{
 		string a, b = lbl;
 		char s[40];
 		memset(s, 0, 40);
@@ -426,18 +443,17 @@ void test(void) {
 		validate(a, lbl);
 #endif
 
-//	a.swap(b);
+	//	a.swap(b);
-//	validate(b, "3456789");
+	//	validate(b, "3456789");
-//	validate(a, lbl);
+	//	validate(a, lbl);
-}
+	}
 
 #ifdef DEV_BUILD
 #undef check
-#define check(a, b) if (a != b) printf("Wanted %d got %d at %d\n\n",\
+#define check(a, b) if (a != b) printf("Wanted %d got %d at %d\n\n", b, a, __LINE__)
-										  b, a, __LINE__)
 #endif
 
-{
+	{
 		string a = "012345uuu345678";
 						//	 9
 		string b = "345";
@@ -483,8 +499,9 @@ void test(void) {
 		check(a.find_last_not_of(a), string::npos);
 
 		check(a.find_first_not_of("u345", 8), 12);
-}
+	}
-{
+
+	{
 		string a = lbl;
 		string b;
 
@@ -493,14 +510,15 @@ void test(void) {
 
 		b = a.substr(5, 20);
 		validate(b, "56789");
+
 #ifdef FULL_FIRE
 		b = a.substr(50, 20);
 		validate(b, "");
-
 #endif
-}
+	}
+
 #ifdef FULL_FIRE
-{
+	{
 		string b;
 		FILE *x = fopen("string_test.cpp", "rt");
 		b.LoadFromFile(x);
@@ -510,9 +528,10 @@ void test(void) {
 		b.LoadFromFile(x);
 		validate(b, "//#define CHECK_FATAL_RANGE_EXCEPTION");
 		fclose(x);
-}
+	}
 #endif
-{
+
+	{
 		string a = "Something moderaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaately long";
 		string a1 = a;
 		string b = a + a1;
@@ -531,7 +550,7 @@ void test(void) {
 		string n = c;
 		string o = c;
 		string p = c;
-}
+	}
 
 #ifdef DEV_BUILD
 #undef check
@@ -540,15 +559,15 @@ void test(void) {
 #endif
 
 #ifdef FULL_FIRE
-{
+	{
 		PathName c = "Aa";
 		PathName d = "AB";
 
 		check(c.compare(d), -1);
-}
+	}
 #endif
 
-{
+	{
 		string a = lbl;
 		string b = a;
 		string c = "Aaa";
@@ -566,9 +585,10 @@ void test(void) {
 		check(a.compare(1, 10, b, 1, 10), 0);
 		check(a.compare(lbl), 0);
 		check(a.compare(1, 3, lbl + 1, 3), 0);
-}
+	}
+
 #ifdef FULL_FIRE
-{
+	{
 		string a = "  011100   ", b;
 
 		b = a;
@@ -592,16 +612,18 @@ void test(void) {
 		validate(b, "  011100   ");
 
 		validate(a, "  011100   ");
-}
+	}
-{
+
+	{
 		string a = lbl;
 		a += '\377';
 		string b = a;
 		a += " ";
 		a.rtrim();
 		validate(a, b.c_str());
-}
+	}
-{
+
+	{
 		string a = "AaBbCc", b;
 
 		b = a;
@@ -613,13 +635,14 @@ void test(void) {
 		validate(b, "AABBCC");
 
 		validate(a, "AaBbCc");
-}
+	}
 #endif
 }
 
 clock_t t;
 
-void start() {
+void start()
+{
 	t = clock();
 }
 
@@ -629,13 +652,15 @@ void start() {
 #define TEST_ITEMS 100000
 #endif
 
-void report() {
+void report()
+{
 	clock_t d = clock();
 	printf("Test of %d iterations with %s took %d milliseconds.\n",
-		TEST_ITEMS, NAME, (int)(d-t)*1000/CLOCKS_PER_SEC);
+		TEST_ITEMS, NAME, (int) (d - t) * 1000 / CLOCKS_PER_SEC);
 }
 
-int main(int ac, char **av) {
+int main(int ac, char **av)
+{
 	int n = TEST_ITEMS;
 	start();
 	while (n--) {
@@ -645,7 +670,7 @@ int main(int ac, char **av) {
 #if defined(DEV_BUILD) && defined(FIRESTR)
 	getDefaultMemoryPool()->print_contents(stdout, false);
 #endif
-printf("Press enter to continue\n");
+	printf("Press enter to continue\n");
-getchar();
+	getchar();
-return 0;
+	return 0;
 }