Добавлена проверка базы записи на рекурсивное расширение

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

diff --git a/src/oberon.c b/src/oberon.c
index f1fe4518a135c6e9369e877ac2c08d13575fb12a..cf1a570f8084f96c21234f7de51ad5e1c4406676 100644 (file)
--- a/src/oberon.c
+++ b/src/oberon.c
@@ -690,8 +690,6 @@ static void oberon_read_string(oberon_context_t * ctx)
 
        ctx -> token = STRING;
        ctx -> string = string;
-
-       printf("oberon_read_string: string ((%s))\n", string);
 }
 
 static void oberon_read_token(oberon_context_t * ctx);
@@ -986,11 +984,8 @@ oberno_make_record_cast(oberon_context_t * ctx, oberon_expr_t * expr, oberon_typ
        oberon_type_t * from = expr -> result;
        oberon_type_t * to = rec;
 
-       printf("oberno_make_record_cast: from class %i to class %i\n", from -> class, to -> class);
-
        if(from -> class == OBERON_TYPE_POINTER && to -> class == OBERON_TYPE_POINTER)
        {
-               printf("oberno_make_record_cast: pointers\n");
                from = from -> base;
                to = to -> base;
        }
@@ -1107,9 +1102,6 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t *
        bool error = false;
        if(pref -> class != expr -> result -> class)
        {
-               printf("expr class %i\n", expr -> result -> class);
-               printf("pref class %i\n", pref -> class);
-
                if(expr -> result -> class == OBERON_TYPE_STRING)
                {
                        if(pref -> class == OBERON_TYPE_CHAR)
@@ -1359,7 +1351,6 @@ oberon_make_call_proc(oberon_context_t * ctx, oberon_item_t * item, int num_args
 static oberon_expr_t *
 oberno_make_dereferencing(oberon_context_t * ctx, oberon_expr_t * expr)
 {
-       printf("oberno_make_dereferencing\n");
        if(expr -> result -> class != OBERON_TYPE_POINTER)
        {
                oberon_error(ctx, "not a pointer");
@@ -2883,6 +2874,11 @@ oberon_prevent_recursive_record(oberon_context_t * ctx, oberon_type_t * type)
 
        type -> recursive = 1;
 
+       if(type -> base)
+       {
+               oberon_prevent_recursive_record(ctx, type -> base);
+       }
+
        int num_fields = type -> num_decl;
        oberon_object_t * field = type -> decl;
        for(int i = 0; i < num_fields; i++)