diff --git a/.gitignore b/.gitignore index d88dfb9..521010a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ bin obj packages *.nupkg -TestResults \ No newline at end of file +TestResults +*.DotSettings.user diff --git a/DynamicEnums/DynamicEnum.cs b/DynamicEnums/DynamicEnum.cs index 427a65c..4d5bdc8 100644 --- a/DynamicEnums/DynamicEnum.cs +++ b/DynamicEnums/DynamicEnum.cs @@ -110,7 +110,7 @@ namespace DynamicEnums { var otherValue = DynamicEnum.GetValue(other); if (otherValue != 0) { if (included.Length > 0) - included.Append(" | "); + included.Append(", "); included.Append(other); remain &= ~otherValue; } @@ -426,7 +426,7 @@ namespace DynamicEnums { var cache = DynamicEnum.GetStorage(type).ParseCache; if (!cache.TryGetValue(strg, out var cached)) { BigInteger? accum = null; - foreach (var val in strg.Split('|')) { + foreach (var val in strg.Split(',')) { foreach (var defined in DynamicEnum.GetValues(type)) { if (defined.name == val.Trim()) { accum = (accum ?? 0) | DynamicEnum.GetValue(defined); diff --git a/README.md b/README.md index e1fb555..f587287 100644 --- a/README.md +++ b/README.md @@ -48,11 +48,11 @@ bool hasAll = allFlags1.HasAllFlags(MyEnum.FlagOne | MyEnum.ValueOne); // false // displaying a dynamic enum value or flag Console.WriteLine(MyEnum.FlagOne); // "FlagOne" -Console.WriteLine(allFlags1); // "FlagOne | FlagTwo | FlagThree" +Console.WriteLine(allFlags1); // "FlagOne, FlagTwo, FlagThree" // parsing a dynamic enum value MyEnum parsed1 = DynamicEnum.Parse("FlagOne"); -MyEnum parsed2 = DynamicEnum.Parse("FlagOne | FlagThree"); +MyEnum parsed2 = DynamicEnum.Parse("FlagOne, FlagThree"); ``` You can also check out [the tests](https://github.com/Ellpeck/DynamicEnums/tree/main/Tests) for some more complex examples. diff --git a/Tests/EnumTests.cs b/Tests/EnumTests.cs index 51a127e..6a2dbe2 100644 --- a/Tests/EnumTests.cs +++ b/Tests/EnumTests.cs @@ -74,13 +74,13 @@ public class EnumTests { Assert.AreEqual(flags[24].HasAnyFlags(DynamicEnum.GetEnumValue(0)), false); Assert.AreEqual(DynamicEnum.Parse("Flag24"), flags[24]); - Assert.AreEqual(DynamicEnum.Parse("Flag24 | Flag43"), DynamicEnum.Or(flags[24], flags[43])); + Assert.AreEqual(DynamicEnum.Parse("Flag24, Flag43"), DynamicEnum.Or(flags[24], flags[43])); Assert.AreEqual(flags[24].ToString(), "Flag24"); Assert.AreEqual(zero.ToString(), "Zero"); Assert.AreEqual(DynamicEnum.GetEnumValue(0).ToString(), "Zero"); - Assert.AreEqual(DynamicEnum.Or(flags[24], flags[43]).ToString(), "Flag24 | Flag43"); - Assert.AreEqual(DynamicEnum.Or(flags[24], DynamicEnum.GetEnumValue(new BigInteger(1) << 99)).ToString(), "Flag24 | Flag99"); + Assert.AreEqual(DynamicEnum.Or(flags[24], flags[43]).ToString(), "Flag24, Flag43"); + Assert.AreEqual(DynamicEnum.Or(flags[24], DynamicEnum.GetEnumValue(new BigInteger(1) << 99)).ToString(), "Flag24, Flag99"); Assert.AreEqual(DynamicEnum.Or(flags[24], DynamicEnum.GetEnumValue(new BigInteger(1) << 101)).ToString(), (DynamicEnum.GetValue(flags[24]) | new BigInteger(1) << 101).ToString()); Assert.True(DynamicEnum.IsDefined(flags[27]));