X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Foberon.c;h=3b8a6b14846e593d9bbaf7b31385993475362a8c;hb=9531d399c60190a8daf625dd99f9c141753bba5e;hp=8b94271a6033d4675f4c8026d316980139a85d18;hpb=2985d77f3ee4af98761b28b4ce1e57582d8c8619;p=dsw-obn.git

diff --git a/src/oberon.c b/src/oberon.c
index 8b94271..3b8a6b1 100644
--- a/src/oberon.c
+++ b/src/oberon.c
@@ -1248,7 +1248,7 @@ oberno_make_dereferencing(oberon_context_t * ctx, oberon_expr_t * expr)
 	assert(expr -> is_item);
 
 	oberon_expr_t * selector;
-	selector = oberon_new_item(MODE_DEREF, expr -> result -> base, expr -> read_only);
+	selector = oberon_new_item(MODE_DEREF, expr -> result -> base, false);
 	selector -> item.parent = (oberon_item_t *) expr;
 
 	return selector;
@@ -1958,11 +1958,6 @@ oberon_simple_expr(oberon_context_t * ctx)
 
 	expr = oberon_term_expr(ctx);
 
-	if(minus)
-	{
-		expr = oberon_make_unary_op(ctx, MINUS, expr);
-	}
-
 	while(ISADDOP(ctx -> token))
 	{
 		int token = ctx -> token;
@@ -1972,6 +1967,11 @@ oberon_simple_expr(oberon_context_t * ctx)
 		expr = oberon_make_bin_op(ctx, token, expr, inter);
 	}
 
+	if(minus)
+	{
+		expr = oberon_make_unary_op(ctx, MINUS, expr);
+	}
+
 	return expr;
 }
 
@@ -2940,9 +2940,10 @@ oberon_initialize_type(oberon_context_t * ctx, oberon_type_t * type)
 		oberon_object_t * field = type -> decl;
 		for(int i = 0; i < num_fields; i++)
 		{
-			oberon_initialize_object(ctx, field);
+			//oberon_initialize_object(ctx, field);
+			oberon_initialize_type(ctx, field -> type);
 			field = field -> next;
-		}		
+		}
 
 		oberon_generator_init_type(ctx, type);
 	}