add flags ref

Author: DomCR

CSUtilities.Tests/Extensions/EnumExtensionsTests.cs

@@ -1,24 +1,25 @@
-using CSUtilities.Attributes;
-using CSUtilities.Extensions;
+using CSUtilities.Extensions;
+using CSUtilities.Tests.Mock;
 using System;
 using Xunit;
 
 namespace CSUtilities.Tests.Extensions
 {
 	public class EnumExtensionsTests
 	{
-		private enum MockStringValues
+		[Fact]
+		public void AddFlagTest()
 		{
-			[StringValue("Undefined value for enum")]
-			Undefined = 0,
-
-			[StringValue("Enum String Value 1")]
-			Value1 = 1,
+			MockFlags flags = MockFlags.None;
 
-			[StringValue("Enum String Value 2")]
-			Value2,
-
-			NoAttribute,
+			flags.AddFlag(MockFlags.Flag1);
+			Assert.Equal(MockFlags.Flag1, flags);
+			flags.AddFlag(MockFlags.Flag2);
+			Assert.Equal(MockFlags.Flag1 | MockFlags.Flag2, flags);
+			flags.AddFlag(MockFlags.Flag3);
+			Assert.Equal(MockFlags.All, flags);
+			flags.AddFlag(MockFlags.Flag1);
+			Assert.Equal(MockFlags.All, flags);
 		}
 
 		[Fact]
@@ -38,6 +39,19 @@ public void ParseTest()
 			Assert.Throws<ArgumentException>(() => EnumExtensions.Parse<MockStringValues>("value1", false));
 		}
 
+		[Fact]
+		public void RemoveFlagTest()
+		{
+			MockFlags flags = MockFlags.All;
+
+			flags.RemoveFlag(MockFlags.Flag1);
+			Assert.Equal(MockFlags.Flag2 | MockFlags.Flag3, flags);
+			flags.RemoveFlag(MockFlags.Flag2);
+			Assert.Equal(MockFlags.Flag3, flags);
+			flags.RemoveFlag(MockFlags.Flag3);
+			Assert.Equal(MockFlags.None, flags);
+		}
+
 		[Fact]
 		public void TryParseTest()
 		{
@@ -53,4 +67,4 @@ public void TryParseTest()
 			Assert.Equal(default(MockStringValues), result);
 		}
 	}
-}
+}

CSUtilities.Tests/Mock/MockFlags.cs

@@ -0,0 +1,18 @@
+using System;
+
+namespace CSUtilities.Tests.Mock
+{
+	[Flags]
+	public enum MockFlags
+	{
+		None = 0,
+
+		Flag1 = 1,
+
+		Flag2 = 2,
+
+		Flag3 = 4,
+
+		All = Flag1 | Flag2 | Flag3
+	}
+}

CSUtilities.Tests/Mock/MockStringValues.cs

@@ -0,0 +1,18 @@
+using CSUtilities.Attributes;
+
+namespace CSUtilities.Tests.Mock
+{
+	public enum MockStringValues
+	{
+		[StringValue("Undefined value for enum")]
+		Undefined = 0,
+
+		[StringValue("Enum String Value 1")]
+		Value1 = 1,
+
+		[StringValue("Enum String Value 2")]
+		Value2,
+
+		NoAttribute,
+	}
+}

CSUtilities/Extensions/EnumExtensions.cs

@@ -32,23 +32,23 @@ public static T GetValueByName<T>(string name)
 		}
 
 		/// <summary>
-		/// Adds a flag value to enum
+		/// Adds a flag value to enum.
 		/// </summary>
-		public static T AddFlag<T>(this T value, T flag)
+		public static void AddFlag<T>(ref this T value, T flag)
 			where T : struct, Enum
 		{
 			Type type = getEnumType(Convert.GetTypeCode(value));
-			return (T)Convert.ChangeType((Convert.ToUInt64(value) | Convert.ToUInt64(flag)), type);
+			value = (T)Convert.ChangeType((Convert.ToUInt64(value) | Convert.ToUInt64(flag)), type);
 		}
 
 		/// <summary>
-		/// Removes the flag value from enum
+		/// Removes the flag value from enum.
 		/// </summary>
-		public static T RemoveFlag<T>(this T value, T flag)
-			where T : Enum
+		public static void RemoveFlag<T>(ref this T value, T flag)
+			where T : struct, Enum
 		{
 			Type type = getEnumType(Convert.GetTypeCode(value));
-			return (T)Convert.ChangeType((Convert.ToUInt64(value) & ~Convert.ToUInt64(flag)), type);
+			value = (T)Convert.ChangeType((Convert.ToUInt64(value) & ~Convert.ToUInt64(flag)), type);
 		}
 
 		/// <summary>