stdc++: migrate tools/tests removing uses of nall::vector

tests/arm7tdmi/arm7tdmi.cpp

@@ -42,7 +42,7 @@ struct TestCase {
   u32 index;
   TestState initial;
   TestState final;
-  vector<Transaction> transactions;
+  std::vector<Transaction> transactions;
   u32 opcode;
   u32 base_addr;
 };
@@ -56,14 +56,14 @@ using TestResults = array<u32[3]>;
 struct CPU : ares::ARM7TDMI {
   u32 clock = 0;
   int tindex = 0;
-  vector<string> errors;
+  std::vector<string> errors;
   maybe<const TestCase&> test;
 
   auto power(const TestCase& test) -> void {
     ARM7TDMI::power();
     clock = 0;
     tindex = 0;
-    errors.reset();
+    errors.clear();
     this->test = test;
   }
 
@@ -131,7 +131,7 @@ struct CPU : ares::ARM7TDMI {
 
   template<typename... P>
   auto error(P&&... p) -> void {
-    errors.append(string{std::forward<P>(p)...});
+    errors.push_back(string{std::forward<P>(p)...});
   }
 } cpu;
 
@@ -333,7 +333,7 @@ auto CPU::run(const TestCase& test, bool logErrors) -> TestResult {
     error("transactions: ", tindex, " != ", test.transactions.size(), "\n");
   }
 
-  if(errors) {
+  if(!errors.empty()) {
     if(logErrors) {
       print("\n");
       print("test: ", test.index, "\n");

tests/m68000/m68000.cpp

@@ -30,7 +30,7 @@ struct TestState {
   u32 usp;
   u32 ssp;
   array<u32[2]> prefetch;
-  vector<array<u32[2]>> ram;
+  std::vector<array<u32[2]>> ram;
 };
 
 struct TestCase {
@@ -101,9 +101,9 @@ auto CPU::run(const TestCase& test, bool logErrors) -> TestResult {
 
   instruction();
 
-  vector<string> errors;
+  std::vector<string> errors;
   auto error = [&](auto&&... p) -> void {
-    errors.append(string{std::forward<decltype(p)>(p)...});
+    errors.push_back(string{std::forward<decltype(p)>(p)...});
   };
 
   if(!r.s) swap(r.a[7], r.sp);  //swap back to match test format
@@ -148,7 +148,7 @@ auto CPU::run(const TestCase& test, bool logErrors) -> TestResult {
     }
   }
 
-  if(errors) {
+  if(!errors.empty()) {
     if(logErrors) {
       print("\n");
       print(test.name, "\n");

tools/genius/genius.cpp

@@ -103,7 +103,7 @@ auto ListWindow::updateWindow() -> void {
   removeButton.setEnabled((bool)gameList.selected());
   string name = Location::base(location);
   if(!name) name = "(Untitled)";
-  setTitle({modified ? "*" : "", name, " [", games.size(), "] - genius"});
+  setTitle({modified ? "*" : string{}, name, " [", games.size(), "] - genius"});
 }
 
 auto ListWindow::newDatabase() -> void {

tools/mame2bml/mame2bml.cpp

@@ -1,4 +1,7 @@
 #include <nall/nall.hpp>
+#include <algorithm>
+#include <ranges>
+#include <vector>
 
 using namespace nall;
 
@@ -19,14 +22,14 @@ auto Mame2BML::main(Arguments arguments) -> void {
 
   string markupName = arguments.take();
   string outputName = arguments.take();
-  vector<string> driverNames = {};
+  std::vector<string> driverNames = {};
   if(!markupName.endsWith(".xml")) return print("error: arguments in incorrect order\n");
   if(!outputName.endsWith(".bml")) return print("error: arguments in incorrect order\n");
   if(arguments.size() == 0) return print("error: mame driver or ares core name required\n");
 
   while(arguments.size()) {
     string driverName = arguments.take();
-    driverNames.append(driverName);
+    driverNames.push_back(driverName);
   }
 
   string markup = string::read(markupName);
@@ -53,7 +56,7 @@ auto Mame2BML::main(Arguments arguments) -> void {
       for(auto machine : header) {
         if(machine.name() != "machine") continue;
         string driverName = machine["sourcefile"].string();
-        if(!driverNames.find(driverName)) continue;
+        if(std::ranges::find(driverNames, driverName) == driverNames.end()) continue;
         string type = "game";
         string IsBIOS = machine["isbios"].string();
         string parent = machine["romof"].string();
@@ -98,7 +101,7 @@ auto Mame2BML::main(Arguments arguments) -> void {
         output.print("game\n");
         output.print("  name:  ", software["name"].string(), "\n");
         output.print("  title: ", software["description"].string(), "\n");
-        output.print("  board: ", driverNames.first(), "\n");
+        output.print("  board: ", driverNames.front(), "\n");
 
         print("found ", software["name"].string(), " (", software["description"].string(), ")\n");