Changeset 621 for trunk

Timestamp:

2008/09/02 02:22:49 (4 years ago)

Author:

egtra

Message:

GC_mallocがNULLを返さなくなったことへの対応

File:

• trunk/ab5.0/ablib/src/Classes/System/String.ab (modified) (10 diffs)

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

@@ -61 +61 @@
 
         Sub String(initStr As String)
-            If Not String.IsNullOrEmpty(initStr) Then
+            If Not IsNullOrEmpty(initStr) Then
                 Assign(initStr.Chars, initStr.m_Length)
             End If
@@ -234 +234 @@
         Function CompareTo(y As Object) As Long
             If Not Object.Equals(This.GetType(), y.GetType()) Then
-                Throw New ArgumentException("String.CompareTo: The type of the argument y is not String.", "y")
+                Throw New ArgumentException("String.CompareTo: y is not String.", "y")
             End If
             Return CompareTo(y As String)
@@ -260 +260 @@
 #ifdef UNICODE
             Dim textLengthW = MultiByteToWideChar(CP_THREAD_ACP, 0, text, textLengthA, 0, 0)
-            If AllocStringBuffer(textLengthW) <> 0 Then
-                MultiByteToWideChar(CP_THREAD_ACP, 0, text, textLengthA, Chars, textLengthW)
-                Chars[textLengthW] = 0
-            End If
+            AllocStringBuffer(textLengthW)
+            MultiByteToWideChar(CP_THREAD_ACP, 0, text, textLengthA, Chars, textLengthW)
+            Chars[textLengthW] = 0
 #else
             AssignFromCharPtr(text, textLengthA)
@@ -274 +273 @@
 #else
             Dim textLengthA = WideCharToMultiByte(CP_THREAD_ACP, 0, text, textLengthW, 0, 0, 0, 0)
-            If AllocStringBuffer(textLengthA) <> 0 Then
-                WideCharToMultiByte(CP_THREAD_ACP, 0, text, textLengthW, Chars, textLengthA, 0, 0)
-                Chars[textLengthA] = 0
-            End If
+            AllocStringBuffer(textLengthA)
+            WideCharToMultiByte(CP_THREAD_ACP, 0, text, textLengthW, Chars, textLengthA, 0, 0)
+            Chars[textLengthA] = 0
 #endif
         End Sub
@@ -323 +321 @@
 
         Static Function Concat(x As String, y As String) As String
-            If String.IsNullOrEmpty(x) Then
+            If IsNullOrEmpty(x) Then
                 Return y
             Else
@@ -359 +357 @@
 
         Const Function Contains(s As String) As Boolean
-            If Object.ReferenceEquals(s, Nothing) Then
+            If ActiveBasic.IsNothing(s) Then
                 Throw New ArgumentNullException("String.Contains: An argument is null value.", "s")
             ElseIf s = "" Then
@@ -399 +397 @@
         Const Function IndexOf(s As String, startIndex As Long, count As Long) As Long
             rangeCheck(startIndex, count)
-            If Object.ReferenceEquals(s, Nothing) Then
+            If ActiveBasic.IsNothing(s) Then
                 Throw New ArgumentNullException("String.IndexOf: An argument is out of range value.", "s")
             End If
@@ -458 +456 @@
 
         Const Function LastIndexOf(s As String, start As Long, count As Long) As Long
-            If Object.ReferenceEquals(s, Nothing) Then
+            If ActiveBasic.IsNothing(s) Then
                 Throw New ArgumentNullException("String.LastIndexOf: An argument is out of range value.", "s")
             End If
@@ -684 +682 @@
         End Function
     Private
-        Function AllocStringBuffer(textLength As Long) As *Char
+        Sub AllocStringBuffer(textLength As Long)
             If textLength < 0 Then
-                Return 0
-            End If
-            AllocStringBuffer = GC_malloc_atomic(SizeOf(Char) * (textLength + 1))
-            If AllocStringBuffer = 0 Then
-                'Throw New OutOfMemoryException
-            End If
+                Throw New ArgumentException
+            End If
+            Chars = GC_malloc_atomic(SizeOf(Char) * (textLength + 1))
             m_Length = textLength
-            Chars = AllocStringBuffer
-        End Function
+        End Sub
 
         Sub AssignFromCharPtr(text As *Char, textLength As Long)
@@ -704 +698 @@
         Const Sub rangeCheck(index As Long)
             If index < 0 Or index > m_Length Then
-                Throw New ArgumentOutOfRangeException("String: An arguments is out of range value.", "index")
+                Throw New ArgumentOutOfRangeException("String: An argument is out of range value.", "index")
             End If
         End Sub