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

diff --git a/generator.c b/generator.c
index f65b066..24529e0 100644
--- a/generator.c
+++ b/generator.c
@@ -81,32 +81,13 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type)
 	}
 	else if(type -> class == OBERON_TYPE_ARRAY)
 	{
-		if(type -> dim != 1)
-		{
-			oberon_error(ctx, "multidimension and open arrays not supported");
-		}
-		
 		gen_type_t * gen_base = type -> base -> gen_type;
 		gcc_jit_type * gcc_base = gen_base -> gcc_type;
-
 		gcc_type = gcc_jit_context_new_array_type(gcc_context, NULL, gcc_base, type -> size);
 	}
 	else if(type -> class == OBERON_TYPE_RECORD)
 	{
-		// TODO type exstension
-
-		int num_fields = type -> num_decl;
-		gcc_jit_field * fields[num_fields];
-		oberon_object_t * o = type -> decl;
-		for(int i = 0; i < num_fields; i++)
-		{
-			assert(o -> class == OBERON_CLASS_FIELD);
-			gen_var_t * var = o -> gen_var;
-			fields[i] = var -> gcc_field;
-			o = o -> next;
-		}
-
-		gcc_struct = gcc_jit_context_new_struct_type(gcc_context, NULL, "", num_fields, fields);
+		gcc_struct = gcc_jit_context_new_opaque_struct(gcc_context, NULL, "");
 		gcc_type = gcc_jit_struct_as_type(gcc_struct);
 	}
 	else if(type -> class == OBERON_TYPE_POINTER)
@@ -144,6 +125,32 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type)
 	gen_type -> gcc_struct = gcc_struct;
 }
 
+void
+oberon_generator_init_record(oberon_context_t * ctx, oberon_type_t * type)
+{
+	assert(type -> class == OBERON_TYPE_RECORD);
+
+	gen_type_t * gen_type = type -> gen_type;
+	gcc_jit_struct * gcc_struct = gen_type -> gcc_struct;
+
+	// TODO type exstension
+
+	int num_fields = type -> num_decl;
+	gcc_jit_field * fields[num_fields];
+	oberon_object_t * o = type -> decl;
+	for(int i = 0; i < num_fields; i++)
+	{
+		assert(o -> class == OBERON_CLASS_FIELD);
+		gen_var_t * var = o -> gen_var;
+		fields[i] = var -> gcc_field;
+		o = o -> next;
+	}
+
+	gcc_jit_struct_set_fields (gcc_struct, NULL, num_fields, fields);
+
+	//gcc_struct = gcc_jit_context_new_struct_type(gcc_context, NULL, "", num_fields, fields);
+}
+
 void
 oberon_generator_init_var(oberon_context_t * ctx, oberon_object_t * var)
 {
@@ -329,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");
@@ -427,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);
@@ -529,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);