Changeset 391 for trunk/Include/basic

Timestamp:

Dec 7, 2007, 12:21:58 AM (16 years ago)

Author:

イグトランス (egtra)

Message:

FileStream非同期読み書きの修正、例外処理の追加。

Location:

trunk/Include/basic

Files:

• command.sbp (modified) (5 diffs)
• dos_console.sbp (modified) (1 diff)

trunk/Include/basic/command.sbp

@@ -158 +158 @@
     
     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 buffer = New System.Text.StringBuilder(256)
     Dim temp[1] As StrChar
     Dim dwAccessBytes As DWord
@@ -167 +166 @@
         '次のデータをサーチ
         Do
-            i2=ReadFile(_System_hFile[FileNumber],temp,SizeOf (StrChar),VarPtr(dwAccessBytes),ByVal 0)
-            If i2=0 or dwAccessBytes=0 Then
+            Dim ret = ReadFile(_System_hFile[FileNumber],temp,SizeOf (StrChar),VarPtr(dwAccessBytes),ByVal 0)
+            If ret=0 or dwAccessBytes=0 Then
                 'error
                 Exit Macro
@@ -176 +175 @@
 
         '読み込み
-        i3=-1
         IsStr=0
         While 1
-            i3++
-
-            i2=ReadFile(_System_hFile[FileNumber],temp,SizeOf (StrChar),VarPtr(dwAccessBytes),ByVal 0)
-            If i2=0 or (i3=0 and dwAccessBytes=0) Then
+            Dim ret = ReadFile(_System_hFile[FileNumber],temp,SizeOf (StrChar),VarPtr(dwAccessBytes),ByVal 0)
+            If ret = 0 or dwAccessBytes = 0 Then
                 'error
                 Exit Macro
@@ -188 +184 @@
             If temp[0]=34 Then IsStr=IsStr xor 1
 
-            buffer[i3]=temp[0]
+            buffer.Append(temp[0])
             If dwAccessBytes=0 or temp[0]=0 or temp[0]=13 or temp[0]=10 or (IsStr=0 and temp[0]=Asc(",")) or (IsStr=0 and (temp[0]=32 or temp[0]=9) and _System_InputDataType[i]<>_System_Type_String) Then
                 If temp[0]=13 Then
@@ -210 +206 @@
                 End If
 
-                buffer[i3]=0
+                buffer.Append(0 As StrChar)
                 Exit While
             End If

trunk/Include/basic/dos_console.sbp

@@ -40 +40 @@
             Goto *InputReStart
         End If
-        _System_Input_SetArgument(_System_InputDataPtr[i], _System_InputDataType[i], broken[i].ToString)
+        _System_Input_SetArgument(_System_InputDataPtr[i], _System_InputDataType[i], broken[i])
     Next