index 581faf92c302bab84ce601e5087eeb39e480d4ef..8c9d69f61258fb91af3a443771b682692fb7d1ee 100644 (file)
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;
}
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++)
@@ -1299,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