Changeset 272 for Include/basic/command.sbp

Timestamp:

Jun 12, 2007, 7:24:38 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

StringBuilderを追加。String不変へ。共通の文字列操作関数をActiveBasic.Strings内に配置（設計に検討の余地あり）。

File:

• Include/basic/command.sbp (modified) (9 diffs)

Include/basic/command.sbp

@@ -163 +163 @@
 Dim _System_InputDataType[_System_MAX_PARMSNUM] As DWord
 Sub INPUT_FromFile(FileNumber As Long)
-    Dim i As Long ,i2 As Long, i3 As Long
-    Dim buffer As String
+    FileNumber--
+    
+    Dim i = 0 As Long
+    Dim i2 As Long, i3 As Long
+    Dim buffer = New System.Text.StringBuilder(GetFileSize(_System_hFile[FileNumber], 0) + 1)
     Dim temp[1] As StrChar
     Dim dwAccessBytes As DWord
     Dim IsStr As Long
 
-    FileNumber--
-
-    buffer=ZeroString(GetFileSize(_System_hFile[FileNumber],0) + 1)
-
-    i=0
     While 1
         '次のデータをサーチ
@@ -226 +224 @@
 
         'データを変数に格納
-        _System_Input_SetArgument(_System_InputDataPtr[i], _System_InputDataType[i], buffer, i3)
+        _System_Input_SetArgument(_System_InputDataPtr[i], _System_InputDataType[i], buffer.ToString)
 
 
@@ -234 +232 @@
 End Sub
 
-Sub _System_Input_SetArgument(arg As VoidPtr, dataType As DWord, ByRef buf As String, bufLen As Long)
+Sub _System_Input_SetArgument(arg As VoidPtr, dataType As DWord, buf As String)
     Select Case dataType
         Case _System_Type_Double
@@ -253 +251 @@
             Dim pTempStr As *String
             pTempStr = arg As *String
-            pTempStr->ReSize(bufLen)
-            memcpy(pTempStr->Chars, buf.Chars, SizeOf (StrChar) * pTempStr->Length)
-            pTempStr->Chars[pTempStr->Length] = 0
+            pTempStr[0] = buf
     End Select
 End Sub
@@ -269 +265 @@
 Dim _System_UsingStrData[_System_MAX_PARMSNUM] As *Char     'TODO: 暫定対応（動作未確認）
 Dim _System_UsingDataType[_System_MAX_PARMSNUM] As DWord
+/*
 Function _System_GetUsingFormat(UsingStr As String) As String
     Dim i2 As Long, i3 As Long, i4 As Long, i5 As Long, ParmNum As Long
     Dim temporary[255] As StrChar
-    Dim buffer As String
-
-    buffer = ZeroString(1024)
+    Dim buffer = New System.Text.StringBuilder(1024)
 
     ParmNum = 0
@@ -334 +329 @@
             If length_buf>=length_num Then
                 '通常時
-                _System_FillChar(VarPtr(buffer.Chars[i3]), length_buf - length_num, &h20) 'Asc(" ")
+                ActiveBasic.Strings.Detail.ChrFill(VarPtr(buffer.Chars[i3]), length_buf - length_num, &h20) 'Asc(" ")
 
                 i3 += length_buf - length_num
@@ -354 +349 @@
             Else
                 '表示桁が足りないとき
-                _System_FillChar(VarPtr(buffer.Chars[i3]), length_buf, &h23) 'Asc("#")
+                ActiveBasic.Strings.Detail.ChrFill(VarPtr(buffer.Chars[i3]), length_buf, &h23) 'Asc("#")
                 i3 += length_buf
             End If
@@ -395 +390 @@
                     i5=i4
                 Else
-                    _System_FillChar(VarPtr(buffer.Chars[i3]), i4, &h20) 'Asc(" ")
+                    ActiveBasic.Strings.Detail.ChrFill(VarPtr(buffer.Chars[i3]), i4, &h20) 'Asc(" ")
                 End If
                 memcpy(VarPtr(buffer.Chars[i3]), _System_UsingStrData[ParmNum], SizeOf (StrChar) * i5)
@@ -411 +406 @@
     Wend
 
-    _System_GetUsingFormat = Left$(buffer, lstrlen(buffer))
+    _System_GetUsingFormat = buffer.ToString(0, lstrlen(StrBPtr(buffer)))
 End Function
+*/
 Sub PRINTUSING_ToFile(FileNumber As Long, UsingStr As String)
     Dim dwAccessByte As DWord