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

Timestamp:

Mar 28, 2008, 5:43:34 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

インクルードガードとその他不要な前処理定義などの削除

File:

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

trunk/Include/Classes/System/String.ab

@@ -1 +1 @@
 ' Classes/System/String.ab
-
-#require <basic/function.sbp>
-#require <Classes/System/Text/StringBuilder.ab>
-#require <Classes/ActiveBasic/Strings/Strings.ab>
-
-TypeDef StrChar = Char
-
-#ifdef UNICODE
-#define __STRING_IS_UNICODE
-#else
-#define __STRING_IS_NOT_UNICODE
-#endif
 
 Namespace System
@@ -270 +258 @@
 
         Sub Assign(text As PCSTR, textLengthA As Long)
-#ifdef __STRING_IS_NOT_UNICODE
-            AssignFromCharPtr(text, textLengthA)
-#else
+#ifdef UNICODE
             Dim textLengthW = MultiByteToWideChar(CP_THREAD_ACP, 0, text, textLengthA, 0, 0)
             If AllocStringBuffer(textLengthW) <> 0 Then
@@ -278 +264 @@
                 Chars[textLengthW] = 0
             End If
+#else
+            AssignFromCharPtr(text, textLengthA)
 #endif
         End Sub
 
         Sub Assign(text As PCWSTR, textLengthW As Long)
-#ifdef __STRING_IS_NOT_UNICODE
+#ifdef UNICODE
+            AssignFromCharPtr(text, textLengthW)
+#else
             Dim textLengthA = WideCharToMultiByte(CP_THREAD_ACP, 0, text, textLengthW, 0, 0, 0, 0)
             If AllocStringBuffer(textLengthA) <> 0 Then
@@ -288 +278 @@
                 Chars[textLengthA] = 0
             End If
-#else
-            AssignFromCharPtr(text, textLengthW)
 #endif
         End Sub
@@ -305 +293 @@
     Public
         Const Function Concat(text As PCSTR, len As Long) As String
-#ifdef __STRING_IS_NOT_UNICODE
-            Return ConcatChar(This.Chars, m_Length, text, len)
-#else
+#ifdef UNICODE
             With Concat
                 Dim lenW = MultiByteToWideChar(CP_THREAD_ACP, 0, text, len, 0, 0)
@@ -316 +302 @@
                 .Chars[m_Length + lenW] = 0
             End With
+#else
+            Return ConcatChar(This.Chars, m_Length, text, len)
 #endif
         End Function
 
         Const Function Concat(text As PCWSTR, len As Long) As String
-#ifdef __STRING_IS_NOT_UNICODE
+#ifdef UNICODE
+            Return ConcatChar(This.Chars, m_Length, text, len)
+#else
             With Concat
                 Concat = New String
@@ -329 +319 @@
                 .Chars[m_Length + lenA] = 0
             End With
-#else
-            Return ConcatChar(This.Chars, m_Length, text, len)
 #endif
         End Function
@@ -600 +588 @@
 
         Override Function GetHashCode() As Long
-#ifdef __STRING_IS_NOT_UNICODE
+#ifdef UNICODE
+            Dim size = m_Length
+#else
             Dim size = (m_Length + 1) >> 1
-#else
-            Dim size = m_Length
 #endif
             Return _System_GetHashFromWordArray(Chars As *Word, size) Xor m_Length