Changeset 385 for trunk/Include/Classes/System

Timestamp:

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

Author:

イグトランス (egtra)

Message:

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

Location:

trunk/Include/Classes/System

Files:

• Exception.ab (added)
• Text/StringBuilder.ab (modified) (15 diffs)

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