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

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

diff --git a/src/oberon.c b/src/oberon.c
index cf1a570f8084f96c21234f7de51ad5e1c4406676..bf5dad872cbdc3c420dec670d8c5de40c463f5d3 100644 (file)
--- a/src/oberon.c
+++ b/src/oberon.c
@@ -3751,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);
@@ -3769,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);
 }