Changeset 386 for trunk/Include/Classes/ActiveBasic/Strings

Timestamp:

Nov 23, 2007, 11:39:44 AM (17 years ago)

Author:

dai

Message:

StrPtr内の判定ミスを修正。
SPrintFクラス内のx64に対するコードを修正。
ArrayListクラスのIListインターフェイス実装を一旦保留。
ListクラスにIEnumeratable、IEnumeratorインターフェイスを実装（まだ実装中…）。

File:

• trunk/Include/Classes/ActiveBasic/Strings/SPrintF.ab (modified) (12 diffs)

trunk/Include/Classes/ActiveBasic/Strings/SPrintF.ab

@@ -1205 +1205 @@
 */
 Function SPrintf(format As String, params As *Object, n As SIZE_T) As String
-    Dim i = 0 As DWord
+    Dim i = 0 As SIZE_T
     Dim paramsCount = 0 As SIZE_T
     Dim fmt = StrPtr(format)
@@ -1211 +1211 @@
     Do
         Dim last = format.Length - (((fmt - StrPtr(format)) \ SizeOf (StrChar)) As LONG_PTR) As Long 'po
-        Dim pos = ActiveBasic.Strings.ChrFind(fmt, last, &h25 As StrChar) '&h25 = %
+        Dim pos = ActiveBasic.Strings.ChrFind(fmt, last, &h25 As StrChar) As Long '&h25 = %
         If pos = -1 Then
             s.Append(fmt, 0, last)
@@ -1270 +1270 @@
                 s.Append(FormatString(params[i] As String, precision, fieldWidth, flags))
             Case &h63 'c
-                s.Append(FormatCharacter(params[i] As BoxedStrChar, precision, fieldWidth, flags))
+                s.Append(FormatCharacter(params[i] As BoxedStrChar, precision, fieldWidth, flags) As Char)
 '           Case &h6e 'n
             Case &h25 '%
@@ -1299 +1299 @@
     param4 As Object, param5 As Object, param6 As Object,
     param7 As Object, param8 As Object, param9 As Object) As String
-#ifdef _WIN64
-    'コンパイラがどういうコードを吐くのかわからないので、安全策を取る。
-    Dim params[9] = [param0, param1, param2, param3, param4,
-        param5, param6, param7, param8, param9] As Object
-#else
+
     Dim params = VarPtr(param0) As *Object
-#endif
+
     SPrintf = ActiveBasic.Strings.Detail.SPrintf(format, params, 10)
 End Function
@@ -1321 +1317 @@
     param4 As Object, param5 As Object, param6 As Object,
     param7 As Object, param8 As Object) As String
-#ifdef _WIN64
-    Dim params[8] = [param0, param1, param2, param3, param4,
-        param5, param6, param7, param8] As Object
-#else
+
     Dim params = VarPtr(param0) As *Object
-#endif
+
     SPrintf = ActiveBasic.Strings.Detail.SPrintf(format, params, 9)
 End Function
@@ -1342 +1335 @@
     param4 As Object, param5 As Object, param6 As Object,
     param7 As Object) As String
-#ifdef _WIN64
-    Dim params[7] = [param0, param1, param2, param3, param4,
-        param5, param6, param7] As Object
-#else
+
     Dim params = VarPtr(param0) As *Object
-#endif
+
     SPrintf = ActiveBasic.Strings.Detail.SPrintf(format, params, 8)
 End Function
@@ -1362 +1352 @@
     param1 As Object, param2 As Object, param3 As Object,
     param4 As Object, param5 As Object, param6 As Object) As String
-#ifdef _WIN64
-    Dim params[6] = [param0, param1, param2, param3, param4,
-        param5, param6] As Object
-#else
+
     Dim params = VarPtr(param0) As *Object
-#endif
+
     SPrintf = ActiveBasic.Strings.Detail.SPrintf(format, params, 7)
 End Function
@@ -1382 +1369 @@
     param1 As Object, param2 As Object, param3 As Object,
     param4 As Object, param5 As Object) As String
-#ifdef _WIN64
-    Dim params[5] = [param0, param1, param2, param3, param4,
-        param5] As Object
-#else
+
     Dim params = VarPtr(param0) As *Object
-#endif
+
     SPrintf = ActiveBasic.Strings.Detail.SPrintf(format, params, 6)
 End Function
@@ -1402 +1386 @@
     param1 As Object, param2 As Object, param3 As Object,
     param4 As Object) As String
-#ifdef _WIN64
-    Dim params[4] = [param0, param1, param2, param3, param4] As Object
-#else
+
     Dim params = VarPtr(param0) As *Object
-#endif
+
     SPrintf = ActiveBasic.Strings.Detail.SPrintf(format, params, 5)
 End Function
@@ -1420 +1402 @@
 Function SPrintf(format As String, param0 As Object,
     param1 As Object, param2 As Object, param3 As Object) As String
-#ifdef _WIN64
-    Dim params[3] = [param0, param1, param2, param3] As Object
-#else
+
     Dim params = VarPtr(param0) As *Object
-#endif
+
     SPrintf = ActiveBasic.Strings.Detail.SPrintf(format, params, 4)
 End Function
@@ -1438 +1418 @@
 Function SPrintf(format As String, param0 As Object,
     param1 As Object, param2 As Object) As String
-#ifdef _WIN64
-    Dim params[2] = [param0, param1, param2] As Object
-#else
+
     Dim params = VarPtr(param0) As *Object
-#endif
+
     SPrintf = ActiveBasic.Strings.Detail.SPrintf(format, params, 3)
 End Function
@@ -1456 +1434 @@
 Function SPrintf(format As String, param0 As Object,
     param1 As Object) As String
-#ifdef _WIN64
-    Dim params[1] = [param0, param1] As Object
-#else
+
     Dim params = VarPtr(param0) As *Object
-#endif
+
     SPrintf = ActiveBasic.Strings.Detail.SPrintf(format, params, 2)
 End Function