X-Git-Url: http://deadsoftware.ru/gitweb?p=dsw-obn.git;a=blobdiff_plain;f=generator.c;h=24529e0e26add6f595560626773029ce65f903e6;hp=673ac3381818c09270f17e002b26b8d1b29ad24c;hb=338eeae16495bbdcbd8c4f3dad4996346e26139b;hpb=7bff9378302d5e23c6e9eabe7e6edc8034dcd562

diff --git a/generator.c b/generator.c
index 673ac33..24529e0 100644
--- a/generator.c
+++ b/generator.c
@@ -336,12 +336,18 @@ lvalue_from_item(oberon_context_t * ctx, oberon_item_t * item)
 	}
 	else if(item -> mode == MODE_FIELD)
 	{
+		printf("lvalue_from_item: %s\n", item -> var -> name);
 		gen_var_t * gen_var = item -> var -> gen_var;
 		gcc_jit_field * gcc_field = gen_var -> gcc_field;
 
 		gcc_jit_lvalue * parent = lvalue_from_item(ctx, item -> parent);
 		left = gcc_jit_lvalue_access_field(parent, NULL, gcc_field);
 	}
+	else if(item -> mode == MODE_DEREF)
+	{
+		gcc_jit_rvalue * parent = rvalue_from_item(ctx, item -> parent);
+		left = gcc_jit_rvalue_dereference(parent, NULL);
+	}
 	else
 	{
 		oberon_error(ctx, "invalid lvalue expression");
@@ -434,6 +440,16 @@ rvalue_from_item(oberon_context_t * ctx, oberon_item_t * item)
 		gcc_jit_rvalue * parent = rvalue_from_item(ctx, item -> parent);
 		right = gcc_jit_rvalue_access_field(parent, NULL, gcc_field);
 	}
+	else if(item -> mode == MODE_DEREF)
+	{
+		gcc_jit_lvalue * left = lvalue_from_item(ctx, item);
+		right = gcc_jit_lvalue_as_rvalue(left);
+	}
+	else if(item -> mode == MODE_NIL)
+	{
+		gcc_jit_type * type = gcc_jit_context_get_type(gcc_context, GCC_JIT_TYPE_VOID_PTR);
+		right = gcc_jit_context_null(gcc_context, type);
+	}
 	else
 	{
 		oberon_error(ctx, "rvalue_from_item: invalid mode %i", item -> mode);
@@ -536,6 +552,18 @@ oberon_generate_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_
 	gcc_jit_rvalue * right;
 	right = rvalue_from_expr(ctx, src);
 
+	if(src -> is_item)
+	{
+		if(src -> item.mode == MODE_NIL)
+		{
+			gen_context_t * gen_context = ctx -> gen_context;
+			gcc_jit_context * gcc_context = gen_context -> gcc_context;
+			gen_type_t * gen_type = dst -> result -> gen_type;
+			gcc_jit_type * cast_to_type = gen_type -> gcc_type;
+			right = gcc_jit_context_new_cast(gcc_context, NULL, right, cast_to_type);
+		}
+	}
+
 	gen_context_t * gen_context = ctx -> gen_context;
 	gcc_jit_block * gcc_block = gen_context -> gcc_block;
 	gcc_jit_block_add_assignment(gcc_block, NULL, left, right);