JVM: Реализованы переменные-процедуры в генераторе

[dsw-obn.git] / src / test.c

diff --git a/src/test.c b/src/test.c
index 1c3c8e39347533eb9db1d0b2e289f0348f77b693..18417ba34fa6241d16ae44c53733960a57e2be91 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -7,40 +7,43 @@
 static char source_test[] =
        "(* Main module *)"
        "MODULE Test;"
-       "IMPORT Out;"
-       "TYPE Ar = ARRAY OF ARRAY OF INTEGER;"
-       "VAR a : POINTER TO Ar;"
+       "TYPE"
+       "  P = PROCEDURE;"
+       "  F = PROCEDURE (x : INTEGER) : INTEGER;"
        ""
-       "PROCEDURE Ax(VAR x : POINTER TO Ar);"
+       "VAR"
+       "  p : P;"
+       "  f : F;"
+       "  i : INTEGER;"
+       ""
+       "PROCEDURE Pow(x : INTEGER) : INTEGER;"
        "BEGIN"
-       "  x[0, 0] := 777;"
-       "END Ax;"
+       "  RETURN x * x;"
+       "END Pow;"
        ""
-       "BEGIN;"
-       "  NEW(a, 2, 2);"
-       "  a[0, 0] := 666;"
-       "  Out.Open;"
-       "  Out.Int(a[0, 0], 0);"
-       "  Out.Ln;"
+       "PROCEDURE Do;"
+       "END Do;"
        ""
-       "  Ax(a);"
-//     "  Out.Int(a[0, 0], 0);"
-//     "  Out.Ln;"
+       "BEGIN;"
+       "  p := Do;"
+       "  f := Pow;"
+       "  i := f(7);"
+       "  p;"
        "END Test."
 ;
 
 static char source_out[] =
        "MODULE Out;"
-       "(* Interface to outer program ;) *)"
-       "VAR"
-       "  Open-     : PROCEDURE;"
+//     "(* Interface to outer program ;) *)"
+//     "VAR"
+//     "  Open-     : PROCEDURE;"
 //     "  Char-     : PROCEDURE(ch : CHAR);"
 //     "  String-   : PROCEDURE(str : ARRAY OF CHAR)"
 //     "  Int-      : PROCEDURE(i, n : LONGINT);"
-       "  Int-      : PROCEDURE(i, n : INTEGER);"
-       "  Real-     : PROCEDURE(x : REAL; n : INTEGER);"
+//     "  Int-      : PROCEDURE(i, n : INTEGER);"
+//     "  Real-     : PROCEDURE(x : REAL; n : INTEGER);"
 //     "  LongReal- : PROCEDURE(x : LONGREAL; n : INTEGER);"
-       "  Ln-       : PROCEDURE;"
+//     "  Ln-       : PROCEDURE;"
        "END Out."
 ;
 
@@ -131,11 +134,11 @@ main(int argc, char ** argv)
 
        oberon_generate_code(ctx);
 
-       init_system_modules();
+//     init_system_modules();
 
-       oberon_generator_dump(ctx, "dump.txt");
+//     oberon_generator_dump(ctx, "dump.txt");
 
-       start_module();
+//     start_module();
 
        oberon_destroy_context(ctx);
        return 0;