Changeset 468 for trunk/Include/Classes/System/IO

Timestamp:

Mar 9, 2008, 12:00:01 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

TextWriter, StreamWriterの追加。
SPrintfの浮動小数点数変換で、NaN, Infiniteの出力に対応。
PathとDirectoryInfoのCreateDirectoryで、対象が既に存在するときには例外を投げないように修正。
SimpleTestCase内で使用する一時フォルダの場所にGetTempPathで取得する版を追加（コメントアウト）。

Location:

trunk/Include/Classes/System/IO

Files:

• DirectoryInfo.ab (modified) (1 diff)
• Path.ab (modified) (4 diffs)
• Stream.ab (modified) (3 diffs)
• StreamWriter.ab (modified) (1 diff)
• TextReader.ab (modified) (1 diff)
• TextWriter.ab (added)

trunk/Include/Classes/System/IO/DirectoryInfo.ab

@@ -59 +59 @@
             Select Case error
                 Case ERROR_ALREADY_EXISTS
-                    Throw New IOException("DirectoryInfo.CreateDirectory: The directory has already existed.")
+                    Exit Sub 'ディレクトリが既に存在するときは、何もしない。
                 Case Else
                     Throw New IOException("DirectoryInfo.CreateDirectory: Failed to CreateDirectory")

trunk/Include/Classes/System/IO/Path.ab

@@ -88 +88 @@
     */
     Static Function GetFullPath(path As String) As String
-        Return Combine(System.Environment.CurrentDirectory, path)
+        If IsPathRooted(path) Then
+            Return path
+        Else
+            Return Combine(System.Environment.CurrentDirectory, path)
+        End If
     End Function
 
@@ -172 +176 @@
     Static Function GetTempPath() As String
         Dim size = WIN32API_GetTempPath(0, 0)
-        Dim p = GC_malloc_atomic(SizeOf (TCHAR) * size) As PCTSTR
-        Dim len = WIN32API_GetTempPath(size, p)
+        Dim buf = New Text.StringBuilder(size)
+        buf.Length = size
+        Dim len = WIN32API_GetTempPath(size, StrPtr(buf))
         If (len > size) or len = 0 Then
             Throw New IOException("Path.GetTempPath: Failed to GetTempPath.")
         Else
-            Return New String(p, len As Long)
+            buf.Length = len
+            Return buf.ToString
         End If
     End Function
@@ -209 +215 @@
     Static Const ExtensionSeparatorChar = &H2E As StrChar
     Static Const InvalidPathChars = Ex"\q<>|\0\t" As String
-    Static Const UniformNamingConventionString = Ex"\\\\" As String
+    Static Const UniformNamingConventionString = "\\" As String
 
     '----------------------------------------------------------------
@@ -227 +233 @@
         Dim i As Long
         For i = 0 To ELM(InvalidPathChars.Length)
-            If path.Contains(InvalidPathChars.Substring(i, 1)) Then
+            If path.Contains(InvalidPathChars[i]) Then
                 Throw New IOException("Path.CheckPath: The path contains invalidPathChars.")
             End If

trunk/Include/Classes/System/IO/Stream.ab

@@ -7 +7 @@
 
 Public 'Protected
-    Sub Stream():   End Sub
+    Sub Stream()
+    End Sub
 Public
     Virtual Sub ~Stream()
@@ -54 +55 @@
         Dispose(True)
     End Sub
-    Virtual Function EndRead(ByRef asyncResult As System.IAsyncResult) As Long: End Function
-    Virtual Sub EndWrite(ByRef asyncResult As System.IAsyncResult): End Sub
+    Virtual Function EndRead(ByRef asyncResult As System.IAsyncResult) As Long
+    End Function
+    Virtual Sub EndWrite(ByRef asyncResult As System.IAsyncResult)
+    End Sub
     Abstract Sub Flush()
     Abstract Function Read(buffer As *Byte, offset As Long, count As Long) As Long
@@ -72 +75 @@
     Abstract Sub SetLength(value As Int64)
     Abstract Sub Write(buffer As *Byte, offset As Long, count As Long)
-
     Virtual Sub WriteByte(b As Byte)
         Write(VarPtr(b), 0, 1)

trunk/Include/Classes/System/IO/StreamWriter.ab

@@ -4 +4 @@
     
 Class StreamWriter
-    ' TODO: 実装
+    Inherits TextWriter
+Public
+    /*
+    @date 2008/02/25
+    @auther Egtra
+    */
+    Sub StreamWriter(path As String)
+        init(New FileStream(path, FileMode.Create, FileAccess.Write, FileShare.None))
+    End Sub
+
+    /*
+    @date 2008/02/25
+    @auther Egtra
+    */
+    Sub StreamWriter(stream As Stream)
+        init(stream)
+    End Sub
+
+    Override Sub Write(str As String)
+        buf.Append(str)
+        Dim len = buf.Length
+        If len >= 2048 Then
+            s.Write(StrPtr(buf) As *Byte, 0, len)
+            buf.Length = 0
+        End If
+    End Sub
+
+    Override Sub Write(x As Boolean)
+        buf.Append(x)
+    End Sub
+    
+    Override Sub Write(x As Char)
+        buf.Append(x)
+    End Sub
+
+    Override Sub Write(x As Byte)
+        buf.Append(x)
+    End Sub
+#ifdef UNICODE
+    Override Sub Write(x As SByte)
+        buf.Append(x)
+    End Sub
+#else
+    Override Sub Write(x As Word)
+        buf.Append(x)
+    End Sub
+#endif
+    Override Sub Write(x As Integer)
+        buf.Append(x)
+    End Sub
+
+    Override Sub Write(x As DWord)
+        buf.Append(x)
+    End Sub
+
+    Override Sub Write(x As Long)
+        buf.Append(x)
+    End Sub
+
+    Override Sub Write(x As QWord)
+        buf.Append(x)
+    End Sub
+
+    Override Sub Write(x As Int64)
+        buf.Append(x)
+    End Sub
+
+    Override Sub Write(x As Single)
+        buf.Append(x)
+    End Sub
+
+    Override Sub Write(x As Double)
+        buf.Append(x)
+    End Sub
+
+    Override Sub Write(x As Object)
+        Write(x.ToString)
+    End Sub
+
+Protected
+    Override Sub Dispose(disposing As Boolean)
+        If disposing Then
+            s.Dispose()
+        End If
+    End Sub
+
+Private
+    Sub init(stream As Stream)
+        s = stream
+        buf = New System.Text.StringBuilder(4096)
+    End Sub
+
+    buf As Text.StringBuilder
+    s As System.IO.Stream
 End Class
 

trunk/Include/Classes/System/IO/TextReader.ab

@@ -101 +101 @@
 
 Protected
-    Abstract Sub Dispose(disposing As Boolean)
+    Virtual Sub Dispose(disposing As Boolean)
+    End Sub
 
     /*