Merge branch 'master' of https://github.com/water111/jak-project into w/type-system

test/test_CodeTester.cpp

@@ -135,17 +135,17 @@ TEST(CodeTester, xmm_move) {
   CodeTester tester;
   tester.init_code_buffer(256);
 
-  for(auto constant : u32_constants) {
-    for(int r1 = 0; r1 < 16; r1++) {
-      if(r1 == RSP) {
+  for (auto constant : u32_constants) {
+    for (int r1 = 0; r1 < 16; r1++) {
+      if (r1 == RSP) {
         continue;
       }
-      for(int r2 = 0; r2 < 16; r2++) {
-        if(r2 == RSP) {
+      for (int r2 = 0; r2 < 16; r2++) {
+        if (r2 == RSP) {
           continue;
         }
-        for(int r3 = 0; r3 < 16; r3++) {
-          for(int r4 = 0; r4 < 16; r4++) {
+        for (int r3 = 0; r3 < 16; r3++) {
+          for (int r4 = 0; r4 < 16; r4++) {
             tester.clear();
             tester.emit_push_all_gprs(true);
             // move constant to gpr

test/test_kernel.cpp

@@ -263,8 +263,7 @@ TEST(Kernel, itoa_base_16) {
   EXPECT_EQ("1", std::string(buffer));
 
   kitoa(buffer, -1, 16, -1, ' ', 0);
-  EXPECT_EQ("ffffffffffffffff",
-            std::string(buffer));
+  EXPECT_EQ("ffffffffffffffff", std::string(buffer));
 
   kitoa(buffer, -1, 16, 5, ' ', 0);
   EXPECT_EQ("-fffff", std::string(buffer));
@@ -282,8 +281,7 @@ TEST(Kernel, itoa_base_16) {
   EXPECT_EQ("jjjjbadbeef", std::string(buffer));
 
   kitoa(buffer, INT64_MIN, 16, 0, ' ', 0);
-  EXPECT_EQ("8000000000000000",
-            std::string(buffer));
+  EXPECT_EQ("8000000000000000", std::string(buffer));
 }
 
 namespace {
@@ -343,7 +341,6 @@ TEST(Kernel, PrintBuffer) {
   // more complicated tests for format will be done from within GOAL.
 }
 
-
 TEST(Kernel, HashTable) {
   constexpr int size = 32 * 1024 * 1024;
   auto mem = new u8[size];
@@ -360,7 +357,7 @@ TEST(Kernel, HashTable) {
   std::unordered_map<std::string, u32> symbol_locations;
   std::unordered_set<u32> unique_locations;
 
-  for(auto name : all_syms) {
+  for (auto name : all_syms) {
     auto loc = intern_from_c(name).offset;
     symbol_locations[name] = loc;
     unique_locations.insert(loc);
@@ -369,7 +366,7 @@ TEST(Kernel, HashTable) {
   EXPECT_EQ(7941, symbol_locations.size());
   EXPECT_EQ(7941, unique_locations.size());
 
-  for(auto name : all_syms) {
+  for (auto name : all_syms) {
     EXPECT_EQ(symbol_locations.at(name), intern_from_c(name).offset);
   }
 
@@ -380,11 +377,10 @@ TEST(Kernel, HashTable) {
 
   // expect no crc32 hash collisions. This doesn't matter, but it's nice to know.
   std::unordered_set<u32> crc32s;
-  for(auto name : all_syms) {
+  for (auto name : all_syms) {
     crc32s.insert(crc32((const u8*)name, strlen(name)));
   }
   EXPECT_EQ(7941, crc32s.size());
 
   delete[] mem;
 }
-

test/test_listener_deci2.cpp

@@ -8,7 +8,7 @@ namespace {
 bool always_false() {
   return false;
 }
-}
+}  // namespace
 
 TEST(Listener, ListenerCreation) {
   listener::Listener l;
@@ -23,7 +23,7 @@ TEST(Listener, DeciInit) {
   EXPECT_TRUE(s.init());
 }
 
-//TEST(Listener, TwoDeciServers) {
+// TEST(Listener, TwoDeciServers) {
 //  Deci2Server s1, s2;
 //  EXPECT_TRUE(s1.init());
 //  EXPECT_TRUE(s2.init());
@@ -47,7 +47,7 @@ TEST(Listener, DeciCheckNoListener) {
 }
 
 TEST(Listener, DeciThenListener) {
-  for(int i = 0; i < 10; i++) {
+  for (int i = 0; i < 10; i++) {
     Deci2Server s(always_false);
     EXPECT_TRUE(s.init());
     EXPECT_FALSE(s.check_for_listener());
@@ -58,8 +58,8 @@ TEST(Listener, DeciThenListener) {
     EXPECT_FALSE(s.check_for_listener());
     EXPECT_TRUE(l.connect_to_target());
     // kind of a hack.
-    while(!s.check_for_listener()) {
-      printf("...\n");
+    while (!s.check_for_listener()) {
+      // printf("...\n");
     }
 
     EXPECT_TRUE(s.check_for_listener());
@@ -67,7 +67,7 @@ TEST(Listener, DeciThenListener) {
 }
 
 TEST(Listener, DeciThenListener2) {
-  for(int i = 0; i < 10; i++) {
+  for (int i = 0; i < 10; i++) {
     Deci2Server s(always_false);
     EXPECT_TRUE(s.init());
     EXPECT_FALSE(s.check_for_listener());
@@ -81,14 +81,14 @@ TEST(Listener, DeciThenListener2) {
 }
 
 TEST(Listener, ListenerThenDeci) {
-  for(int i = 0; i < 10; i++) {
+  for (int i = 0; i < 10; i++) {
     Listener l;
     EXPECT_FALSE(l.connect_to_target());
     Deci2Server s(always_false);
     EXPECT_TRUE(s.init());
     EXPECT_FALSE(s.check_for_listener());
     EXPECT_TRUE(l.connect_to_target());
-    while(!s.check_for_listener()) {
+    while (!s.check_for_listener()) {
       printf("...\n");
     }
   }
@@ -102,8 +102,8 @@ TEST(Listener, ListenerMultipleDecis) {
     EXPECT_TRUE(s.init());
     EXPECT_FALSE(s.check_for_listener());
     EXPECT_TRUE(l.connect_to_target());
-    while(!s.check_for_listener()) {
-      printf("...\n");
+    while (!s.check_for_listener()) {
+      // printf("...\n");
     }
     l.disconnect();
   }
@@ -113,10 +113,9 @@ TEST(Listener, ListenerMultipleDecis) {
     EXPECT_TRUE(s.init());
     EXPECT_FALSE(s.check_for_listener());
     EXPECT_TRUE(l.connect_to_target());
-    while(!s.check_for_listener()) {
-      printf("...\n");
+    while (!s.check_for_listener()) {
+      // printf("...\n");
     }
     l.disconnect();
   }
-
 }

test/test_reader.cpp

@@ -316,8 +316,7 @@ TEST(GoosReader, TopLevel) {
 
 TEST(GoosReader, FromFile) {
   Reader reader;
-  auto result =
-      reader.read_from_file(util::combine_path({"test", "test_reader_file0.gc"})).print();
+  auto result = reader.read_from_file(util::combine_path({"test", "test_reader_file0.gc"})).print();
   EXPECT_TRUE(result == "(top-level (1 2 3 4))");
 }
 

test/test_type_system.cpp

@@ -230,4 +230,4 @@ TEST(TypeSystem, MethodSubstitute) {
 
 // field lookup
 
-// TODO - a big test to make sure all the builtin types are what we expect.
+// TODO - a big test to make sure all the builtin types are what we expect.