From 573aa2848a2fba1602571ab9211e95fb269e3bed Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Tue, 4 Apr 2023 11:38:46 -0400 Subject: [PATCH] Add enum decoration, fix attributes for skippers --- SabreTools.Skippers/Enums.cs | 17 ++++++++++++++++- SabreTools.Skippers/SkipperTest.cs | 10 +++++----- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/SabreTools.Skippers/Enums.cs b/SabreTools.Skippers/Enums.cs index ab4ae5d6..1d102c18 100644 --- a/SabreTools.Skippers/Enums.cs +++ b/SabreTools.Skippers/Enums.cs @@ -1,4 +1,6 @@ -namespace SabreTools.Skippers +using System.Xml.Serialization; + +namespace SabreTools.Skippers { /// /// Determines the header skip operation @@ -6,9 +8,17 @@ public enum HeaderSkipOperation { None = 0, + + [XmlEnum("bitswap")] Bitswap, + + [XmlEnum("byteswap")] Byteswap, + + [XmlEnum("wordswap")] Wordswap, + + [XmlEnum("wordbyteswap")] WordByteswap, } @@ -17,8 +27,13 @@ /// public enum HeaderSkipTestFileOperator { + [XmlEnum("equal")] Equal = 0, + + [XmlEnum("less")] Less, + + [XmlEnum("greater")] Greater, } } diff --git a/SabreTools.Skippers/SkipperTest.cs b/SabreTools.Skippers/SkipperTest.cs index 25fa472e..dec415ba 100644 --- a/SabreTools.Skippers/SkipperTest.cs +++ b/SabreTools.Skippers/SkipperTest.cs @@ -95,7 +95,7 @@ namespace SabreTools.Skippers /// /// Skipper test using AND /// - [XmlRoot("and")] + [XmlType("and")] public class AndSkipperTest : SkipperTest { /// @@ -140,7 +140,7 @@ namespace SabreTools.Skippers /// /// Skipper test using DATA /// - [XmlRoot("data")] + [XmlType("data")] public class DataSkipperTest : SkipperTest { /// @@ -177,7 +177,7 @@ namespace SabreTools.Skippers /// /// Skipper test using FILE /// - [XmlRoot("file")] + [XmlType("file")] public class FileSkipperTest : SkipperTest { /// @@ -214,7 +214,7 @@ namespace SabreTools.Skippers /// /// Skipper test using OR /// - [XmlRoot("or")] + [XmlType("or")] public class OrSkipperTest : SkipperTest { /// @@ -259,7 +259,7 @@ namespace SabreTools.Skippers /// /// Skipper test using XOR /// - [XmlRoot("xor")] + [XmlType("xor")] public class XorSkipperTest : SkipperTest { ///