Changeset 388 for trunk/Include/Classes/System/Text/StringBuilder.ab

Timestamp:

Nov 25, 2007, 4:31:35 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

Stringなどで例外を投げるようにした。
#147の解決。
CType ASCII文字判定関数群の追加。

File:

• trunk/Include/Classes/System/Text/StringBuilder.ab (modified) (12 diffs)

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

@@ -128 +128 @@
                 Return This
             Else
-                Throw New ArgumentNullException("StringBuilder.Append: An argument was null", "s")
+                Throw New ArgumentNullException("StringBuilder.Append: An argument is null", "s")
             End If
         ElseIf startIndex < 0 Or count < 0 Then
-            Throw New ArgumentOutOfRangeException("StringBuilder.Append: One or more arguments have out of range value.", "startIndex or count or both")
+            Throw New ArgumentOutOfRangeException("StringBuilder.Append: One or more arguments are out of range value.", "startIndex or count or both")
         End If
         appendCore(s, startIndex, count)
@@ -169 +169 @@
     Const Sub CopyTo(sourceIndex As Long, ByRef dest[] As StrChar, destIndex As Long, count As Long)
         If dest = 0 Then
-            Throw New ArgumentNullException("StringBuilder.CopyTo: An argument was null", "sourceIndex")
+            Throw New ArgumentNullException("StringBuilder.CopyTo: An argument is null", "sourceIndex")
         ElseIf size < sourceIndex + count Or sourceIndex < 0 Or destIndex < 0 Or count < 0 Then
-            Throw New ArgumentOutOfRangeException("StringBuilder.CopyTo: One or more arguments have out of range value.", "startIndex or count or both")
+            Throw New ArgumentOutOfRangeException("StringBuilder.CopyTo: One or more arguments are out of range value.", "startIndex or count or both")
         End If
 
@@ -179 +179 @@
     Function EnsureCapacity(c As Long) As Long
         If c < 0 Or c > MaxCapacity Then
-            Throw New ArgumentOutOfRangeException("StringBuilder.Append: An argument was out of range value.", "c")
+            Throw New ArgumentOutOfRangeException("StringBuilder.Append: An argument is out of range value.", "c")
         ElseIf c > Capacity Then
             Dim p = GC_malloc_atomic((c + 1) * SizeOf (StrChar)) As *StrChar
@@ -291 +291 @@
         rangeCheck(index)
         If n < 0 Then
-            Throw New ArgumentOutOfRangeException("StringBuilder.Insert: An argument was out of range value.", "n")
+            Throw New ArgumentOutOfRangeException("StringBuilder.Insert: An argument is out of range value.", "n")
         End If
         Dim len = x.Length
@@ -310 +310 @@
         rangeCheck(i)
         If x = 0 Then
-            Throw New ArgumentNullException("StringBuilder.Insert: An argument was null", "x")
+            Throw New ArgumentNullException("StringBuilder.Insert: An argument is null", "x")
         ElseIf index < 0 Or count < 0 Then
-            Throw New ArgumentOutOfRangeException("StringBuilder.Append: One or more arguments have out of range value.", "index or count or both")
+            Throw New ArgumentOutOfRangeException("StringBuilder.Append: One or more arguments are out of range value.", "index or count or both")
         End If
 
@@ -381 +381 @@
     Sub replaceCore(oldStr As String, newStr As String, start As Long, count As Long)
         If ActiveBasic.IsNothing(oldStr) Then
-            Throw New ArgumentNullException("StringBuilder.Replace: An argument was null", "oldStr")
+            Throw New ArgumentNullException("StringBuilder.Replace: An argument is null", "oldStr")
         ElseIf oldStr.Length = 0 Then
             Throw New ArgumentException("StringBuilder.Replace: The argument 'oldStr' is empty string. ", "oldStr")
@@ -428 +428 @@
     Sub Capacity(c As Long)
         If c < size Or c > MaxCapacity Then 'sizeとの比較でcが負の場合も対応
-            Throw New ArgumentOutOfRangeException("StringBuilder.Append: An argument have out of range value.", "c")
+            Throw New ArgumentOutOfRangeException("StringBuilder.Capacity: An argument is out of range value.", "c")
         End If
         EnsureCapacity(c)
@@ -435 +435 @@
     Const Function Chars(i As Long) As StrChar
         If i >= Length Or i < 0 Then
-            Throw New IndexOutOfRangeException("StringBuilder.Chars: The index argument 'i' have out of range value.")
+            Throw New IndexOutOfRangeException("StringBuilder.Chars: The index argument 'i' is out of range value.")
         End If
         Return chars[i]
@@ -442 +442 @@
     Sub Chars(i As Long, c As StrChar)
         If i >= Length Or i < 0 Then
-            Throw New ArgumentOutOfRangeException("StringBuilder.Chars: An argument have out of range value.", "i")
+            Throw New ArgumentOutOfRangeException("StringBuilder.Chars: An argument is out of range value.", "i")
         End If
         chars[i] = c
@@ -474 +474 @@
     Sub initialize(capacity As Long, maxCapacity = LONG_MAX As Long)
         If capacity < 0 Or maxCapacity < 1 Or maxCapacity < capacity Then
-            Throw New ArgumentOutOfRangeException("StringBuilder constructor: One or more arguments have out of range value.", "capacity or maxCapacity or both")
+            Throw New ArgumentOutOfRangeException("StringBuilder constructor: One or more arguments are out of range value.", "capacity or maxCapacity or both")
         End If
 
@@ -506 +506 @@
     Sub rangeCheck(index As Long)
         If index < 0 Or index > size Then
-            Throw New ArgumentOutOfRangeException("StringBuilder: Index argument has out of range value.")
+            Throw New ArgumentOutOfRangeException("StringBuilder: Index argument is out of range value.")
         End If
     End Sub
@@ -517 +517 @@
         'length < 0は判定に入っていないことに注意
         If startIndex < 0 Or count < 0 Or startIndex + count > length Then
-            Throw New ArgumentOutOfRangeException("StringBuilder: One or more arguments have out of range value.", "startIndex or count or both")
+            Throw New ArgumentOutOfRangeException("StringBuilder: One or more arguments are out of range value.", "startIndex or count or both")
         End If
     End Sub