added H2.Slim and Slim_Stream.

renamed Stream to Wide_Stream.
This commit is contained in:
2014-03-26 14:28:41 +00:00
parent 3c5c0a547d
commit cb9505272a
12 changed files with 235 additions and 41 deletions

View File

@ -1,30 +1,33 @@
with H2.Scheme;
with H2.Wide;
with H2.Slim;
with H2.Pool;
with Storage;
with Stream;
with Slim_Stream;
with Wide_Stream;
with Ada.Text_IO;
with Ada.Unchecked_Deallocation;
procedure scheme is
--package S renames H2.Scheme;
--package S is new H2.Scheme (Wide_Character, Wide_String);
package S renames Stream.S;
--package Stream renames Wide_Stream;
--package Scheme renames H2.Wide.Scheme;
package Stream renames Slim_Stream;
package Scheme renames H2.Slim.Scheme;
Pool: aliased Storage.Global_Pool;
SI: S.Interpreter_Record;
SI: Scheme.Interpreter_Record;
I: S.Object_Pointer;
O: S.Object_Pointer;
I: Scheme.Object_Pointer;
O: Scheme.Object_Pointer;
--String: aliased S.Object_String := "(car '(1 2 3))";
String: aliased constant S.Object_Character_Array := "((lambda (x y) (+ x y)) 9 7)";
String: aliased constant Scheme.Object_Character_Array := "((lambda (x y) (+ x y)) 9 7)";
String_Stream: Stream.String_Input_Stream_Record (String'Unchecked_Access);
--String_Stream: Stream.String_Input_Stream_Record := (Len => String'Length, Str => String, Pos => 0);
--File_Name: aliased S.Object_Character_Array := "test.adb";
File_Name: aliased constant S.Object_Character_Array := "test.scm";
File_Name: aliased constant Scheme.Object_Character_Array := "test.scm";
--File_Stream: Stream.File_Stream_Record (File_Name'Unchecked_Access);
--File_Stream: Stream.File_Stream_Record := (Name => File_Name'Unchecked_Access);
File_Stream: Stream.File_Stream_Record;
@ -35,33 +38,32 @@ procedure scheme is
begin
--h2init;
Ada.Text_Io.Put_Line (S.Object_Word'Image(S.Object_Pointer_Bytes));
S.Open (SI, 2_000_000, Pool'Unchecked_Access);
--S.Open (SI, null);
Scheme.Open (SI, 2_000_000, Pool'Unchecked_Access);
--Scheme.Open (SI, null);
-- Specify the named stream handler
S.Set_Option (SI, (S.Stream_Option,
Scheme.Set_Option (SI, (Scheme.Stream_Option,
Stream.Allocate_Stream'Access,
Stream.Deallocate_Stream'Access)
);
S.Set_Option (SI, (S.Trait_Option, S.No_Optimization));
Scheme.Set_Option (SI, (Scheme.Trait_Option, Scheme.No_Optimization));
File_Stream.Name := File_Name'Unchecked_Access;
begin
S.Set_Input_Stream (SI, File_Stream); -- specify main input stream
--S.Set_Input_Stream (SI, String_Stream);
Scheme.Set_Input_Stream (SI, File_Stream); -- specify main input stream
--Schee.Set_Input_Stream (SI, String_Stream);
exception
when others =>
Ada.Text_IO.Put_Line ("Cannot open Input Stream");
end;
--S.Set_Output_Stream (SI, Stream); -- specify main output stream.
--Scheme.Set_Output_Stream (SI, Stream); -- specify main output stream.
Ada.Text_IO.Put_Line ("-------------------------------------------");
S.Run_Loop (SI, I);
S.Print (SI, I);
S.Close (SI);
Scheme.Run_Loop (SI, I);
Scheme.Print (SI, I);
Scheme.Close (SI);
Ada.Text_IO.Put_Line ("BYE...");