X-Git-Url: http://deadsoftware.ru/gitweb?p=dsw-obn.git;a=blobdiff_plain;f=src%2Foberon.c;h=4afd4c27825aa3eccf0f95c0d62e40c010e3366d;hp=e684e655df644a277dbc65955983efcc62d08b27;hb=1128fa8566c932e3996abd427fc75bc4c946e656;hpb=4e58c0e61815196bcf87405ab9d070631bc72f90

diff --git a/src/oberon.c b/src/oberon.c
index e684e65..4afd4c2 100644
--- a/src/oberon.c
+++ b/src/oberon.c
@@ -1150,6 +1150,8 @@ oberon_autocast_call(oberon_context_t * ctx, oberon_item_t * desig)
 	int num_args = desig -> num_args;
 	int num_decl = fn -> num_decl;
 
+	printf("oberon_autocast_call: num_args %i num_decl %i\n", num_args, num_decl);
+
 	if(num_args < num_decl)
 	{
 		oberon_error(ctx, "too few arguments");
@@ -2782,7 +2784,14 @@ oberon_prevent_recursive_pointer(oberon_context_t * ctx, oberon_type_t * type)
 
 	if(type -> recursive)
 	{
-		oberon_error(ctx, "recursive pointer declaration");
+		if(type -> class == OBERON_TYPE_POINTER)
+		{
+			oberon_error(ctx, "recursive pointer declaration");
+		}
+		else
+		{
+			oberon_error(ctx, "recursive array declaration (pointer)");
+		}
 	}
 
 	if(type -> class == OBERON_TYPE_POINTER
@@ -2935,20 +2944,12 @@ static void oberon_initialize_type(oberon_context_t * ctx, oberon_type_t * type)
 static void
 oberon_initialize_record_fields(oberon_context_t * ctx, oberon_type_t * type)
 {
-	if(type -> class != OBERON_TYPE_RECORD)
-	{
-		return;
-	}
+	assert(type -> class == OBERON_TYPE_RECORD);
 
 	int num_fields = type -> num_decl;
 	oberon_object_t * field = type -> decl;
 	for(int i = 0; i < num_fields; i++)
 	{
-		if(field -> type -> class == OBERON_TYPE_POINTER)
-		{
-			oberon_initialize_type(ctx, field -> type);
-		}
-
 		oberon_initialize_object(ctx, field);
 		field = field -> next;
 	}
@@ -2971,39 +2972,50 @@ oberon_initialize_type(oberon_context_t * ctx, oberon_type_t * type)
 
 	type -> initialized = 1;
 
-	if(type -> class == OBERON_TYPE_POINTER)
-	{
-		oberon_initialize_type(ctx, type -> base);
-		oberon_generator_init_type(ctx, type);
-	}
-	else if(type -> class == OBERON_TYPE_ARRAY)
+	if(type -> class == OBERON_TYPE_POINTER || type -> class == OBERON_TYPE_ARRAY)
 	{
-		if(type -> size != 0)
+		if(type -> class == OBERON_TYPE_ARRAY
+			&& type -> size != 0
+			&& type -> base -> class == OBERON_TYPE_ARRAY
+			&& type -> base -> size == 0)
 		{
-			if(type -> base -> class == OBERON_TYPE_ARRAY)
-			{
-				if(type -> base -> size == 0)
-				{
-					oberon_error(ctx, "open array not allowed as array element");
-				}
-			}
+			oberon_error(ctx, "open array not allowed as array element");
 		}
 
-		oberon_initialize_type(ctx, type -> base);		
-		oberon_generator_init_type(ctx, type);
+		oberon_type_t * rec = type -> base;
+		while(rec -> class == OBERON_TYPE_ARRAY || rec -> class == OBERON_TYPE_POINTER)
+		{
+			rec = rec -> base;
+		}
+
+		if(rec -> class == OBERON_TYPE_RECORD
+			&& rec -> initialized == 0)
+		{
+			rec -> initialized = 1;
+			oberon_generator_init_type(ctx, rec);
+			oberon_initialize_type(ctx, type -> base);
+			oberon_generator_init_type(ctx, type);
+			oberon_initialize_record_fields(ctx, rec);
+		}
+		else
+		{
+			oberon_initialize_type(ctx, type -> base);
+			oberon_generator_init_type(ctx, type);
+		}
 	}
 	else if(type -> class == OBERON_TYPE_RECORD)
 	{
+		printf("Init type: RECORD\n");
 		oberon_generator_init_type(ctx, type);
 		oberon_initialize_record_fields(ctx, type);
 	}
 	else if(type -> class == OBERON_TYPE_PROCEDURE)
 	{
+		printf("Init type: PROCEDURE\n");
 		int num_fields = type -> num_decl;
 		oberon_object_t * field = type -> decl;
 		for(int i = 0; i < num_fields; i++)
 		{
-			//oberon_initialize_object(ctx, field);
 			oberon_initialize_type(ctx, field -> type);
 			field = field -> next;
 		}