Changeset 426 for trunk/Include/Classes/System/String.ab

Timestamp:

Feb 26, 2008, 3:33:49 AM (18 years ago)

Author:

イグトランス (egtra)

Message:

StreamReaderの実装開始。
Stringの+演算子で右辺がNullのときに起こるアクセス違反を回避。

File:

• trunk/Include/Classes/System/String.ab (modified) (2 diffs)

trunk/Include/Classes/System/String.ab

@@ -117 +117 @@
 
         Const Function Operator + (y As PCSTR) As String
-            Return Concat(y, lstrlenA(y))
+            If y = 0 Then
+                Return This
+            Else
+                Return Concat(y, lstrlenA(y))
+            End If
         End Function
 
         Const Function Operator + (y As PCWSTR) As String
-            Return Concat(y, lstrlenW(y))
+            If y = 0 Then
+                Return This
+            Else
+                Return Concat(y, lstrlenW(y))
+            End If
         End Function
 
         Const Function Operator + (y As String) As String
-            Return Concat(y.Chars, y.m_Length)
+            If ActiveBasic.IsNothing(y) Then
+                Return This
+            Else
+                Return Concat(y.Chars, y.m_Length)
+            End If
         End Function
 
@@ -133 +145 @@
 
         Const Function Operator & (y As PCWSTR) As String
-            Dim tempString = This + y
-            Return tempString
+            Return This + y
         End Function
 
         Const Function Operator & (y As String) As String
-            Dim tempString = This + y
-            Return tempString
+            Return This + y
         End Function