Changeset 497 for trunk/Include/Classes/System/Text

Timestamp:

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

Author:

イグトランス (egtra)

Message:

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

Location:

trunk/Include/Classes/System/Text

Files:

• DecoderFallback.ab (modified) (3 diffs)
• Encoding.ab (modified) (4 diffs)
• StringBuilder.ab (modified) (4 diffs)

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

@@ -77 +77 @@
         len = length
     End Sub
-#ifndef __STRING_IS_NOT_UNICODE
+#ifdef UNICODE
     /*!
     @brief  指定された文字列でDecoderReplacementFallbackを構築する。
@@ -124 +124 @@
     End Function
 
-#ifndef __STRING_IS_NOT_UNICODE
+#ifdef UNICODE
     /*!
     @brief  代替文字列を返す
@@ -167 +167 @@
         End If
     End Sub
-#ifndef __STRING_IS_NOT_UNICODE
+#ifdef UNICODE
     /*!
     @brief  指定された文字列でDecoderReplacementFallbackを構築する。

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

@@ -1 @@
-#define __STRING_IS_NOT_UNICODE 'なぜか認識されないので
-
 /*!
 @file   Classes/System/Text/Encoding.ab
@@ -52 +50 @@
         Return GetBytesCountCore(s, n)
     End Function
-#ifndef __STRING_IS_NOT_UNICODE
+#ifdef UNICODE
     /*!
     @brief  符号化して得られる文字列の長さを計算する。
@@ -141 +139 @@
         Return GetBytesCore(VarPtr(chars[index]), count, bytes, byteCount)
     End Function
-#ifndef __STRING_IS_NOT_UNICODE
+#ifdef UNICODE
     /*!
     @brief  符号化する。
@@ -289 +287 @@
     Abstract Function GetCharsCore(bytes As *Byte, byteCount As Long, chars As *WCHAR, charCount As Long) As Long
 Public
-#ifndef __STRING_IS_NOT_UNICODE
+#ifdef UNICODE
     /*!
     @brief  復号し、Stringで結果を返す。

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

@@ -1 +1 @@
 'Classes/System/Text/StringBuilder.ab
-
-#require <Classes/ActiveBasic/Strings/Strings.ab>
 
 Namespace System
@@ -7 +5 @@
 
 Class StringBuilder
-    'Inherits ISerializable
 Public
     Sub StringBuilder()
@@ -196 +193 @@
 
     Override Function GetHashCode() As Long
-#ifdef __STRING_IS_NOT_UNICODE
+#ifdef UNICODE
+        Dim n = size
+#else
         Dim n = (size + 1) >> 1
-#else
-        Dim n = size
 #endif
         Return _System_GetHashFromWordArray(chars As *Word, n As SIZE_T) Xor capacity Xor maxCapacity
@@ -214 +211 @@
         Return This
     End Function
-#ifdef __STRING_IS_NOT_UNICODE
+#ifdef UNICODE
+    Function Insert(i As Long, x As SByte) As StringBuilder
+        rangeCheck(i)
+        insertCore(i, Str$(x As Long))
+        Return This
+    End Function
+#else
     Function Insert(i As Long, x As Word) As StringBuilder
         rangeCheck(i)
         insertCore(i, Str$(x As DWord))
-        Return This
-    End Function
-#else
-    Function Insert(i As Long, x As SByte) As StringBuilder
-        rangeCheck(i)
-        insertCore(i, Str$(x As Long))
         Return This
     End Function