X-Git-Url: http://deadsoftware.ru/gitweb?p=dsw-obn.git;a=blobdiff_plain;f=src%2Fbackends%2Fjvm%2Fgenerator-jvm.c;h=8c9d69f61258fb91af3a443771b682692fb7d1ee;hp=d99d1da62349514679fb9c298011c6c9fce099d1;hb=5eab721345c3e472bbfbb97645729069b0b6bb40;hpb=90882596d1b4b9ef59880c878118e4f9da49eede

diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c
index d99d1da..8c9d69f 100644
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -1315,19 +1315,27 @@ jvm_generate_expr_new_pointer(gen_proc_t * p, oberon_type_t * type, int num, obe
 static void
 jvm_generate_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t * to)
 {
-	char prefix = jvm_get_prefix(from);
-	char postfix = jvm_get_postfix(to);
-	int from_cell_size = jvm_cell_size_for_type(from);
-	int to_cell_size = jvm_cell_size_for_type(to);
-
-	jvm_generate_comment(p, "cast type class from %i(%i) to %i(%i)", from -> class, from -> size, to -> class, to -> size);
-
-	if(prefix == postfix)
+	if(to -> class == OBERON_TYPE_RECORD || to -> class == OBERON_TYPE_POINTER)
 	{
-		return;
+		char * full_name = jvm_get_class_full_name(to);
+		jvm_generate(p, 1, 1, "checkcast %s", full_name);
 	}
+	else
+	{
+		char prefix = jvm_get_prefix(from);
+		char postfix = jvm_get_postfix(to);
+		int from_cell_size = jvm_cell_size_for_type(from);
+		int to_cell_size = jvm_cell_size_for_type(to);
 
-	jvm_generate(p, from_cell_size, to_cell_size, "%c2%c", prefix, postfix);
+		jvm_generate_comment(p, "cast type class from %i(%i) to %i(%i)", from -> class, from -> size, to -> class, to -> size);
+
+		if(prefix == postfix)
+		{
+			return;
+		}
+
+		jvm_generate(p, from_cell_size, to_cell_size, "%c2%c", prefix, postfix);
+	}
 }
 
 static void