Reuse new VSS's file output stream.

Author: godunko

source/backend/streams.adb

@@ -15,7 +15,7 @@
 -- of the license.                                                          --
 ------------------------------------------------------------------------------
 
-with VSS.Stream_Element_Vectors.Conversions;
+with VSS.Strings.Conversions;
 
 package body Streams is
 
@@ -25,7 +25,8 @@ package body Streams is
 
    procedure Close (Self : in out Output_Text_Stream'Class) is
    begin
-      GNATCOLL.VFS.Close (Self.Writable);
+      VSS.Text_Streams.File_Output.File_Output_Text_Stream
+        (Self).Close;
    end Close;
 
    ----------
@@ -36,28 +37,9 @@ package body Streams is
      (Self : in out Output_Text_Stream'Class;
       File : GNATCOLL.VFS.Virtual_File) is
    begin
-      Self.Encoder.Initialize ("utf-8");
-      Self.Writable := File.Write_File;
+      Self.Create
+        (VSS.Strings.Conversions.To_Virtual_String (File.Display_Full_Name),
+         "utf-8");
    end Open;
 
-   ---------
-   -- Put --
-   ---------
-
-   overriding procedure Put
-     (Self    : in out Output_Text_Stream;
-      Item    : VSS.Characters.Virtual_Character;
-      Success : in out Boolean)
-   is
-      pragma Unreferenced (Success);
-
-      Data : constant String :=
-        VSS.Stream_Element_Vectors.Conversions.Unchecked_To_String
-          (Self.Encoder.Encode (Item));
-
-   begin
-      GNATCOLL.VFS.Write (Self.Writable, Data);
-      --  Note, any errors are reported at the time of file close only.
-   end Put;
-
 end Streams;

source/backend/streams.ads

@@ -17,9 +17,8 @@
 
 with GNATCOLL.VFS;
 
-private with VSS.Characters;
-private with VSS.Strings.Converters.Encoders;
 with VSS.Text_Streams;
+private with VSS.Text_Streams.File_Output;
 
 package Streams is
 
@@ -35,14 +34,7 @@ package Streams is
 private
 
    type Output_Text_Stream is
-     limited new VSS.Text_Streams.Output_Text_Stream with record
-      Encoder  : VSS.Strings.Converters.Encoders.Virtual_String_Encoder;
-      Writable : GNATCOLL.VFS.Writable_File;
-   end record;
-
-   overriding procedure Put
-     (Self    : in out Output_Text_Stream;
-      Item    : VSS.Characters.Virtual_Character;
-      Success : in out Boolean);
+     limited new VSS.Text_Streams.File_Output.File_Output_Text_Stream with
+       null record;
 
 end Streams;