JVM: Реализован доступ к локальным переменным ровнем выше из локальных процедур

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

diff --git a/src/test.c b/src/test.c
index d2501611eee396c8c7f2e4036d115937e967eec3..ad95a34cf1f36fc78a7ed440cff0f1cbfccdd7ea 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -4,94 +4,33 @@
 
 #include "../include/oberon.h"
 
-/*
 static char source_test[] =
        "(* Main module *)"
        "MODULE Test;"
        "IMPORT Out;"
        ""
-       "TYPE"
-       "  R = LONGINT;"
+       "VAR i : INTEGER;"
        ""
-       "PROCEDURE Factorial(n : R) : R;"
+       "PROCEDURE X(VAR x : INTEGER; y : INTEGER);"
+       "  VAR"
+       "    q, w, r : INTEGER;"
+       "  PROCEDURE Y;"
+       "    VAR levY : INTEGER;"
+       "  BEGIN"
+       "    x := 3345;"
+       "    q := 666;"
+       "  END Y;"
        "BEGIN"
-       "  IF n <= 1 THEN"
-       "    RETURN 1;"
-       "  ELSE"
-       "    RETURN n * Factorial(n - 1);"
-       "  END;"
-       "  RETURN 0; (* Детектор ретурнов - дерьмо *)"
-       "END Factorial;"
+       "  x := 54646;"
+       "  q := 1;"
+       "  Y;"
+       "  Out.String('Pos Y: q = '); Out.Int(q, 0); Out.Ln;"
+       "END X;"
        ""
-       "BEGIN"
-       "  Out.Open();"
-       "  Out.Int(Factorial(0), 0); Out.Ln;"
-       "  Out.Int(Factorial(1), 0); Out.Ln;"
-       "  Out.Int(Factorial(2), 0); Out.Ln;"
-       "  Out.Int(Factorial(3), 0); Out.Ln;"
-       "  Out.Int(Factorial(4), 0); Out.Ln;"
-       "  Out.Int(Factorial(5), 0); Out.Ln;"
-       "  Out.Int(Factorial(6), 0); Out.Ln;"
-       "  Out.Int(Factorial(7), 0); Out.Ln;"
-       "  Out.Int(Factorial(8), 0); Out.Ln;"
-       "  Out.Int(Factorial(9), 0); Out.Ln;"
-       "  Out.Int(Factorial(10), 0); Out.Ln;"
-       "  Out.Int(Factorial(11), 0); Out.Ln;"
-       "  Out.Int(Factorial(12), 0); Out.Ln;"
-       "  Out.Int(Factorial(13), 0); Out.Ln;"
-       "  Out.Int(Factorial(14), 0); Out.Ln;"
-       "  Out.Int(Factorial(15), 0); Out.Ln;"
-       "  Out.Int(Factorial(16), 0); Out.Ln;"
-       "  Out.Int(Factorial(17), 0); Out.Ln;"
-       "  Out.Int(Factorial(18), 0); Out.Ln;"
-       "  Out.Int(Factorial(19), 0); Out.Ln;"
-       "  Out.Int(Factorial(20), 0); Out.Ln;"
-       "END Test."
-;
-*/
-
-static char source_test[] =
-       "(* Main module *)"
-       "MODULE Test;"
-       "IMPORT Out;"
-       ""
-       "TYPE"
-       "  R = LONGREAL;"
-       ""
-       "PROCEDURE Factorial(n : R) : R;"
-       "BEGIN"
-       "  IF n <= 1 THEN"
-       "    RETURN 1;"
-       "  ELSE"
-       "    RETURN n * Factorial(n - 1);"
-       "  END;"
-       "  RETURN 0; (* Детектор ретурнов - дерьмо *)"
-       "END Factorial;"
-       ""
-       "BEGIN"
-       "  Out.Open();"
-       "  Out.LongReal(Factorial(0), 0); Out.Ln;"
-       "  Out.LongReal(Factorial(1), 0); Out.Ln;"
-       "  Out.LongReal(Factorial(2), 0); Out.Ln;"
-       "  Out.LongReal(Factorial(3), 0); Out.Ln;"
-       "  Out.LongReal(Factorial(4), 0); Out.Ln;"
-       "  Out.LongReal(Factorial(5), 0); Out.Ln;"
-       "  Out.LongReal(Factorial(6), 0); Out.Ln;"
-       "  Out.LongReal(Factorial(7), 0); Out.Ln;"
-       "  Out.LongReal(Factorial(8), 0); Out.Ln;"
-       "  Out.LongReal(Factorial(9), 0); Out.Ln;"
-       "  Out.LongReal(Factorial(10), 0); Out.Ln;"
-       "  Out.LongReal(Factorial(11), 0); Out.Ln;"
-       "  Out.LongReal(Factorial(12), 0); Out.Ln;"
-       "  Out.LongReal(Factorial(13), 0); Out.Ln;"
-       "  Out.LongReal(Factorial(14), 0); Out.Ln;"
-       "  Out.LongReal(Factorial(15), 0); Out.Ln;"
-       "  Out.LongReal(Factorial(16), 0); Out.Ln;"
-       "  Out.LongReal(Factorial(17), 0); Out.Ln;"
-       "  Out.LongReal(Factorial(18), 0); Out.Ln;"
-       "  Out.LongReal(Factorial(19), 0); Out.Ln;"
-       "  Out.LongReal(Factorial(20), 0); Out.Ln;"
-       "  Out.LongReal(Factorial(170), 0); Out.Ln;"
+       "BEGIN;"
+       "  i := 1;"
+       "  X(i, i);"
+       "  Out.Int(i, 0); Out.Ln;"
        "END Test."
 ;