Refactoring

Author: morzhovets

include/momo/Array.h

@@ -173,11 +173,11 @@ class ArraySettings
 		if (capacity <= 2)
 			newCapacity = 4;
 		else if (capacity <= 64)
-			newCapacity = capacity * 2;
+			newCapacity = 2 * capacity;
 		else if (linear || capacity < 150)
 			newCapacity = capacity + 64;
 		else
-			newCapacity = capacity + (capacity / 50) * 23;	// k^4 < 1 + k + k^2
+			newCapacity = capacity + 23 * (capacity / 50);	// k^4 < 1 + k + k^2
 		if (newCapacity < minNewCapacity)
 			newCapacity = minNewCapacity;
 		return newCapacity;

include/momo/DataColumn.h

@@ -811,7 +811,7 @@ class DataColumnList
 			Edge* nextEdge;
 		};
 
-		static const size_t maxEdgeCount = 2 * maxColumnCount;
+		static const size_t maxEdgeCount = maxColumnCount * 2;
 
 	public:
 		explicit Graph() noexcept
@@ -1179,7 +1179,7 @@ class DataColumnList
 		{
 			if (!graph.HasEdge(v) || addends[v] != 0)
 				continue;
-			addends[v] = size_t{1} << (8 * sizeof(size_t) - 1);
+			addends[v] = size_t{1} << (sizeof(size_t) * 8 - 1);
 			if (!graph.FillAddends(addends.data(), v))
 				return false;
 		}

include/momo/HashSorter.h

@@ -393,7 +393,7 @@ class HashSorter
 		const IterThreeComparer& iterThreeComp)
 	{
 		size_t leftIndex = 0;
-		for (size_t i = 0; i < count; i = i * 2 + 2)
+		for (size_t i = 0; i < count; i = 2 * i + 2)
 		{
 			int cmp = iterThreeComp(SMath::Next(begin, i));
 			if (cmp > 0)
@@ -438,7 +438,7 @@ class HashSorter
 	static size_t pvMultShift(HashCode value1, size_t value2) noexcept
 	{
 		MOMO_STATIC_ASSERT(sizeof(HashCode) >= sizeof(size_t));
-		static const size_t halfSize = 4 * sizeof(HashCode);
+		static const size_t halfSize = sizeof(HashCode) * 4;
 		static const HashCode halfMask = (HashCode{1} << halfSize) - 1;
 		HashCode res = (value1 >> halfSize) * (value2 >> halfSize)
 			+ (((value1 >> halfSize) * (value2 & halfMask)) >> halfSize)

include/momo/MemPool.h

@@ -799,7 +799,7 @@ class MemPool : private TParams
 	{
 		size_t blockIndex = Params::blockCount;
 		blockIndex -= static_cast<size_t>(-pvGetFirstBlockIndex(chunk));	// gcc
-		return chunk + Params::blockAlignment + Params::blockSize * blockIndex;
+		return chunk + Params::blockAlignment + blockIndex * Params::blockSize;
 	}
 
 	bool pvIsChunkBytesNear() const noexcept
@@ -935,7 +935,7 @@ namespace internal
 			{
 				uint32_t nextBlock = (i + 1 < blockCount)
 					? static_cast<uint32_t>(chunkCount * blockCount + i + 1) : nullPtr;
-				pvSetNextBlock(nextBlock, chunk + mBlockSize * i);
+				pvSetNextBlock(nextBlock, chunk + i * mBlockSize);
 			}
 			mBlockHead = static_cast<uint32_t>(chunkCount * blockCount);
 			mChunks.AddBackNogrow(chunk);

include/momo/ObjectManager.h

@@ -111,7 +111,7 @@ class ObjectRelocator
 		Object* srcObjects, Object* dstObjects, size_t count) noexcept
 	{
 		if (count > 0)
-			internal::MemCopyer::CopyBuffer(srcObjects, dstObjects, sizeof(Object) * count);
+			internal::MemCopyer::CopyBuffer(srcObjects, dstObjects, count * sizeof(Object));
 	}
 
 private:
@@ -233,7 +233,7 @@ namespace internal
 		}
 
 	private:
-		MOMO_ALIGNED_STORAGE(sizeof(Object) * count, alignment) mBuffer;
+		MOMO_ALIGNED_STORAGE(count * sizeof(Object), alignment) mBuffer;
 	};
 
 	template<typename TObject, typename TMemManager, typename... ObjectArgs>

include/momo/RadixSorter.h

@@ -74,7 +74,7 @@ namespace internal
 		{
 			typedef decltype(codeGetter(begin)) Code;
 			pvSort<Code>(begin, count, codeGetter, iterSwapper, itemsGrouper,
-				8 * sizeof(Code) - radixSize);
+				sizeof(Code) * 8 - radixSize);
 		}
 
 	private:

include/momo/SegmentedArray.h

@@ -126,7 +126,7 @@ class SegmentedArraySettings<SegmentedArrayItemCountFunc::sqrt, tLogInitialItemC
 
 	static size_t pvSegIndexToLogItemCount(size_t segIndex) noexcept
 	{
-		return internal::UIntMath<>::Log2((segIndex * 2 + 4) / 3);
+		return internal::UIntMath<>::Log2((2 * segIndex + 4) / 3);
 	}
 };
 

include/momo/details/ArrayBucket.h

@@ -296,7 +296,7 @@ namespace internal
 						{
 							ArrayMemPool& arrayMemPool = params.GetArrayMemPool();
 							ArrayMemory memory(arrayMemPool);
-							Array array = Array::CreateCap(maxFastCount * 2,
+							Array array = Array::CreateCap(2 * maxFastCount,
 								MemManagerPtr(arrayMemPool.GetMemManager()));
 							Item* newItems = array.GetItems();
 							ItemTraits::RelocateCreate(params.GetMemManager(), items, newItems,
@@ -337,7 +337,7 @@ namespace internal
 				Array& array = pvGetArray();
 				array.RemoveBack();
 				if (2 < count && count <= array.GetCapacity() / 4)
-					array.TryShrink(count * 2);
+					array.TryShrink(2 * count);
 			}
 		}
 

include/momo/details/TreeNode.h

@@ -70,7 +70,7 @@ namespace internal
 
 		typedef internal::MemManagerPtr<MemManager> MemManagerPtr;
 
-		static const size_t internalOffset = UIntMath<>::Ceil(sizeof(Node*) * (maxCapacity + 1),
+		static const size_t internalOffset = UIntMath<>::Ceil((maxCapacity + 1) * sizeof(Node*),
 			UIntConst::maxAlignment);
 
 		static const size_t leafMemPoolCount = maxCapacity / (2 * capacityStep) + 1;
@@ -81,7 +81,7 @@ namespace internal
 		private:
 			static const size_t itemOffset = UIntMath<>::Ceil(sizeof(Node), ItemTraits::alignment);
 			static const size_t internalNodeSize =
-				internalOffset + itemOffset + sizeof(Item) * maxCapacity;
+				internalOffset + itemOffset + maxCapacity * sizeof(Item);
 
 			typedef MemPoolParamsStatic<internalNodeSize, UIntConst::maxAlignment,
 				MemPoolParams::blockCount, MemPoolParams::cachedFreeBlockCount> InternalMemPoolParams;
@@ -100,7 +100,7 @@ namespace internal
 				for (size_t i = 0; i < leafMemPoolCount; ++i)
 				{
 					size_t capacity = maxCapacity - i * capacityStep;
-					size_t leafNodeSize = itemOffset + sizeof(Item) * capacity;
+					size_t leafNodeSize = itemOffset + capacity * sizeof(Item);
 					mLeafMemPools.AddBackNogrow(LeafMemPool(MemPoolParams(leafNodeSize),
 						MemManagerPtr(memManager)));
 				}
@@ -190,7 +190,7 @@ namespace internal
 		{
 			size_t capacity = maxCapacity;
 			if (IsLeaf())
-				capacity -= capacityStep * size_t{mMemPoolIndex};
+				capacity -= size_t{mMemPoolIndex} * capacityStep;
 			return capacity;
 		}