Changeset 676 for trunk/ab5.0/ablib/src/Classes/System/Console.ab

Timestamp:

Jan 13, 2009, 2:01:38 AM (16 years ago)

Author:

イグトランス (egtra)

Message:

#231に関連して、エンコーディング周りを見直し、Encoder/Decoderをストリーム用に特化。
UTF8Encodingをコンパイル可能にし、ビルドに含めるようにした。ただし、実装が不完全なためテストは不可。
(#231)

File:

• trunk/ab5.0/ablib/src/Classes/System/Console.ab (modified) (8 diffs)

trunk/ab5.0/ablib/src/Classes/System/Console.ab

@@ -272 +272 @@
         End If
         Console.err = newErr
-        Dim sw = Console.err As IO.StreamWriter
-        Dim fs = sw.BaseStream() As IO.FileStream
-        Console.hconsoleerr = fs.Handle()
+'       Dim sw = Console.err As IO.StreamWriter
+'       Dim fs = sw.BaseStream() As IO.FileStream
+'       Console.hconsoleerr = fs.Handle()
     End Sub
 
@@ -296 +296 @@
         End If
         Console.out = newOut
-        Dim sw = Console.out As IO.StreamWriter
-        Dim fs = sw.BaseStream() As IO.FileStream
-        Console.hconsoleout = fs.Handle()
     End Sub
 
@@ -441 +438 @@
         End If
         Console.in = newIn
-        Dim sr = Console.in As IO.StreamReader
-        Dim fs = sr.BaseStream() As IO.FileStream
-        Console.hconsolein = fs.Handle()
     End Sub
 
@@ -503 +497 @@
     */
     Static Sub OpenStandardError()
-        Console.SetError(System.IO.TextWriter.Synchronized(New System.IO.StreamWriter(New System.IO.FileStream(GetStdHandle(STD_ERROR_HANDLE), System.IO.FileAccess.Write, False))))
+        Dim w = New Detail.ConsoleWriter(hconsoleerr)
+        Console.SetOut(System.IO.TextWriter.Synchronized(w))
     End Sub
 
@@ -512 +507 @@
     */
     Static Sub OpenStandardInput()
-        Console.SetIn(System.IO.TextReader.Synchronized(New System.IO.StreamReader(New System.IO.FileStream(GetStdHandle(STD_INPUT_HANDLE), System.IO.FileAccess.Read, False))))
+        Dim w = New Detail.ConsoleReader(hconsolein)
+        Console.SetIn(System.IO.TextReader.Synchronized(w))
     End Sub
 
@@ -521 +517 @@
     */
     Static Sub OpenStandardOutput()
-        Console.SetOut(System.IO.TextWriter.Synchronized(New System.IO.StreamWriter(New System.IO.FileStream(GetStdHandle(STD_OUTPUT_HANDLE), System.IO.FileAccess.Write, False))))
+        Dim w = New Detail.ConsoleWriter(hconsoleout)
+        Console.SetOut(System.IO.TextWriter.Synchronized(w))
         Console.defBC = This.ConsoleColorToTextAttribute(Console.BackgroundColor)
         Console.defFC = This.ConsoleColorToTextAttribute(Console.ForegroundColor)
@@ -654 +651 @@
     End Sub
 
-    Static hconsoleerr = NULL As HANDLE
-    Static hconsolein = NULL As HANDLE
-    Static hconsoleout = NULL As HANDLE
+    Static hconsoleerr = GetStdHandle(STD_ERROR_HANDLE) As HANDLE
+    Static hconsolein = GetStdHandle(STD_INPUT_HANDLE) As HANDLE
+    Static hconsoleout = GetStdHandle(STD_OUTPUT_HANDLE) As HANDLE
     Static in = Nothing As IO.TextReader
     Static out = Nothing As IO.TextWriter
@@ -665 +662 @@
 End Class
 
+Namespace Detail
+
+Class ConsoleWriter
+    Inherits IO.TextWriter
+Public
+    Sub ConsoleWriter(hOut As HANDLE)
+        h = hOut
+    End Sub
+
+    Override Sub Flush()
+        Dim b = Buffer
+        Dim written As DWord
+        WriteConsole(h, StrPtr(b), b.Length As DWord, written, 0)
+        b.Remove(0, written As Long)
+    End Sub
+
+Private
+    h As HANDLE
+End Class
+
+Class ConsoleReader
+    Inherits IO.TextReader
+Public
+    Sub ConsoleReader(hIn As HANDLE)
+        h = hIn
+    End Sub
+
+Protected
+    Override Function Underflow() As Boolean
+        Dim b = Buffer
+        Dim currentBufLength = b.Length
+        b.Length = currentBufLength + 256
+        Dim p = StrPtr(b)
+        Dim read As DWord
+        If ReadConsole(h, VarPtr(p[currentBufLength]), 256, read, 0) = 0 Then
+            IO.Detail.ThrowWinLastErrorIOException()
+        End If
+        b.Length = currentBufLength + read
+    End Function
+
+Private
+    h As HANDLE
+End Class
+
+End Namespace 'Detail
+
 End Namespace 'System