Изменены размеры примитивных типов

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

diff --git a/src/oberon.c b/src/oberon.c
index f1fe4518a135c6e9369e877ac2c08d13575fb12a..bf5dad872cbdc3c420dec670d8c5de40c463f5d3 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++)
@@ -3755,17 +3751,20 @@ register_default_types(oberon_context_t * ctx)
        ctx -> bool_type = oberon_new_type_boolean();
        oberon_define_type(ctx -> world_scope, "BOOLEAN", ctx -> bool_type, 1);
 
+       ctx -> char_type = oberon_new_type_char(1);
+       oberon_define_type(ctx -> world_scope, "CHAR", ctx -> char_type, 1);
+
        ctx -> byte_type = oberon_new_type_integer(1);
-       oberon_define_type(ctx -> world_scope, "BYTE", ctx -> byte_type, 1);
+       oberon_define_type(ctx -> world_scope, "SHORTINT", ctx -> byte_type, 1);
 
        ctx -> shortint_type = oberon_new_type_integer(2);
-       oberon_define_type(ctx -> world_scope, "SHORTINT", ctx -> shortint_type, 1);
+       oberon_define_type(ctx -> world_scope, "INTEGER", ctx -> shortint_type, 1);
 
        ctx -> int_type = oberon_new_type_integer(4);
-       oberon_define_type(ctx -> world_scope, "INTEGER", ctx -> int_type, 1);
+       oberon_define_type(ctx -> world_scope, "LONGINT", ctx -> int_type, 1);
 
        ctx -> longint_type = oberon_new_type_integer(8);
-       oberon_define_type(ctx -> world_scope, "LONGINT", ctx -> longint_type, 1);
+       oberon_define_type(ctx -> world_scope, "HUGEINT", ctx -> longint_type, 1);
 
        ctx -> real_type = oberon_new_type_real(4);
        oberon_define_type(ctx -> world_scope, "REAL", ctx -> real_type, 1);
@@ -3773,9 +3772,6 @@ register_default_types(oberon_context_t * ctx)
        ctx -> longreal_type = oberon_new_type_real(8);
        oberon_define_type(ctx -> world_scope, "LONGREAL", ctx -> longreal_type, 1);
 
-       ctx -> char_type = oberon_new_type_char(1);
-       oberon_define_type(ctx -> world_scope, "CHAR", ctx -> char_type, 1);
-
        ctx -> set_type = oberon_new_type_set(4);
        oberon_define_type(ctx -> world_scope, "SET", ctx -> set_type, 1);
 }