diff --git a/src/oberon.c b/src/oberon.c
index f1fe4518a135c6e9369e877ac2c08d13575fb12a..5a93489b35ed197ee2ac10b262a95c042583d146 100644 (file)
--- a/src/oberon.c
+++ b/src/oberon.c
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;
}
@@ -1099,18 +1094,25 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t *
// Допускается:
// Если классы типов равны
// Если INTEGER переводится в REAL
- // Есди STRING переводится в CHAR
- // Есди STRING переводится в ARRAY OF CHAR
+ // Если STRING переводится в CHAR
+ // Если STRING переводится в ARRAY OF CHAR
+ // Если NIL переводится в POINTER
+ // Если NIL переводится в PROCEDURE
oberon_check_src(ctx, expr);
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(expr -> result -> class == OBERON_TYPE_NIL)
+ {
+ if(pref -> class != OBERON_TYPE_POINTER
+ && pref -> class != OBERON_TYPE_PROCEDURE)
+ {
+ error = true;
+ }
+ }
+ else if(expr -> result -> class == OBERON_TYPE_STRING)
{
if(pref -> class == OBERON_TYPE_CHAR)
{
@@ -1184,17 +1186,18 @@ oberon_autocast_to(oberon_context_t * ctx, oberon_expr_t * expr, oberon_type_t *
else if(pref -> class == OBERON_TYPE_POINTER)
{
assert(pref -> base);
- if(expr -> result -> base -> class == OBERON_TYPE_RECORD)
+ if(expr -> result -> class == OBERON_TYPE_NIL)
+ {
+ // do nothing
+ }
+ else if(expr -> result -> base -> class == OBERON_TYPE_RECORD)
{
oberon_check_record_compatibility(ctx, expr -> result, pref);
expr = oberno_make_record_cast(ctx, expr, pref);
}
else if(expr -> result -> base != pref -> base)
{
- if(expr -> result -> base -> class != OBERON_TYPE_VOID)
- {
- oberon_error(ctx, "incompatible pointer types");
- }
+ oberon_error(ctx, "incompatible pointer types");
}
}
@@ -1293,7 +1296,7 @@ oberon_make_call_func(oberon_context_t * ctx, oberon_item_t * item, int num_args
}
else
{
- if(signature -> base -> class == OBERON_TYPE_VOID)
+ if(signature -> base -> class == OBERON_TYPE_NOTYPE)
{
oberon_error(ctx, "attempt to call procedure in expression");
}
@@ -1330,7 +1333,7 @@ oberon_make_call_proc(oberon_context_t * ctx, oberon_item_t * item, int num_args
}
else
{
- if(signature -> base -> class != OBERON_TYPE_VOID)
+ if(signature -> base -> class != OBERON_TYPE_NOTYPE)
{
oberon_error(ctx, "attempt to call function as non-typed procedure");
}
@@ -1359,7 +1362,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");
break;
case NIL:
oberon_assert_token(ctx, NIL);
- expr = oberon_new_item(MODE_NIL, ctx -> void_ptr_type, true);
+ expr = oberon_new_item(MODE_NIL, ctx -> nil_type, true);
break;
default:
oberon_error(ctx, "invalid expression");
int num;
oberon_object_t * list;
oberon_type_t * type;
- type = oberon_new_type_ptr(OBERON_TYPE_VOID);
+ type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
oberon_ident_list(ctx, OBERON_CLASS_VAR, false, &num, &list);
oberon_assert_token(ctx, COLON);
oberon_assert_token(ctx, COLON);
oberon_type_t * type;
- type = oberon_new_type_ptr(OBERON_TYPE_VOID);
+ type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
oberon_type(ctx, &type);
oberon_object_t * param = list;
signature = *type;
signature -> class = OBERON_TYPE_PROCEDURE;
signature -> num_decl = 0;
- signature -> base = ctx -> void_type;
+ signature -> base = ctx -> notype_type;
signature -> decl = NULL;
if(ctx -> token == LPAREN)
oberon_object_t * proc = ctx -> decl -> parent;
oberon_type_t * result_type = proc -> type -> base;
- if(result_type -> class == OBERON_TYPE_VOID)
+ if(result_type -> class == OBERON_TYPE_NOTYPE)
{
if(expr != NULL)
{
oberon_error(ctx, "procedure name not matched");
}
- if(proc -> type -> base -> class == OBERON_TYPE_VOID
+ if(proc -> type -> base -> class == OBERON_TYPE_NOTYPE
&& proc -> has_return == 0)
{
oberon_make_return(ctx, NULL);
ctx -> decl -> local = 1;
oberon_type_t * signature;
- signature = oberon_new_type_ptr(OBERON_TYPE_VOID);
+ signature = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
oberon_opt_formal_pars(ctx, &signature);
//oberon_initialize_decl(ctx);
else
{
to = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE, false, false, false);
- to -> type = oberon_new_type_ptr(OBERON_TYPE_VOID);
+ to -> type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
}
*type = to -> type;
@@ -2613,7 +2615,7 @@ oberon_make_multiarray(oberon_context_t * ctx, oberon_expr_t * sizes, oberon_typ
}
oberon_type_t * dim;
- dim = oberon_new_type_ptr(OBERON_TYPE_VOID);
+ dim = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
oberon_make_multiarray(ctx, sizes -> next, base, &dim);
@@ -2636,7 +2638,7 @@ oberon_field_list(oberon_context_t * ctx, oberon_type_t * rec, oberon_scope_t *
int num;
oberon_object_t * list;
oberon_type_t * type;
- type = oberon_new_type_ptr(OBERON_TYPE_VOID);
+ type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
oberon_ident_list(ctx, OBERON_CLASS_FIELD, true, &num, &list);
oberon_assert_token(ctx, COLON);
oberon_assert_token(ctx, OF);
oberon_type_t * base;
- base = oberon_new_type_ptr(OBERON_TYPE_VOID);
+ base = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
oberon_type(ctx, &base);
if(num_sizes == 0)
oberon_assert_token(ctx, TO);
oberon_type_t * base;
- base = oberon_new_type_ptr(OBERON_TYPE_VOID);
+ base = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
oberon_type(ctx, &base);
oberon_type_t * ptr;
if(newtype == NULL)
{
newtype = oberon_define_object(ctx -> decl, name, OBERON_CLASS_TYPE, export, read_only, false);
- newtype -> type = oberon_new_type_ptr(OBERON_TYPE_VOID);
+ newtype -> type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
assert(newtype -> type);
}
else
type = newtype -> type;
oberon_type(ctx, &type);
- if(type -> class == OBERON_TYPE_VOID)
+ if(type -> class == OBERON_TYPE_NOTYPE)
{
oberon_error(ctx, "recursive alias declaration");
}
@@ -2883,6 +2885,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++)
static void
oberon_initialize_type(oberon_context_t * ctx, oberon_type_t * type)
{
- if(type -> class == OBERON_TYPE_VOID)
+ if(type -> class == OBERON_TYPE_NOTYPE)
{
oberon_error(ctx, "undeclarated type");
}
static void
register_default_types(oberon_context_t * ctx)
{
- ctx -> void_type = oberon_new_type_ptr(OBERON_TYPE_VOID);
- oberon_generator_init_type(ctx, ctx -> void_type);
+ ctx -> notype_type = oberon_new_type_ptr(OBERON_TYPE_NOTYPE);
+ oberon_generator_init_type(ctx, ctx -> notype_type);
- ctx -> void_ptr_type = oberon_new_type_ptr(OBERON_TYPE_POINTER);
- ctx -> void_ptr_type -> base = ctx -> void_type;
- oberon_generator_init_type(ctx, ctx -> void_ptr_type);
+ ctx -> nil_type = oberon_new_type_ptr(OBERON_TYPE_NIL);
+ oberon_generator_init_type(ctx, ctx -> nil_type);
ctx -> string_type = oberon_new_type_string(1);
oberon_generator_init_type(ctx, ctx -> string_type);
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);
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);
}