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

diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c
index 581faf9..d99d1da 100644
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -827,7 +827,16 @@ oberon_generate_record_class(gen_module_t * m, oberon_type_t * rec)
 
 	fprintf(class -> fp, ".source %s\n", rec -> module -> name);
 	fprintf(class -> fp, ".class  public %s\n", cname);
-	fprintf(class -> fp, ".super  java/lang/Object\n\n");
+
+	if(rec -> base == NULL)
+	{
+		fprintf(class -> fp, ".super  java/lang/Object\n\n");
+	}
+	else
+	{
+		class -> base = rec -> base -> gen_type -> class;
+		fprintf(class -> fp, ".super  %s\n\n", class -> base -> full_name);
+	}
 
 	rec -> gen_type -> class = class;
 }
@@ -887,7 +896,14 @@ oberon_generator_init_record(oberon_context_t * ctx, oberon_type_t * rec)
 	jvm_generate_function_header(p, "public", "<init>", "()V");
 	jvm_alloc_register_untyped(p -> rf, false);
 	jvm_generate(p, 0, 1, "aload_0");
-	jvm_generate(p, 1, 0, "invokespecial java/lang/Object/<init>()V");
+	if(class -> base)
+	{
+		jvm_generate(p, 1, 0, "invokespecial %s/<init>()V", class -> base -> full_name);
+	}
+	else
+	{
+		jvm_generate(p, 1, 0, "invokespecial java/lang/Object/<init>()V");
+	}
 	num = rec -> num_decl;
 	field = rec -> decl;
 	for(int i = 0; i < num; i++)