minor refactoring changes

electronicarts · Aug 18, 2019 · 2feb6d5 · 2feb6d5
1 parent e321f93
commit 2feb6d5
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 38 deletions.
diff --git a/include/EASTL/string_hash_map.h b/include/EASTL/string_hash_map.h
@@ -126,9 +126,12 @@ eastl::pair<typename string_hash_map<T, Hash, Predicate, Allocator>::iterator, b
 string_hash_map<T, Hash, Predicate, Allocator>::insert_or_assign(const char* key, const T& value)
 {
 	iterator i = base::base_type::find(key);
-	if (i != base::base_type::end()) {
+	if (i != base::base_type::end())
+	{
 		return base::base_type::insert_or_assign(i->first, value);
-	} else {
+	}
+	else
+	{
 		return base::base_type::insert_or_assign(strduplicate(key), value);
 	}
 }

diff --git a/test/packages/EABase b/test/packages/EABase
diff --git a/test/packages/EAStdC b/test/packages/EAStdC
diff --git a/test/packages/EATest b/test/packages/EATest
diff --git a/test/source/TestSort.cpp b/test/source/TestSort.cpp
@@ -822,40 +822,41 @@ int TestSort()
 		EATEST_VERIFY(is_sorted(floatArray.begin(), floatArray.end(), SafeFloatCompare()));
 	}
 
-	auto test_stable_sort = [&](auto testArray, size_t count)
 	{
-		for (size_t i = 0; i < count; i++)
-			testArray.push_back((uint16_t)rng.Rand());
-
-		vector<uint16_t> evenArray;
-		vector<uint16_t> oddArray;
-
-		eastl::copy_if(testArray.begin(), testArray.end(), eastl::back_inserter(evenArray), 
-		    [](uint16_t val) { return (val % 2) == 0; });
-		eastl::copy_if(testArray.begin(), testArray.end(), eastl::back_inserter(oddArray),
-		    [](uint16_t val) { return (val % 2) != 0; });
-
-		auto const boundary = eastl::stable_partition(testArray.begin(), testArray.end(), [](uint16_t val) { return val % 2 == 0; });
-		auto const evenCount = eastl::distance(testArray.begin(), boundary);
-		auto const oddCount = eastl::distance(boundary, testArray.end());
-		auto const evenExpectedCount = (intptr_t)evenArray.size();
-		auto const oddExpectedCount = (intptr_t)oddArray.size();
-		EATEST_VERIFY(evenCount == evenExpectedCount);
-		EATEST_VERIFY(oddCount == oddExpectedCount);
-		EATEST_VERIFY(eastl::equal(testArray.begin(), boundary, evenArray.begin()));
-		EATEST_VERIFY(eastl::equal(boundary, testArray.end(), oddArray.begin()));
-	};
-
-	// Test stable_partition
-	test_stable_sort(vector<uint16_t>(), 1000);
-	// Test stable_partition on empty container
-	test_stable_sort(vector<uint16_t>(), 0);
-	// Test stable_partition on container of one element
-	test_stable_sort(vector<uint16_t>(), 1);
-	// Test stable_partition on container of two element
-	test_stable_sort(vector<uint16_t>(), 2);
-	// Test stable_partition on bidirectional iterator (not random access)
-	test_stable_sort(list<uint16_t>(), 0);
+		auto test_stable_sort = [&](auto testArray, size_t count)
+		{
+			auto isEven = [](auto val) { return (val % 2) == 0; };
+			auto isOdd  = [](auto val) { return (val % 2) != 0; };
+
+			for (size_t i = 0; i < count; i++)
+				testArray.push_back((uint16_t)rng.Rand());
+
+			vector<uint16_t> evenArray;
+			vector<uint16_t> oddArray;
+
+			eastl::copy_if(testArray.begin(), testArray.end(), eastl::back_inserter(evenArray), isEven);
+			eastl::copy_if(testArray.begin(), testArray.end(), eastl::back_inserter(oddArray), isOdd);
+
+			const auto boundary = eastl::stable_partition(testArray.begin(), testArray.end(), isEven);
+
+			const auto evenCount = eastl::distance(testArray.begin(), boundary);
+			const auto oddCount = eastl::distance(boundary, testArray.end());
+
+			const auto evenExpectedCount = (ptrdiff_t)evenArray.size();
+			const auto oddExpectedCount = (ptrdiff_t)oddArray.size();
+
+			EATEST_VERIFY(evenCount == evenExpectedCount);
+			EATEST_VERIFY(oddCount == oddExpectedCount);
+			EATEST_VERIFY(eastl::equal(testArray.begin(), boundary, evenArray.begin()));
+			EATEST_VERIFY(eastl::equal(boundary, testArray.end(), oddArray.begin()));
+		};
+
+		test_stable_sort(vector<uint16_t>(), 1000); // Test stable_partition
+		test_stable_sort(vector<uint16_t>(), 0);	// Test stable_partition on empty container
+		test_stable_sort(vector<uint16_t>(), 1);	// Test stable_partition on container of one element
+		test_stable_sort(vector<uint16_t>(), 2);	// Test stable_partition on container of two element
+		test_stable_sort(list<uint16_t>(),   0);	// Test stable_partition on bidirectional iterator (not random access)
+	}
 
 	#if 0 // Disabled because it takes a long time and thus far seems to show no bug in quick_sort.
 	{