Changeset 682

Timestamp:

2009/02/16 16:26:24 (3 years ago)

Author:

egtra

Message:

UTF8Encodingクラスをとりあえず使える状態に。ただし、BOM出力はまだ不可能。
(#231)

Location:

trunk/ab5.0/ablib

Files:

• TestCase/SimpleTestCase/EncodingTest.ab (modified) (3 diffs)
• src/Classes/System/Exception.ab (modified) (3 diffs)
• src/Classes/System/IO/MemoryStream.ab (modified) (1 diff)
• src/Classes/System/IO/Stream.ab (modified) (1 diff)
• src/Classes/System/IO/StreamWriter.ab (modified) (3 diffs)
• src/Classes/System/Text/Encoding.ab (modified) (4 diffs)
• src/Classes/System/Text/UTF8Encoding.ab (modified) (2 diffs)

trunk/ab5.0/ablib/TestCase/SimpleTestCase/EncodingTest.ab

@@ -1 +1 @@
 Imports System.Text
 Imports System.Text.Detail
-/*
+
 Namespace EncodingTest
 
@@ -27 +27 @@
 
     Dim utf8 = New UTF8Encoding
-    Dim e = utf8.GetEncoder
-    Dim d = utf8.GetDecoder
+    Dim e = utf8.GetEncoder()
+    Dim d = utf8.GetDecoder()
     Dim b[256] As Byte
     Dim u16[256] As WCHAR
-    e.GetBytes(chars, Len(chars) \ SizeOf (WCHAR), b, Len(b), False)
-    UnitTest("UTF8 Encode", memcmp(b, utf8bytes, Len(utf8bytes)) = 0)
-    d.GetChars(utf8bytes, Len(utf8bytes), u16, Len(u16) \ SizeOf (WCHAR), False)
-    UnitTest("UTF8 Decode", memcmp(u16, chars, Len(chars)) = 0)
+    Dim len As Long
+
+    len = utf8.GetBytesCount(chars, Len(chars) \ SizeOf(WCHAR))
+    UnitTest("UTF-8 GetByteCount", len = Len(utf8bytes))
+    utf8.GetBytes(chars, Len(chars) \ SizeOf (WCHAR), b, Len(b))
+    UnitTest("UTF-8 Encode", memcmp(b, utf8bytes, Len(utf8bytes)) = 0)
+
+    len = utf8.GetCharsCount(utf8bytes, Len(utf8bytes))
+    UnitTest("UTF-8 GetCharCount", len = Len(chars) \ SizeOf(WCHAR))
+    utf8.GetChars(utf8bytes, Len(utf8bytes), u16, Len(u16) \ SizeOf (WCHAR))
+    UnitTest("UTF-8 Decode", memcmp(u16, chars, Len(chars)) = 0)
 End Sub
 
@@ -40 +47 @@
 
 EncodingTest.TestMain()
-*/
+

trunk/ab5.0/ablib/src/Classes/System/Exception.ab

@@ -14 +14 @@
 Const AB_E_PLATFORMNOTSUPPORTED = &h80041539 '80131539
 Const AB_E_KEYNOTFOUND = &h80041577 '80131577
+Const AB_E_ARITHMETIC = &h80040216 '80070216
+Const AB_E_OVERFLOW = &h80041516 '80131516
 
 End Namespace
@@ -38 +40 @@
 MulticastNotSupportedException
 NullReferenceException
-OverflowException
 RankException
 StackOverflowException
@@ -712 +713 @@
 End Class
 
+/*!
+@brief  算術演算例外
+@author Egtra
+@date   2009/02/16
+*/
+Class ArithmeticException
+    Inherits SystemException
+Public
+    /*!
+    @biref  コンストラクタ
+    */
+    Sub ArithmeticException()
+        SystemException("ArithmeticException", Nothing)
+        HResult = ActiveBasic.AB_E_ARITHMETIC
+    End Sub
+    /*!
+    @biref  コンストラクタ
+    @param[in] message  エラーメッセージ
+    */
+    Sub ArithmeticException(message As String)
+        SystemException(message, Nothing)
+        HResult = ActiveBasic.AB_E_ARITHMETIC
+    End Sub
+    /*!
+    @biref  コンストラクタ
+    @param[in] message  エラーメッセージ
+    @param[in] innerException   内部例外
+    */
+    Sub ArithmeticException(message As String, innerException As Exception)
+        SystemException(message, innerException)
+        HResult = ActiveBasic.AB_E_ARITHMETIC
+    End Sub
+End Class
+
+/*!
+@brief  オーバーフロー例外
+@author Egtra
+@date   2009/02/16
+*/
+Class OverflowException
+    Inherits ArithmeticException
+Public
+    /*!
+    @biref  コンストラクタ
+    */
+    Sub OverflowException()
+        ArithmeticException("OverflowException", Nothing)
+        HResult = ActiveBasic.AB_E_OVERFLOW
+    End Sub
+    /*!
+    @biref  コンストラクタ
+    @param[in] message  エラーメッセージ
+    */
+    Sub OverflowException(message As String)
+        ArithmeticException(message, Nothing)
+        HResult = ActiveBasic.AB_E_OVERFLOW
+    End Sub
+    /*!
+    @biref  コンストラクタ
+    @param[in] message  エラーメッセージ
+    @param[in] innerException   内部例外
+    */
+    Sub OverflowException(message As String, innerException As Exception)
+        ArithmeticException(message, innerException)
+        HResult = ActiveBasic.AB_E_OVERFLOW
+    End Sub
+End Class
 
 End Namespace

trunk/ab5.0/ablib/src/Classes/System/IO/MemoryStream.ab

@@ -339 +339 @@
     End Function*/
 
+    Function ToPointer() As VoidPtr
+        ToPointer = pointer
+    End Function
+
     /*!
     @brief  ストリームの内容全体をまるごと別のストリームに書き込みます。

trunk/ab5.0/ablib/src/Classes/System/IO/Stream.ab

@@ -155 +155 @@
 End Class
 
+/*!
+@brief 書き込みバイト数を記憶するヌルストリーム
+Encoding関連で使用
+@date 2009/02/16
+@auther Egtra
+*/
+Class WriteCountingNullStream
+    Inherits NullStream
+Public
+    Sub WriteCountingNullStream()
+        writeCount = 0
+    End Sub
+
+    Override Sub Write(buffer As *Byte, offset As Long, count As Long)
+        If count < 0 Then
+            Throw New ArgumentOutOfRangeException("count")
+        End If
+        writeCount += count
+    End Sub
+
+    Override Sub WriteByte(b As Byte)
+        writeCount++
+    End Sub
+
+    /*!
+    @brief 書き込まれたバイト数を返す。
+    */
+    Function WriteCount() As Long
+        WriteCount = writeCount
+    End Function
+
+Private
+    writeCount As Long
+End Class
+
 End Namespace
 

trunk/ab5.0/ablib/src/Classes/System/IO/StreamWriter.ab

@@ -20 +20 @@
     */
     Sub StreamWriter(path As String)
-        init(New FileStream(path, FileMode.Create, FileAccess.Write, FileShare.None))
+        init(New FileStream(path, FileMode.Create, FileAccess.Write, FileShare.None), Nothing)
     End Sub
 
@@ -28 +28 @@
     */
     Sub StreamWriter(stream As Stream)
-        init(stream)
+        init(stream, Nothing)
+    End Sub
+
+    /*
+    @date 2009/02/16
+    @auther Egtra
+    */
+    Sub StreamWriter(stream As Stream, encoding As Text.Encoding)
+        init(stream, encoding)
     End Sub
 
@@ -83 +91 @@
 
 Private
-    Sub init(stream As Stream)
+    Sub init(stream As Stream, e As Text.Encoding)
         s = stream
         buf = New Text.StringBuilder(4096)
-        '暫定。正式版ではUTF-8を標準とする。
-        encoder = New Text.Detail.WindowsCodePageEncoder(CP_ACP)
+        If ActiveBasic.IsNothing(e) Then
+            '暫定。正式版ではUTF-8を標準とする。
+            encoder = New Text.Detail.WindowsCodePageEncoder(CP_ACP)
+        Else
+            encoder = e.GetEncoder()
+        End If
     End Sub
 

trunk/ab5.0/ablib/src/Classes/System/Text/Encoding.ab

@@ -74 +74 @@
     @date   2007/12/08
     */
-    Abstract Function GetBytesCountCore(src As *WCHAR, srcCount As Long) As Long
+    Virtual Function GetBytesCountCore(src As *WCHAR, srcCount As Long) As Long
+        Dim s = New IO.Detail.WriteCountingNullStream
+        GetEncoder().Encode(src, srcCount, s, True)
+        GetBytesCountCore = s.WriteCount
+        If GetBytesCountCore < 0 Then
+            Throw New OverflowException
+        End If
+    End Function
 Public
     /*!
@@ -110 +117 @@
     @date   2007/12/08
     */
-    Abstract Function GetBytesCore(src As *WCHAR, srcCount As Long, dst As *Byte, dstCount As Long) As Long
+    Virtual Function GetBytesCore(src As *WCHAR, srcCount As Long, dst As *Byte, dstCount As Long) As Long
+        Dim s = New IO.MemoryStream
+        GetEncoder().Encode(src, srcCount, s, True)
+        Dim size = s.Position()
+        If size > (dstCount As QWord) Then
+            Throw New ArgumentException("dstCount")
+        End If
+        GetBytesCore = size As Long
+        memcpy(dst, s.ToPointer(), size As SIZE_T)
+    End Function
 Public
     /*!
@@ -136 +152 @@
     @date   2007/12/08
     */
-    Abstract Function GetCharsCountCore(src As *Byte, srcCount As Long) As Long
+    Virtual Function GetCharsCountCore(src As *Byte, srcCount As Long) As Long
+        Dim s = New IO.MemoryStream(src, srcCount)
+        Dim l = New Collections.Generic.List<WCHAR>
+        GetDecoder().Decode(l, s)
+        GetCharsCountCore = l.Count
+    End Function
 Public
     /*!
@@ -172 +193 @@
     @date   2007/12/08
     */
-    Abstract Function GetCharsCore(src As *Byte, srcCount As Long, dst As *WCHAR, dstCount As Long) As Long
+    Virtual Function GetCharsCore(src As *Byte, srcCount As Long, dst As *WCHAR, dstCount As Long) As Long
+        Dim s = New IO.MemoryStream(src, srcCount)
+        Dim l = New Collections.Generic.List<WCHAR>
+        GetDecoder().Decode(l, s)
+        If l.Count > dstCount Then
+            Throw New ArgumentException("dstCount")
+        End If
+        Dim p As *WCHAR
+        p = l
+        memcpy(dst, p, (l.Count As SIZE_T) * 2)
+    End Function
 Public
 #ifdef UNICODE

trunk/ab5.0/ablib/src/Classes/System/Text/UTF8Encoding.ab

@@ -111 +111 @@
                             dst.Add((&hDC00 Or (buffer And &h3FF)) As WCHAR)
                         Else
-                            '最短形式でないもの、4バイト形式で10FFFFを超えるコードポイントのもの
+                            '最短形式でないもの、または4バイト形式で10FFFFを超えるコードポイントのもの
                             dst.Add(&hfffd As WCHAR)
                         End If
@@ -196 +196 @@
     End Function
 */
-Protected
-    Override Function GetBytesCountCore(src As *WCHAR, srcCount As Long) As Long
-    End Function
-
-    Override Function GetBytesCore(src As *WCHAR, srcCount As Long, dst As *Byte, dstCount As Long) As Long
-    End Function
-
-    Override Function GetCharsCountCore(src As *Byte, srcCount As Long) As Long
-    End Function
-
-    Override Function GetCharsCore(src As *Byte, srcCount As Long, dst As *WCHAR, dstCount As Long) As Long
-    End Function
 
 Private