Changeset 272 for Include/basic/dos_console.sbp

Timestamp:

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

Author:

イグトランス (egtra)

Message:

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

File:

• Include/basic/dos_console.sbp (modified) (4 diffs)

Include/basic/dos_console.sbp

@@ -8 +8 @@
 
 #include <api_console.sbp>
+#include <Classes/ActiveBasic/Strings/Strings.ab>
 
 Dim _System_hConsoleOut = GetStdHandle(STD_OUTPUT_HANDLE)
@@ -17 +18 @@
 '---------------------------------------------
 Sub INPUT_FromPrompt(ShowStr As String)
-    Dim i As Long, i2 As Long, i3 As Long
-    Dim buf As String
     Dim InputBuf[1023] As TCHAR
     Dim dwAccessBytes As DWord
@@ -30 +29 @@
     If InputBuf[dwAccessBytes-2] = &h0d And InputBuf[dwAccessBytes-1] = &h0a Then
         InputBuf[dwAccessBytes-2] = 0
+        dwAccessBytes -= 2
     End If
-    Dim InputStr As String(InputBuf)
+
+    If dwAccessBytes = 0 Then Goto *InputReStart
 
     'データを変数に格納
-    i=0
-    i2=0
-    buf.ReSize(lstrlen(InputStr) + 1, 0)
-    Dim comma As Char
-    comma = &h2c 'Asc(",")
-    While 1
-        i3=0
-        While 1
-            If InputStr[i2]=comma Then
-                buf[i3]=0
-                Exit While
-            End If
-
-            buf[i3]=InputStr[i2]
-
-            If InputStr[i2]=0 Then Exit While
-
-            i2++
-            i3++
-        Wend
-
-        _System_Input_SetArgument(_System_InputDataPtr[i], _System_InputDataType[i], buf, i3)
-
-        i++
-        If _System_InputDataPtr[i]=0 And InputStr[i2]=comma Then
+    Const comma = &h2c As StrChar 'Asc(",")
+    Dim broken = ActiveBasic.Strings.Detail.Split(New String(InputBuf, dwAccessBytes As Long), comma)
+    Dim i As Long
+    For i = 0 To ELM(broken.Count)
+        If _System_InputDataPtr[i] = 0 Then
             PRINT_ToPrompt(Ex"入力データの個数が多すぎます\r\n")
             Goto *InputReStart
-        ElseIf InputStr[i2]=0 Then
-            If _System_InputDataPtr[i]<>0 Then
-                PRINT_ToPrompt(Ex"入力データの個数が足りません\r\n")
-                Goto *InputReStart
-            Else
-                Exit While
-            End If
         End If
+        _System_Input_SetArgument(_System_InputDataPtr[i], _System_InputDataType[i], broken[i].ToString)
+    Next
 
-        i2++
-    Wend
+    If _System_InputDataPtr[i]<>0 Then
+        PRINT_ToPrompt(Ex"入力データの個数が足りません\r\n")
+        Goto *InputReStart
+    End If
 End Sub
 
@@ -90 +68 @@
     _System_free(pszOut)
 #else
-    WriteConsole(_System_hConsoleOut, buf.Chars, buf.Length, dwAccessBytes, 0)
+    WriteConsole(_System_hConsoleOut, buf.StrPtr, buf.Length, dwAccessBytes, 0)
 #endif
 End Sub