Changeset 383 for trunk/Include/Classes/System

Timestamp:

Nov 17, 2007, 9:34:36 AM (17 years ago)

Author:

イグトランス (egtra)

Message:

SPrintf関数の実装

Location:

trunk/Include/Classes/System

Files:

• String.ab (modified) (3 diffs)
• Text/StringBuilder.ab (modified) (1 diff)

trunk/Include/Classes/System/String.ab

@@ -6 +6 @@
 
 #ifdef __STRING_IS_NOT_ALWAYS_UNICODE
+
+#ifndef UNICODE
 TypeDef StrChar = Char
-#ifndef UNICODE
 #define __STRING_IS_NOT_UNICODE
 #endif
+
+#endif
+
+#ifndef __STRING_IS_NOT_UNICODE
+TypeDef StrChar = WCHAR
+
+#ifdef UNICODE
+#define __STRING_IS_UNICODE
 #else
-TypeDef StrChar = WCHAR
-#ifndef UNICODE
 #define __STRING_UNICODE_WINDOWS_ANSI
 #endif
@@ -77 +84 @@
             Assign(initStr + start, length)
         End Sub
-        
+
         Sub String(initStr As String)
             If Not String.IsNullOrEmpty(initStr) Then
@@ -592 +599 @@
             End If
         End Sub
-        
+
         Const Sub rangeCheck(start As Long, length As Long)
             If start < 0 Or start > This.m_Length Or length < 0 Then

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

@@ -520 +520 @@
         If Not String.IsNullOrEmpty(s) Then
             s.CopyTo(startIndex, chars, 0, length)
-            size = s.Length
+            size = length
         End If
     End Sub