From 90c1c1ee6c18e6d5e3fd351227aa5763a7dd23b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C5=8Dshin?= Date: Thu, 6 Jun 2024 22:12:16 -0700 Subject: [PATCH] Revert "Get rid of preprocessor stuff in test" This reverts commit a8dcc1a71de2fd1aaed8b8bef480fdf4f4b3c91b. --- test/ctl/string_test.cc | 100 ++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/test/ctl/string_test.cc b/test/ctl/string_test.cc index 311b86c83..81464b571 100644 --- a/test/ctl/string_test.cc +++ b/test/ctl/string_test.cc @@ -24,16 +24,15 @@ #include "libc/runtime/runtime.h" #include "libc/str/str.h" -using String = ctl::string; // #include -// using String = std::string; +// #define ctl std int main() { { - String s; + ctl::string s; s += 'h'; s += 'i'; if (s != "hi") @@ -41,7 +40,7 @@ main() } { - String s; + ctl::string s; if (!s.empty()) return 6; s.reserve(32); @@ -57,7 +56,7 @@ main() } { - String s; + ctl::string s; s += "hello world how are you"; s.reserve(3); if (s != "hello world how are you") @@ -65,7 +64,7 @@ main() } { - String s(4, 'x'); + ctl::string s(4, 'x'); if (s != "xxxx") return 12; s.resize(3); @@ -77,42 +76,42 @@ main() } { - String a = "a"; - String b = "a"; + ctl::string a = "a"; + ctl::string b = "a"; if (a.compare(b) != 0) return 17; } { - String a = "a"; - String b = "b"; + ctl::string a = "a"; + ctl::string b = "b"; if (a.compare(b) >= 0) return 18; } { - String a = "a"; - String b = "ab"; + ctl::string a = "a"; + ctl::string b = "ab"; if (a.compare(b) >= 0) return 19; } { - String a = "ab"; - String b = "a"; + ctl::string a = "ab"; + ctl::string b = "a"; if (a.compare(b) <= 0) return 20; } { - String a = ""; - String b = ""; + ctl::string a = ""; + ctl::string b = ""; if (a.compare(b) != 0) return 21; } { - String a = "fooBARbaz"; + ctl::string a = "fooBARbaz"; if (a.substr(3, 3) != "BAR") return 22; if (a.replace(3, 3, "MOO") != "fooMOObaz") @@ -120,7 +119,7 @@ main() } { - String a = "fooBAR"; + ctl::string a = "fooBAR"; if (a.substr(3, 3) != "BAR") return 24; if (a.replace(3, 3, "MOO") != "fooMOO") @@ -128,7 +127,7 @@ main() } { - String a = "fooBAR"; + ctl::string a = "fooBAR"; if (a.substr(1, 0) != "") return 26; if (a.replace(1, 0, "MOO") != "fMOOooBAR") @@ -144,15 +143,15 @@ main() } { - String s1 = "hello"; - String s2 = "world"; - String s3 = s1 + " " + s2; + ctl::string s1 = "hello"; + ctl::string s2 = "world"; + ctl::string s3 = s1 + " " + s2; if (s3 != "hello world") return 32; } { - String s = "hello"; + ctl::string s = "hello"; if (s.size() != 5) return 33; if (s.length() != 5) @@ -162,7 +161,7 @@ main() } { - String s = "hello"; + ctl::string s = "hello"; if (s[0] != 'h' || s[1] != 'e' || s[2] != 'l' || s[3] != 'l' || s[4] != 'o') return 36; @@ -172,17 +171,17 @@ main() } { - String s = "hello"; + ctl::string s = "hello"; if (s.find('e') != 1) return 38; if (s.find('l') != 2) return 39; - if (s.find('x') != s.npos) + if (s.find('x') != ctl::string::npos) return 40; } { - String s = "hello"; + ctl::string s = "hello"; if (!s.ends_with("lo")) return 41; if (s.ends_with("el")) @@ -190,8 +189,8 @@ main() } { - String s = "hello"; - String sub = s.substr(1, 3); + ctl::string s = "hello"; + ctl::string sub = s.substr(1, 3); if (sub != "ell") return 43; sub = s.substr(2); @@ -200,8 +199,8 @@ main() } { - String s = "hello"; - String s2 = s; + ctl::string s = "hello"; + ctl::string s2 = s; if (s != s2) return 45; s2[0] = 'H'; @@ -210,8 +209,8 @@ main() } { - String s = "hello"; - String s2 = std::move(s); + ctl::string s = "hello"; + ctl::string s2 = std::move(s); if (s2 != "hello") return 47; if (!s.empty()) @@ -219,14 +218,14 @@ main() } { - String s = "hello"; + ctl::string s = "hello"; const char* cstr = s.c_str(); if (strcmp(cstr, "hello") != 0) return 49; } // { - // String s = "hello"; + // ctl::string s = "hello"; // char buffer[10]; // s.copy(buffer, sizeof(buffer)); // if (strcmp(buffer, "hello") != 0) @@ -234,7 +233,7 @@ main() // } { - String s = "hello"; + ctl::string s = "hello"; s.resize(3); if (s != "hel") return 51; @@ -244,14 +243,14 @@ main() } { - String s = "hello"; + ctl::string s = "hello"; s.clear(); if (!s.empty()) return 53; } { - String s = "hello"; + ctl::string s = "hello"; auto it = s.begin(); if (*it != 'h') return 54; @@ -261,21 +260,21 @@ main() } // { - // String s = "hello"; - // String s2 = "world"; + // ctl::string s = "hello"; + // ctl::string s2 = "world"; // s.swap(s2); // if (s != "world" || s2 != "hello") // return 56; // } { - String s = "hello"; + ctl::string s = "hello"; if (s.front() != 'h' || s.back() != 'o') return 57; } { - String s = "hello"; + ctl::string s = "hello"; s.push_back('!'); if (s != "hello!") return 58; @@ -285,28 +284,28 @@ main() } { - String s = "hello"; + ctl::string s = "hello"; s.insert(2, "XYZ"); if (s != "heXYZllo") return 60; } { - String s = "hello"; + ctl::string s = "hello"; s.erase(1, 2); if (s != "hlo") return 61; } { - String s = "hello"; + ctl::string s = "hello"; s.replace(1, 2, "XYZ"); if (s != "hXYZlo") return 62; } { - String s = "hello"; + ctl::string s = "hello"; s.append(" world"); if (s != "hello world") return 63; @@ -320,14 +319,14 @@ main() } // { - // String s = "hello"; + // ctl::string s = "hello"; // s.assign("world"); // if (s != "world") // return 64; // } { - String s = "hello"; + ctl::string s = "hello"; if (s.compare("world") >= 0) return 65; if (s.compare("hello") != 0) @@ -337,7 +336,7 @@ main() } { - String s = "hello"; + ctl::string s = "hello"; if (s == "world") return 68; if (s != "hello") @@ -356,7 +355,8 @@ main() } { - String s; + ctl::string s; +#undef ctl if constexpr (std::is_same_v) { // tests the small-string optimization on ctl::string char* d = s.data();