チェンジセット 1688 (default)

日時:

2024/09/11 19:31:46 (4週前)

更新者:

hizuya@…

ログメッセージ:

• 16進数を表す文字列をバイト配列に変換する機能を追加。

場所:

framework/trunk

ファイル:

• CoreLibrary/Properties/Resources.designer.cs (更新) (1個の差分)
• CoreLibrary/Properties/Resources.resx (更新) (1個の差分)
• CoreLibrary/Sources/Text/TextUtility.cs (更新) (1個の差分)
• CoreTest/Sources/Text/TextUtilityTest.cs (更新) (1個の差分)

framework/trunk/CoreLibrary/Properties/Resources.designer.cs

@@ -611 +611 @@
         
         /// <summary>
+        ///   Improperly formatted hex string. に類似しているローカライズされた文字列を検索します。
+        /// </summary>
+        internal static string Argument_InvalidHexFormat {
+            get {
+                return ResourceManager.GetString("Argument_InvalidHexFormat", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Invalid key and value pair. に類似しているローカライズされた文字列を検索します。
         /// </summary>

framework/trunk/CoreLibrary/Properties/Resources.resx

@@ -205 +205 @@
     <value>Attempted to seek beyond range of stream.</value>
   </data>
+  <data name="Argument_InvalidHexFormat" xml:space="preserve">
+    <value>Improperly formatted hex string.</value>
+  </data>
   <data name="Log_Data_CommonDbDebugging_CommandSourceKey" xml:space="preserve">
     <value>Source</value>

framework/trunk/CoreLibrary/Sources/Text/TextUtility.cs

@@ -768 +768 @@
 
             ConvertToHexStringImpl(bytes, index, count, toLowerCase, builder);
+        }
+
+        /// <summary>
+        /// 16進数を表す文字を <see cref="int"/> に変換して返します。
+        /// </summary>
+        /// <param name="hexChar">16進数を表す文字。</param>
+        /// <returns>
+        /// <paramref name="hexChar"/> を表す数値。
+        /// <paramref name="hexChar"/> が16進数を表す文字以外の場合は <c>-1</c>。
+        /// </returns>
+        public static int ConvertHexToInt32(char hexChar)
+        {
+            if (('0' <= hexChar) && (hexChar <= '9'))
+            {
+                return hexChar - '0';
+            }
+
+            if (('a' <= hexChar) && (hexChar <= 'f'))
+            {
+                return (hexChar - 'a') + 10;
+            }
+
+            if (('A' <= hexChar) && (hexChar <= 'F'))
+            {
+                return (hexChar - 'A') + 10;
+            }
+
+            return -1;
+        }
+
+        /// <summary>
+        /// 16進数を表す文字列を <see cref="byte"/> の配列に変換して返します。
+        /// </summary>
+        /// <param name="data">
+        /// 16進数を表す文字列。
+        /// 先頭に <c>0x</c> が付いている場合はその部分は無視されます。
+        /// </param>
+        /// <returns>
+        /// <paramref name="data"/> を元にした <see cref="byte"/> の配列。
+        /// </returns>
+        /// <exception cref="ArgumentNullException">
+        /// <paramref name="data"/> が <see langword="null"/> 参照です。
+        /// </exception>
+        /// <exception cref="ArgumentException">
+        /// <paramref name="data"/> が16進数を表す文字列として正しく有りません。
+        /// </exception>
+        public static byte[] ConvertHexToBinary(string data)
+        {
+            if (data == null)
+            {
+                throw new ArgumentNullException("data");
+            }
+
+            int length = data.Length;
+            if (length % 2 != 0)
+            {
+                throw new ArgumentException(Resources.Argument_InvalidHexFormat);
+            }
+
+            int offset = length >= 2 && data[0] == '0' && data[1] == 'x' ? 2 : 0;
+
+            byte[] buffer = new byte[(length - offset) / 2];
+            for (int i = 0; i < buffer.Length; i++)
+            {
+                int highValue = ConvertHexToInt32(data[(2 * i) + offset]);
+                int lowValue = ConvertHexToInt32(data[(2 * i) + offset + 1]);
+                if (highValue == -1 || lowValue == -1)
+                {
+                    throw new ArgumentException(Resources.Argument_InvalidHexFormat);
+                }
+
+                buffer[i] = (byte)((highValue << 4) | lowValue);
+            }
+
+            return buffer;
         }
 

framework/trunk/CoreTest/Sources/Text/TextUtilityTest.cs

@@ -254 +254 @@
         {
             return TextUtility.GlobToRegex(glob).ToString();
+        }
+
+        /// <summary>
+        /// <see cref="TextUtility.ConvertHexToInt32"/> をテストします。
+        /// </summary>
+        /// <param name="hexChar">16進数を表す文字。</param>
+        /// <returns>
+        /// <see cref="TextUtility.ConvertHexToInt32"/> の戻り値。
+        /// </returns>
+        [Test]
+        [TestCase(' ', ExpectedResult = -1)]
+        [TestCase('/', ExpectedResult = -1)]
+        [TestCase('0', ExpectedResult = 0x0)]
+        [TestCase('1', ExpectedResult = 0x1)]
+        [TestCase('2', ExpectedResult = 0x2)]
+        [TestCase('3', ExpectedResult = 0x3)]
+        [TestCase('4', ExpectedResult = 0x4)]
+        [TestCase('5', ExpectedResult = 0x5)]
+        [TestCase('6', ExpectedResult = 0x6)]
+        [TestCase('7', ExpectedResult = 0x7)]
+        [TestCase('8', ExpectedResult = 0x8)]
+        [TestCase('9', ExpectedResult = 0x9)]
+        [TestCase(':', ExpectedResult = -1)]
+        [TestCase('@', ExpectedResult = -1)]
+        [TestCase('A', ExpectedResult = 0xA)]
+        [TestCase('B', ExpectedResult = 0xB)]
+        [TestCase('C', ExpectedResult = 0xC)]
+        [TestCase('D', ExpectedResult = 0xD)]
+        [TestCase('E', ExpectedResult = 0xE)]
+        [TestCase('F', ExpectedResult = 0xF)]
+        [TestCase('G', ExpectedResult = -1)]
+        [TestCase('`', ExpectedResult = -1)]
+        [TestCase('a', ExpectedResult = 0xA)]
+        [TestCase('b', ExpectedResult = 0xB)]
+        [TestCase('c', ExpectedResult = 0xC)]
+        [TestCase('d', ExpectedResult = 0xD)]
+        [TestCase('e', ExpectedResult = 0xE)]
+        [TestCase('f', ExpectedResult = 0xF)]
+        [TestCase('g', ExpectedResult = -1)]
+        public int TestConvertHexToInt32(char hexChar)
+        {
+            return TextUtility.ConvertHexToInt32(hexChar);
+        }
+
+        /// <summary>
+        /// <see cref="TextUtility.ConvertHexToBinary"/> をテストします。
+        /// </summary>
+        /// <param name="data">16進数を表す文字列。</param>
+        [Test]
+        [TestCase("")]
+        [TestCase("00")]
+        [TestCase("FF")]
+        [TestCase("00ff00FF")]
+        [TestCase("0100FEff")]
+        [TestCase("0123456789ABcdEf")]
+        public void TestConvertHexToBinary(string data)
+        {
+            byte[] result = TextUtility.ConvertHexToBinary(data);
+            Assert.That(result, Is.Not.Null, "ConvertHexToBinary");
+            string hex = TextUtility.ConvertToHexString(result, false);
+            Assert.That(hex, Is.EqualTo(data.ToUpperInvariant()), "HEX");
+        }
+
+        /// <summary>
+        /// 先頭に <c>0x</c> の付いた16進数を表す文字列を元に
+        /// <see cref="TextUtility.ConvertHexToBinary"/> をテストします。
+        /// </summary>
+        /// <param name="data">16進数を表す文字列。</param>
+        [Test]
+        [TestCase("0x")]
+        [TestCase("0x00")]
+        [TestCase("0xFF")]
+        [TestCase("0x00ff00FF")]
+        [TestCase("0x0100FEff")]
+        [TestCase("0x0123456789ABcdEf")]
+        public void TestConvertHexToBinaryWithPrefix(string data)
+        {
+            byte[] result = TextUtility.ConvertHexToBinary(data);
+            Assert.That(result, Is.Not.Null, "ConvertHexToBinary");
+            string hex = TextUtility.ConvertToHexString(result, false);
+            Assert.That(hex, Is.EqualTo(data.Substring(2).ToUpperInvariant()), "HEX");
+        }
+
+        /// <summary>
+        /// 16進数を表す文字列として正しくない文字列を元に
+        /// <see cref="TextUtility.ConvertHexToBinary"/> をテストします。
+        /// </summary>
+        /// <param name="data">16進数を表す文字列。</param>
+        [Test]
+        [TestCase("0")]
+        [TestCase("012")]
+        [TestCase("G0")]
+        [TestCase("00GG00")]
+        public void TestConvertHexToBinaryWithError(string data)
+        {
+            Assert.That(
+                delegate
+                {
+                    TextUtility.ConvertHexToBinary(data);
+                },
+                Throws.ArgumentException);
         }