X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Foberon.c;h=66a3c7025056b195a204386c126024933c4ebca3;hb=8b545fd0349be12160b9f50c1f4b6f072eac436f;hp=e4b9157d151cafa6075c86bbc1a07ebf2e845bef;hpb=3edc4e955c943735543e2c94ecd28f94d75b32fb;p=dsw-obn.git

diff --git a/src/oberon.c b/src/oberon.c
index e4b9157..66a3c70 100644
--- a/src/oberon.c
+++ b/src/oberon.c
@@ -1223,13 +1223,21 @@ oberon_autocast_call(oberon_context_t * ctx, oberon_item_t * desig)
 	{
 		if(param -> class == OBERON_CLASS_VAR_PARAM)
 		{
+			if(arg -> result != param -> type)
+			{
+				oberon_error(ctx, "incompatible type");
+			}
 			if(arg -> read_only)
 			{
 				oberon_error(ctx, "assign to read-only var");
 			}
+			casted[i] = arg;
+		}
+		else
+		{
+			casted[i] = oberon_autocast_to(ctx, arg, param -> type);
 		}
 
-		casted[i] = oberon_autocast_to(ctx, arg, param -> type);
 		arg = arg -> next;
 		param = param -> next;
 	}
@@ -2461,13 +2469,20 @@ oberon_proc_decl(oberon_context_t * ctx)
 	signature = oberon_new_type_ptr(OBERON_TYPE_VOID);
 	oberon_opt_formal_pars(ctx, &signature);	
 
-	oberon_initialize_decl(ctx);
+	//oberon_initialize_decl(ctx);
 	oberon_generator_init_type(ctx, signature);
 	oberon_close_scope(ctx -> decl);
 
 	oberon_object_t * proc;
 	proc = oberon_find_object(ctx -> decl, name, 0);
-	if(proc != NULL)
+	if(proc == NULL)
+	{
+		proc = oberon_define_object(ctx -> decl, name, OBERON_CLASS_PROC, export, read_only, false);
+		proc -> type = signature;
+		proc -> scope = proc_scope;
+		oberon_generator_init_proc(ctx, proc);
+	}
+	else
 	{
 		if(proc -> class != OBERON_CLASS_PROC)
 		{
@@ -2489,16 +2504,15 @@ oberon_proc_decl(oberon_context_t * ctx)
 
 		oberon_compare_signatures(ctx, proc -> type, signature);
 	}
-	else
+
+	proc_scope -> parent = proc;
+	oberon_object_t * param = proc_scope -> list -> next;
+	while(param)
 	{
-		proc = oberon_define_object(ctx -> decl, name, OBERON_CLASS_PROC, export, read_only, false);
-		proc -> type = signature;
-		proc -> scope = proc_scope;
-		oberon_generator_init_proc(ctx, proc);
+		param -> parent = proc;
+		param = param -> next;
 	}
 
-	proc -> scope -> parent = proc;
-
 	if(forward == 0)
 	{
 		proc -> linked = 1;