epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use pattern matching in FieldSaver

Browse Source
This commit is contained in:
abcdefg30
2021-01-08 22:21:43 +01:00
committed by teinarss
parent d6a05f2ea2
commit fd75e03d9c
2 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OpenRA.Game/FieldSaver.cs
View File

@@ -72,32 +72,14 @@ namespace OpenRA
return ""; return "";
var t = v.GetType(); var t = v.GetType();
if (t == typeof(Color))
{
return ((Color)v).ToString();
}
if (t == typeof(Rectangle))
{
var r = (Rectangle)v;
return "{0},{1},{2},{3}".F(r.X, r.Y, r.Width, r.Height);
}
if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(BitSet<>)) if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(BitSet<>))
{
return ((IEnumerable<string>)v).Select(FormatValue).JoinWith(", "); return ((IEnumerable<string>)v).Select(FormatValue).JoinWith(", ");
}
if (t.IsArray && t.GetArrayRank() == 1) if (t.IsArray && t.GetArrayRank() == 1)
{
return ((Array)v).Cast<object>().Select(FormatValue).JoinWith(", "); return ((Array)v).Cast<object>().Select(FormatValue).JoinWith(", ");
}
if (t.IsGenericType && (t.GetGenericTypeDefinition() == typeof(HashSet<>) || t.GetGenericTypeDefinition() == typeof(List<>))) if (t.IsGenericType && (t.GetGenericTypeDefinition() == typeof(HashSet<>) || t.GetGenericTypeDefinition() == typeof(List<>)))
{
return ((System.Collections.IEnumerable)v).Cast<object>().Select(FormatValue).JoinWith(", "); return ((System.Collections.IEnumerable)v).Cast<object>().Select(FormatValue).JoinWith(", ");
}
// This is only for documentation generation // This is only for documentation generation
if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(Dictionary<,>)) if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(Dictionary<,>))
@@ -118,11 +100,8 @@ namespace OpenRA
return result; return result;
} }
if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(Primitives.Cache<,>)) if (v is DateTime d)
return ""; // TODO return d.ToString("yyyy-MM-dd HH-mm-ss", CultureInfo.InvariantCulture);
if (t == typeof(DateTime))
return ((DateTime)v).ToString("yyyy-MM-dd HH-mm-ss", CultureInfo.InvariantCulture);
// Try the TypeConverter // Try the TypeConverter
var conv = TypeDescriptor.GetConverter(t); var conv = TypeDescriptor.GetConverter(t);

2
OpenRA.Game/Primitives/Rectangle.cs
View File

@@ -126,7 +126,7 @@ namespace OpenRA.Primitives
public override string ToString() public override string ToString()
{ {
return string.Format("{{X={0},Y={1},Width={2},Height={3}}}", X, Y, Width, Height); return "{0},{1},{2},{3}".F(X, Y, Width, Height);
} }
} }
} }