index 450105525a0aa9b290fd7e0c3f7c91e5904dfdd9..1ec731f8eb37d275a3114ed050bbd262fd2a9615 100644 (file)
struct gen_class * class = proc -> module -> gen_mod -> class;
proc -> gen_proc = jvm_create_proc(class);
proc -> gen_proc -> full_name = jvm_get_field_full_name_safe(proc);
+ jvm_create_static_links(proc);
}
void
p = proc -> gen_proc;
- if(proc -> local == false)
+ if(proc -> local)
+ {
+ signature = jvm_get_local_procedure_signature(proc);
+ }
+ else
{
oberon_generate_procedure_pointer_class(proc);
+ signature = jvm_get_procedure_signature(proc -> type);
}
- signature = jvm_get_procedure_signature(proc -> type);
name = jvm_get_name(proc);
jvm_generate_function_header(p, "public static", name, signature);
+ if(proc -> local)
+ {
+ jvm_generate_staticlinks(proc);
+ }
+
+ jvm_generate_procedure_frame(proc);
+
/* Создание парамеров и переменных */
var = proc -> scope -> list -> next;
while(var)
var = var -> next;
}
- jvm_generate_procedure_frame(proc);
jvm_generate_frame_initialization(p);
/* Инициализация парамеров и переменных */
assert(desig -> var == NULL);
assert(desig -> mode == MODE_CALL);
- char * signature = NULL;
-
bool direct_call = false;
if(desig -> parent -> mode == MODE_VAR)
{
oberon_type_t * procsig;
procsig = desig -> parent -> result;
- signature = jvm_get_procedure_signature(procsig);
if(direct_call == false)
{
push_item(p, desig -> parent);
}
+ if(direct_call)
+ {
+ jvm_generate_push_static_links(p, desig -> parent -> var);
+ }
+
int args_cells = 0;
int result_cells = jvm_cell_size_for_type(procsig -> base);
if(direct_call)
{
char * full_name = jvm_get_field_full_name(desig -> parent -> var);
+ char * signature = jvm_get_local_procedure_signature(desig -> parent -> var);
jvm_generate(p, args_cells, result_cells, "invokestatic %s%s", full_name, signature);
}
else
{
char * cname = jvm_get_class_full_name(procsig);
+ char * signature = jvm_get_procedure_signature(procsig);
jvm_generate(p, 1 + args_cells, result_cells, "invokevirtual %s/invoke%s", cname, signature);
}
}