Changeset 385 for trunk

Timestamp:

Nov 20, 2007, 12:04:07 AM (17 years ago)

Author:

イグトランス (egtra)

Message:

例外クラスの実装。ExceptionTestでSystem.Exceptionを使用するようにした。
StringBuilderでコメント化されていた例外を投げる処理を有効にした（除OutOfMemory）。
Str$の実装にSPrintfなどを使用するようにした。
毎回Object.ReferenceEquals(xxx, Nothing)と打つのが面倒なので、IsNothingを導入。

Location:

trunk

Files:

• Include/Classes/ActiveBasic/Strings/SPrintF.ab (modified) (6 diffs)
• Include/Classes/ActiveBasic/Strings/Strings.ab (modified) (2 diffs)
• Include/Classes/ActiveBasic/misc.ab (added)
• Include/Classes/System/Exception.ab (added)
• Include/Classes/System/Text/StringBuilder.ab (modified) (15 diffs)
• Include/Classes/index.ab (modified) (2 diffs)
• Include/basic/function.sbp (modified) (7 diffs)
• Include/system/string.sbp (modified) (3 diffs)
• TestCase/SimpleTestCase/ExceptionTest.ab (modified) (2 diffs)
• TestCase/SimpleTestCase/SPrintFTest.ab (modified) (1 diff)

trunk/Include/Classes/ActiveBasic/Strings/SPrintF.ab

@@ -90 +90 @@
     Zero = &h4
     '! 左揃え、-。フィールド内で左揃えにする。
-    Left = &h8
+    LeftSide = &h8
     /*! 代替表記、#。
     <ul>
@@ -867 +867 @@
         If .Length < field Then
             Dim embeddedSize = field - .Length
-            If flags And Left Then
+            If flags And LeftSide Then
                 .Append(&h20, embeddedSize)
             Else
@@ -898 +898 @@
     Dim sb = New System.Text.StringBuilder(
         x, 0, System.Math.Min(x.Length As DWord, d) As Long, field)
-    AdjustFieldWidth(sb, field, flags And Left)
+    AdjustFieldWidth(sb, field, flags And LeftSide)
     FormatString = sb.ToString()
 End Function
@@ -915 +915 @@
     Dim sb = New System.Text.StringBuilder(field + 1)
     sb.Append(x)
-    AdjustFieldWidth(sb, field, flags And Left)
+    AdjustFieldWidth(sb, field, flags And LeftSide)
     FormatCharacter = sb.ToString()
 End Function
@@ -1094 +1094 @@
                 flags Or= Sign
             Case &h2d '-
-                flags Or = Left
+                flags Or = LeftSide
             Case &h26 '&
                 flags Or= BPrefix
@@ -1122 +1122 @@
     If ReadInt(fmt, params, paramsCount, t) Then
         If t < 0 Then
-            flags Or= Left
+            flags Or= LeftSide
             fieldWidth = -t As DWord
         Else

trunk/Include/Classes/ActiveBasic/Strings/Strings.ab

@@ -95 +95 @@
     ChrCmp = ChrCmp(s1, s2, System.Math.Min(size1, size2))
     If ChrCmp = 0 Then
-        ChrCmp = ( size1 - size2 ) As Long
+        ChrCmp = (( size1 - size2 ) As LONG_PTR) As Long
     End If
 End Function
@@ -102 +102 @@
     ChrCmp = ChrCmp(s1, s2, System.Math.Min(size1, size2))
     If ChrCmp = 0 Then
-        ChrCmp = ( size1 - size2 ) As Long
+        ChrCmp = (( size1 - size2 ) As LONG_PTR) As Long
     End If
 End Function

trunk/Include/Classes/System/Text/StringBuilder.ab

@@ -120 +120 @@
 
     Function Append(s As String, startIndex As Long, count As Long) As StringBuilder
-        If s = 0 Then
-            If startIndex = 0 And count = 0 Then
-                Return This
-            Else
-                'Throw ArgumentNullException
-            End If
-        End If
-        StringBuilder.rangeCheck2(s.Length, startIndex, count)
-        appendCore(s, startIndex, count)
-        Return This
+        Return Append(StrPtr(s), startIndex, count)
     End Function
 
@@ -137 +128 @@
                 Return This
             Else
-                'Throw ArgumentNullException
+                Throw New ArgumentNullException("StringBuilder.Append: An argument was null", "s")
             End If
         ElseIf startIndex < 0 Or count < 0 Then
-            'Throw ArgumentOutOfRangeException
+            Throw New ArgumentOutOfRangeException("StringBuilder.Append: One or more arguments have out of range value.", "startIndex or count or both")
         End If
         appendCore(s, startIndex, count)
@@ -178 +169 @@
     Const Sub CopyTo(sourceIndex As Long, ByRef dest[] As StrChar, destIndex As Long, count As Long)
         If dest = 0 Then
-            'Throw ArgumentNullException
+            Throw New ArgumentNullException("StringBuilder.CopyTo: An argument was null", "sourceIndex")
         ElseIf size < sourceIndex + count Or sourceIndex < 0 Or destIndex < 0 Or count < 0 Then
-            'Throw ArgumentOutOfRangeException
+            Throw New ArgumentOutOfRangeException("StringBuilder.CopyTo: One or more arguments have out of range value.", "startIndex or count or both")
         End If
 
@@ -188 +179 @@
     Function EnsureCapacity(c As Long) As Long
         If c < 0 Or c > MaxCapacity Then
-            'Throw ArgumentOutOfRangeException
+            Throw New ArgumentOutOfRangeException("StringBuilder.Append: An argument was out of range value.", "c")
         ElseIf c > Capacity Then
             Dim p = GC_malloc_atomic((c + 1) * SizeOf (StrChar)) As *StrChar
@@ -300 +291 @@
         rangeCheck(index)
         If n < 0 Then
-            'Throw New ArgumentOutOfRangeException
-            Debug
+            Throw New ArgumentOutOfRangeException("StringBuilder.Insert: An argument was out of range value.", "n")
         End If
         Dim len = x.Length
@@ -308 +298 @@
         EnsureCapacity(newSize)
         separateBuffer()
-
-        ' TODO: fix me!（定義されていない変数iが使われています）
-        'ActiveBasic.Strings.ChrMove(VarPtr(chars[i + lenTotal]), VarPtr(chars[i]), (size - index) As SIZE_T)
 
         Dim i As Long
@@ -320 +307 @@
     End Function
 
-
     Function Insert(i As Long, x As *StrChar, index As Long, count As Long) As StringBuilder
         rangeCheck(i)
         If x = 0 Then
-            'Throw New ArgumentNullException
-            Debug
+            Throw New ArgumentNullException("StringBuilder.Insert: An argument was null", "x")
         ElseIf index < 0 Or count < 0 Then
-            'Throw New ArgumentNullException
-            Debug
+            Throw New ArgumentOutOfRangeException("StringBuilder.Append: One or more arguments have out of range value.", "index or count or both")
         End If
 
@@ -396 +380 @@
 
     Sub replaceCore(oldStr As String, newStr As String, start As Long, count As Long)
-        If Object.ReferenceEquals(oldStr, Nothing) Then
-            'Throw ArgumentNullException
-            Debug
+        If ActiveBasic.IsNothing(oldStr) Then
+            Throw New ArgumentNullException("StringBuilder.Replace: An argument was null", "oldStr")
         ElseIf oldStr.Length = 0 Then
-            'Throw ArgumentException
-            Debug
+            Throw New ArgumentException("StringBuilder.Replace: The argument 'oldStr' is empty string. ", "oldStr")
         End If
 
@@ -412 +394 @@
             End If
             
-            s.appendCore(chars, curPos, nextPos)
+            s.appendCore(chars, curPos, nextPos As Long)
             s.Append(newStr)
-            curPos += nextPos + oldStr.Length
+            curPos += nextPos As Long + oldStr.Length
         Loop
         chars = s.chars
@@ -446 +428 @@
     Sub Capacity(c As Long)
         If c < size Or c > MaxCapacity Then 'sizeとの比較でcが負の場合も対応
-            'Throw ArgumentOutOfRangeException
+            Throw New ArgumentOutOfRangeException("StringBuilder.Append: An argument have out of range value.", "c")
         End If
         EnsureCapacity(c)
@@ -453 +435 @@
     Const Function Chars(i As Long) As StrChar
         If i >= Length Or i < 0 Then
-            'Throw IndexOutOfRangeException
-            Debug
+            Throw New IndexOutOfRangeException("StringBuilder.Chars: The index argument 'i' have out of range value.")
         End If
         Return chars[i]
@@ -461 +442 @@
     Sub Chars(i As Long, c As StrChar)
         If i >= Length Or i < 0 Then
-            'Throw ArgumentOutOfRangeException
-            Debug
+            Throw New ArgumentOutOfRangeException("StringBuilder.Chars: An argument have out of range value.", "i")
         End If
         chars[i] = c
@@ -494 +474 @@
     Sub initialize(capacity As Long, maxCapacity = LONG_MAX As Long)
         If capacity < 0 Or maxCapacity < 1 Or maxCapacity < capacity Then
-            'Throw ArgumentOutOfRangeException
+            Throw New ArgumentOutOfRangeException("StringBuilder constructor: One or more arguments have out of range value.", "capacity or maxCapacity or both")
         End If
 
@@ -526 +506 @@
     Sub rangeCheck(index As Long)
         If index < 0 Or index > size Then
-            'Throw ArgumentOutOfRangeException
-            Debug
+            Throw New ArgumentOutOfRangeException("StringBuilder: Index argument has out of range value.")
         End If
     End Sub
@@ -538 +517 @@
         'length < 0は判定に入っていないことに注意
         If startIndex < 0 Or count < 0 Or startIndex + count > length Then
-            'Throw ArgumentOutOfRangeException
-            Debug
+            Throw New ArgumentOutOfRangeException("StringBuilder: One or more arguments have out of range value.", "startIndex or count or both")
         End If
     End Sub

trunk/Include/Classes/index.ab

@@ +1 @@
+#require "./ActiveBasic/misc.ab"
 #require "./ActiveBasic/Core/InterfaceInfo.ab"
 #require "./ActiveBasic/Core/TypeInfo.ab"
@@ -11 +12 @@
 #require "./System/Delegate.ab"
 #require "./System/Environment.ab"
+#require "./System/Exception.ab"
 #require "./System/GC.ab"
 #require "./System/Math.ab"

trunk/Include/basic/function.sbp

@@ -427 +427 @@
 End Function
 
-Dim _System_ecvt_buffer[16] As StrChar
-Sub _ecvt_support(count As Long)
+Sub _ecvt_support(buf As *StrChar, count As Long, size As Long)
     Dim i As Long
-    If _System_ecvt_buffer[count]=9 Then
-        _System_ecvt_buffer[count]=0
-        If count=0 Then
-            For i=16 To 1 Step -1
-                _System_ecvt_buffer[i]=_System_ecvt_buffer[i-1]
+    If buf[count] = 9 Then
+        buf[count] = 0
+        If count = 0 Then
+            For i = size To 1 Step -1
+                buf[i] = buf[i-1]
             Next
-            _System_ecvt_buffer[0]=1
+            buf[0] = 1
         Else
-            _ecvt_support(count-1)
-        End If
-    Else
-        _System_ecvt_buffer[count]++
+            _ecvt_support(buf, count-1, size)
+        End If
+    Else
+        buf[count]++
     End If
 End Sub
-Function _ecvt(value As Double, count As Long, ByRef dec As Long, ByRef sign As Long) As *StrChar
+
+Sub _ecvt(buffer As *StrChar, value As Double, count As Long, ByRef dec As Long, ByRef sign As Boolean)
     Dim i As Long, i2 As Long
-
-    _ecvt=_System_ecvt_buffer
 
     '値が0の場合
     If value = 0 Then
-        ActiveBasic.Strings.ChrFill(_System_ecvt_buffer, count As SIZE_T, &H30 As StrChar)
-        _System_ecvt_buffer[count] = 0
+        ActiveBasic.Strings.ChrFill(buffer, count As SIZE_T, &h30 As StrChar)
+        buffer[count] = 0
         dec = 0
         sign = 0
@@ -460 +458 @@
     '符号の判断（同時に符号を取り除く）
     If value < 0 Then
-        sign = 1
+        sign = True
         value = -value
     Else
-        sign = 0
+        sign = False
     End If
 
@@ -477 +475 @@
     Wend
 
-    For i=0 To count-1
-        _System_ecvt_buffer[i] = Int(value) As StrChar
-
+    For i = 0 To count - 1
+        buffer[i] = Int(value) As StrChar
         value = (value-CDbl(Int(value))) * 10
     Next
-    _System_ecvt_buffer[i] = 0
 
     i--
     If value >= 5 Then
         '切り上げ処理
-        _ecvt_support(i)
-    End If
-
-    For i=0 To ELM(count)
-        _System_ecvt_buffer[i] += &H30
+        _ecvt_support(buffer, i, count)
+    End If
+
+    For i = 0 To count - 1
+        buffer[i] += &H30
     Next
-    _System_ecvt_buffer[i] = 0
-End Function
+    buffer[i] = 0
+End Sub
 
 Function Str$(dbl As Double) As String
@@ -506 +502 @@
         End If
     End If
-    Dim dec As Long, sign As Long
-    Dim buffer[32] As StrChar, temp As *StrChar
-    Dim i As Long, i2 As Long, i3 As Long
+    Dim dec As Long, sign As Boolean
+    Dim buffer[32] As StrChar, temp[15] As StrChar
+    Dim i = 0 As Long
 
     '浮動小数点を文字列に変換
-    temp = _ecvt(dbl, 15, dec, sign)
-
-    i=0
+    _ecvt(temp, dbl, 15, dec, sign)
 
     '符号の取り付け
@@ -521 +515 @@
     End If
 
-    If dec>15 Then
-        '指数表示（桁が大きい場合）
+    If dec > 15 Or dec < -3 Then
+        '指数表示
         buffer[i] = temp[0]
         i++
@@ -529 +523 @@
         ActiveBasic.Strings.ChrCopy(VarPtr(buffer[i]), VarPtr(temp[1]), 14 As SIZE_T)
         i += 14
-        buffer[i] = Asc("e")
-        i++
-        _stprintf(VarPtr(buffer[i]), "+%03d", dec - 1) 'ToDo: __STRING_UNICODE_WINDOWS_ANSI状態への対応
-
-        Return MakeStr(buffer)
-    End If
-
-    If dec < -3 Then
-        '指数表示（桁が小さい場合）
-        buffer[i] = temp[0]
-        i++
-        buffer[i] = Asc(".")
-        i++
-        ActiveBasic.Strings.ChrCopy(VarPtr(buffer[i]), VarPtr(temp[1]), 14 As SIZE_T)
-        i+=14
-        buffer[i] = Asc("e")
-        i++
-        _stprintf(VarPtr(buffer[i]), "+%03d", dec - 1) 'ToDo: __STRING_UNICODE_WINDOWS_ANSI状態への対応
-
-        Return MakeStr(buffer)
+        buffer[i] = 0
+        Return MakeStr(buffer) + ActiveBasic.Strings.SPrintf("e%+03d", New System.Int32(dec - 1))
     End If
 
     '整数部
-    i2=dec
-    i3=0
+    Dim i2 = dec
+    Dim i3 = 0
     If i2>0 Then
         While i2>0
@@ -593 +569 @@
 End Function
 
-Function Str$(i As Int64) As String
-    If i < 0 Then
-        Return "-" & Str$(-i As QWord)
-    Else
-        Return Str$(i As QWord)
-    End If
+Function Str$(x As Int64) As String
+    Imports ActiveBasic.Strings.Detail
+    Return FormatIntegerEx(TraitsIntegerD[1], x As QWord, 1, 0, None)
 End Function
 
 Function Str$(x As QWord) As String
-    If x = 0 Then
-        Return "0"
-    End If
-
-    Dim buf[20] As StrChar
-    'buf[20] = 0
-    Dim i = 19 As Long
-    Do
-        buf[i] = (x Mod 10 + &h30) As StrChar
-        x \= 10
-        If x = 0 Then
-            Exit Do
-        End If
-        i--
-    Loop
-    Return New String(VarPtr(buf[i]), 20 - i)
+    Imports ActiveBasic.Strings.Detail
+    Return FormatIntegerEx(TraitsIntegerU[1], x, 1, 0, None)
 End Function
 
 Function Str$(x As Long) As String
-#ifdef _WIN64
-    Return Str$(x As Int64)
-#else
-    If x < 0 Then
-        Return "-" & Str$(-x As DWord)
-    Else
-        Return Str$(x As DWord)
-    End If
-#endif
+    Imports ActiveBasic.Strings.Detail
+    Return FormatIntegerEx(TraitsIntegerD[0], x, 1, 0, None)
 End Function
 
 Function Str$(x As DWord) As String
-#ifdef _WIN64
-    Return Str$(x As QWord)
-#else
-    If x = 0 Then
-        Return "0"
-    End If
-
-    Dim buf[10] As StrChar
-    buf[10] = 0
-    Dim i = 9 As Long
-    Do
-        buf[i] = (x As Int64 Mod 10 + &h30) As StrChar 'Int64への型変換は#117対策
-        x \= 10
-        If x = 0 Then
-            Return New String(VarPtr(buf[i]), 10 - i)
-        End If
-        i--
-    Loop    
-#endif
+    Imports ActiveBasic.Strings.Detail
+    Return FormatIntegerEx(TraitsIntegerU[0], x, 1, 0, None)
 End Function
 
 Function Str$(x As Word) As String
-    Return Str$(x As ULONG_PTR)
+    Return Str$(x As DWord)
 End Function
 
 Function Str$(x As Integer) As String
-    Return Str$(x As LONG_PTR)
+    Return Str$(x As Long)
 End Function
 
 Function Str$(x As Byte) As String
-    Return Str$(x As ULONG_PTR)
+    Return Str$(x As DWord)
 End Function
 
 Function Str$(x As SByte) As String
-    Return Str$(x As LONG_PTR)
+    Return Str$(x As Long)
 End Function
 

trunk/Include/system/string.sbp

@@ -9 +9 @@
 
 Function StrPtr(s As String) As *StrChar
-    StrPtr = s.StrPtr
+    If ActiveBasic.IsNothing(s) Then
+        StrPtr = s.StrPtr
+    End If
 End Function
 'StringBuilder版はClasses/System/Text/StringBuilder.abに定義されている
@@ -39 +41 @@
 Function GetStr(psz As PSTR, len As SIZE_T, ByRef wcs As PWSTR) As SIZE_T
     If psz = 0 Then Return 0
-    Dim lenWCS = MultiByteToWideChar(CP_THREAD_ACP, 0, psz, len As Long, 0, 0)
+    Dim lenWCS = MultiByteToWideChar(CP_THREAD_ACP, 0, psz, (len As DWord) As Long, 0, 0)
     wcs = _System_AllocForConvertedString(SizeOf (WCHAR) * (lenWCS + 1)) As PWSTR
-    GetStr = MultiByteToWideChar(CP_THREAD_ACP, 0, psz, len As Long, wcs, lenWCS)
+    GetStr = MultiByteToWideChar(CP_THREAD_ACP, 0, psz, (len As DWord) As Long, wcs, lenWCS)
     wcs[GetStr] = 0
 End Function
@@ -73 +75 @@
 Function GetStr(psz As PWSTR, len As SIZE_T, ByRef mbs As PSTR) As SIZE_T
     If psz = 0 Then Return 0
-    Dim lenMBS = WideCharToMultiByte(CP_THREAD_ACP, 0, psz, len As Long, 0, 0, 0, 0)
+    Dim lenMBS = WideCharToMultiByte(CP_THREAD_ACP, 0, psz, (len As DWord) As Long, 0, 0, 0, 0)
     mbs = _System_AllocForConvertedString(SizeOf (SByte) * (lenMBS + 1)) As PSTR
-    GetStr = WideCharToMultiByte(CP_THREAD_ACP, 0, psz, len As Long, mbs, lenMBS, 0, 0) As SIZE_T
+    GetStr = WideCharToMultiByte(CP_THREAD_ACP, 0, psz, (len As DWord) As Long, mbs, lenMBS, 0, 0) As SIZE_T
     mbs[GetStr] = 0
 End Function

trunk/TestCase/SimpleTestCase/ExceptionTest.ab

@@ -2 +2 @@
 
 Sub BadProc()
-    Throw New String("hello! I am bad proc.")
+    Throw New System.Exception("hello! I am bad proc.")
 End Sub
 
@@ -15 +15 @@
             resultOfTest1 = True
         End Try
-    Catch msg As String
+    Catch msg As System.Exception
         ' msgの受け渡しが未完成
-        If msg = "hello! I am bad proc." Then
+        If msg.Message = "hello! I am bad proc." Then
             resultOfTest2 = True
         End If
     Catch
         System.Diagnostics.Trace.WriteLine( "Catchが実行された。ここに来るのは正しくない" )
+        UnitTest( "到達しないコードへ到達", False)
     Finally
         resultOfTest3 = True

trunk/TestCase/SimpleTestCase/SPrintFTest.ab

@@ -140 +140 @@
     s = FormatCharacter(Asc("Y"), DWORD_MAX, 0, None)
     UnitTest(Ex"FormatCharacter(\qY\q)", s, "Y")
-    s = FormatCharacter(Asc("I"), DWORD_MAX, 3, Left)
+    s = FormatCharacter(Asc("I"), DWORD_MAX, 3, LeftSide)
     UnitTest(Ex"FormatCharacter(\qI\q, Left)", s, "I  ")
 End Sub