Add test to prove out remap behavior

include/remap/remap.hpp

@@ -0,0 +1,41 @@
+//
+//  remap.hpp
+//  remap
+//
+//  Created by Sam Jaffe on 9/16/18.
+//
+#pragma once
+
+#include <map>
+#include <unordered_map>
+
+/*
+ * A remap referres to a "value re-mapping object". This is used to allow us to
+ * rename
+ */
+template <typename T, typename Impl> class remap_base {
+public:
+  using value_type = typename Impl::value_type;
+  using key_type = typename Impl::key_type;
+  using mapped_type = typename Impl::mapped_type;
+
+private:
+  Impl impl_;
+
+public:
+  remap_base(std::initializer_list<value_type> mappings) : impl_(mappings) {}
+
+  mapped_type const & operator[](T const & value) const {
+    auto it = impl_.find(value);
+    return (it != impl_.end()) ? it->second : value;
+  }
+};
+
+template <typename T, typename Compare = std::less<T>,
+          typename Alloc = std::allocator<std::pair<T const, T>>>
+using remap = remap_base<T, std::map<T, T, Compare, Alloc>>;
+template <typename T, typename Hash = std::hash<T>,
+          typename Equal = std::equal_to<T>,
+          typename Alloc = std::allocator<std::pair<T const, T>>>
+using unordered_remap =
+    remap_base<T, std::unordered_map<T, T, Hash, Equal, Alloc>>;

remap-test/Info.plist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>

remap.xcodeproj/project.pbxproj

@@ -0,0 +1,389 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		CDCB3C2A24E44FEE0029B771 /* remap in Resources */ = {isa = PBXBuildFile; fileRef = CDCB3C2924E44FED0029B771 /* remap */; };
+		CDF5F671214ED00800AE7051 /* GoogleMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CDF5F668214ECFED00AE7051 /* GoogleMock.framework */; };
+		CDF5F673214ED02600AE7051 /* remap_test.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CDF5F672214ED02600AE7051 /* remap_test.cxx */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		CDF5F667214ECFED00AE7051 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDF5F660214ECFED00AE7051 /* GoogleMock.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 05818F861A685AEA0072A469;
+			remoteInfo = GoogleMock;
+		};
+		CDF5F669214ECFED00AE7051 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDF5F660214ECFED00AE7051 /* GoogleMock.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 05E96ABD1A68600C00204102;
+			remoteInfo = gmock;
+		};
+		CDF5F66B214ECFED00AE7051 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDF5F660214ECFED00AE7051 /* GoogleMock.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 05E96B1F1A68634900204102;
+			remoteInfo = gtest;
+		};
+		CDF5F66D214ECFED00AE7051 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDF5F660214ECFED00AE7051 /* GoogleMock.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 05818F901A685AEA0072A469;
+			remoteInfo = GoogleMockTests;
+		};
+		CDF5F66F214ED00300AE7051 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDF5F660214ECFED00AE7051 /* GoogleMock.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 05818F851A685AEA0072A469;
+			remoteInfo = GoogleMock;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXFileReference section */
+		CDCB3C2924E44FED0029B771 /* remap */ = {isa = PBXFileReference; lastKnownFileType = folder; name = remap; path = include/remap; sourceTree = "<group>"; };
+		CDF5F655214ECFA500AE7051 /* remap-test.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "remap-test.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
+		CDF5F659214ECFA500AE7051 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		CDF5F660214ECFED00AE7051 /* GoogleMock.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = GoogleMock.xcodeproj; path = "../../../gmock-xcode-master/GoogleMock.xcodeproj"; sourceTree = "<group>"; };
+		CDF5F672214ED02600AE7051 /* remap_test.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = remap_test.cxx; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		CDF5F652214ECFA500AE7051 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				CDF5F671214ED00800AE7051 /* GoogleMock.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		CDF5F63F214ECE2100AE7051 = {
+			isa = PBXGroup;
+			children = (
+				CDF5F660214ECFED00AE7051 /* GoogleMock.xcodeproj */,
+				CDCB3C2924E44FED0029B771 /* remap */,
+				CDF5F64F214ECF6E00AE7051 /* test */,
+				CDF5F656214ECFA500AE7051 /* remap-test */,
+				CDF5F649214ECE2100AE7051 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		CDF5F649214ECE2100AE7051 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				CDF5F655214ECFA500AE7051 /* remap-test.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		CDF5F64F214ECF6E00AE7051 /* test */ = {
+			isa = PBXGroup;
+			children = (
+				CDF5F672214ED02600AE7051 /* remap_test.cxx */,
+			);
+			path = test;
+			sourceTree = "<group>";
+		};
+		CDF5F656214ECFA500AE7051 /* remap-test */ = {
+			isa = PBXGroup;
+			children = (
+				CDF5F659214ECFA500AE7051 /* Info.plist */,
+			);
+			path = "remap-test";
+			sourceTree = "<group>";
+		};
+		CDF5F661214ECFED00AE7051 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				CDF5F668214ECFED00AE7051 /* GoogleMock.framework */,
+				CDF5F66A214ECFED00AE7051 /* gmock.framework */,
+				CDF5F66C214ECFED00AE7051 /* gtest.framework */,
+				CDF5F66E214ECFED00AE7051 /* GoogleMockTests.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		CDF5F654214ECFA500AE7051 /* remap-test */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = CDF5F65D214ECFA500AE7051 /* Build configuration list for PBXNativeTarget "remap-test" */;
+			buildPhases = (
+				CDF5F651214ECFA500AE7051 /* Sources */,
+				CDF5F652214ECFA500AE7051 /* Frameworks */,
+				CDF5F653214ECFA500AE7051 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				CDF5F670214ED00300AE7051 /* PBXTargetDependency */,
+			);
+			name = "remap-test";
+			productName = "remap-test";
+			productReference = CDF5F655214ECFA500AE7051 /* remap-test.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		CDF5F640214ECE2100AE7051 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 1030;
+				ORGANIZATIONNAME = "Sam Jaffe";
+				TargetAttributes = {
+					CDF5F654214ECFA500AE7051 = {
+						CreatedOnToolsVersion = 7.2.1;
+					};
+				};
+			};
+			buildConfigurationList = CDF5F643214ECE2100AE7051 /* Build configuration list for PBXProject "remap" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = CDF5F63F214ECE2100AE7051;
+			productRefGroup = CDF5F649214ECE2100AE7051 /* Products */;
+			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = CDF5F661214ECFED00AE7051 /* Products */;
+					ProjectRef = CDF5F660214ECFED00AE7051 /* GoogleMock.xcodeproj */;
+				},
+			);
+			projectRoot = "";
+			targets = (
+				CDF5F654214ECFA500AE7051 /* remap-test */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXReferenceProxy section */
+		CDF5F668214ECFED00AE7051 /* GoogleMock.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = GoogleMock.framework;
+			remoteRef = CDF5F667214ECFED00AE7051 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CDF5F66A214ECFED00AE7051 /* gmock.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = gmock.framework;
+			remoteRef = CDF5F669214ECFED00AE7051 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CDF5F66C214ECFED00AE7051 /* gtest.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = gtest.framework;
+			remoteRef = CDF5F66B214ECFED00AE7051 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CDF5F66E214ECFED00AE7051 /* GoogleMockTests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = GoogleMockTests.xctest;
+			remoteRef = CDF5F66D214ECFED00AE7051 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
+/* Begin PBXResourcesBuildPhase section */
+		CDF5F653214ECFA500AE7051 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				CDCB3C2A24E44FEE0029B771 /* remap in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		CDF5F651214ECFA500AE7051 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				CDF5F673214ED02600AE7051 /* remap_test.cxx in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		CDF5F670214ED00300AE7051 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = GoogleMock;
+			targetProxy = CDF5F66F214ED00300AE7051 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin XCBuildConfiguration section */
+		CDF5F64A214ECE2100AE7051 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+				USER_HEADER_SEARCH_PATHS = include/;
+			};
+			name = Debug;
+		};
+		CDF5F64B214ECE2100AE7051 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = macosx;
+				USER_HEADER_SEARCH_PATHS = include/;
+			};
+			name = Release;
+		};
+		CDF5F65E214ECFA500AE7051 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				INFOPLIST_FILE = "remap-test/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "leumasjaffe.remap-test";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		CDF5F65F214ECFA500AE7051 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				INFOPLIST_FILE = "remap-test/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "leumasjaffe.remap-test";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		CDF5F643214ECE2100AE7051 /* Build configuration list for PBXProject "remap" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				CDF5F64A214ECE2100AE7051 /* Debug */,
+				CDF5F64B214ECE2100AE7051 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		CDF5F65D214ECFA500AE7051 /* Build configuration list for PBXNativeTarget "remap-test" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				CDF5F65E214ECFA500AE7051 /* Debug */,
+				CDF5F65F214ECFA500AE7051 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = CDF5F640214ECE2100AE7051 /* Project object */;
+}

test/remap_test.cxx

@@ -0,0 +1,38 @@
+//
+//  remap_test.cpp
+//  remap
+//
+//  Created by Sam Jaffe on 9/16/18.
+//
+
+#include "remap/remap.hpp"
+
+#include <gmock/gmock.h>
+
+TEST(RemapTest, RemapsValues) {
+  remap<int> map{{1, 2}, {2, 1}};
+  EXPECT_THAT(map[0], 0);
+  EXPECT_THAT(map[1], 2);
+  EXPECT_THAT(map[2], 1);
+  EXPECT_THAT(map[3], 3);
+}
+
+TEST(RemapTest, ReturnsSameObjectIfNotContained) {
+  remap<int> map{{1, 2}, {2, 1}};
+  auto ZERO = 0;
+  EXPECT_THAT(&map[ZERO], &ZERO);
+}
+
+TEST(UnorderedRemapTest, RemapsValues) {
+  unordered_remap<int> map{{1, 2}, {2, 1}};
+  EXPECT_THAT(map[0], 0);
+  EXPECT_THAT(map[1], 2);
+  EXPECT_THAT(map[2], 1);
+  EXPECT_THAT(map[3], 3);
+}
+
+TEST(UnorderedRemapTest, ReturnsSameObjectIfNotContained) {
+  unordered_remap<int> map{{1, 2}, {2, 1}};
+  auto ZERO = 0;
+  EXPECT_THAT(&map[ZERO], &ZERO);
+}