index cb8eeef564ba2925b7eb5701002253f79cdd47d4..bf3b07b52aee0c728cf194e2fbb521b635500557 100644 (file)
static void
push_expr(gen_proc_t * p, oberon_expr_t * expr);
+static void
+oberon_generate_static_initialization(gen_proc_t * p, oberon_object_t * x)
+{
+ if(x -> type -> class == OBERON_TYPE_ARRAY
+ || x -> type -> class == OBERON_TYPE_RECORD)
+ {
+ jvm_generate_ldst_prepare(p, x -> gen_var);
+ jvm_generate_new(p, x -> type, 0);
+ jvm_generate_store(p, x -> gen_var);
+ }
+}
+
void
oberon_generate_begin_module(oberon_context_t * ctx)
{
else if(x -> class == OBERON_CLASS_VAR)
{
jvm_generate_var_initialization(p, x -> gen_var);
- if(x -> type -> class == OBERON_TYPE_ARRAY
- || x -> type -> class == OBERON_TYPE_RECORD)
- {
- jvm_generate_ldst_prepare(p, x -> gen_var);
- jvm_generate_new(p, x -> type, 0);
- jvm_generate_store(p, x -> gen_var);
- }
+ oberon_generate_static_initialization(p, x);
}
x = x -> next;
switch(x -> class)
{
case OBERON_CLASS_VAR_PARAM:
+ jvm_generate_var_initialization(p, v);
+ break;
case OBERON_CLASS_PARAM:
+ jvm_generate_var_initialization(p, v);
+ if(x -> type -> class == OBERON_TYPE_ARRAY)
+ {
+ jvm_generate_array_duplicate_and_replace(p, v, x -> type);
+ }
+ else if(x -> type -> class == OBERON_TYPE_RECORD)
+ {
+ jvm_generate_record_duplicate_and_replace(p, v, x -> type);
+ }
+ break;
case OBERON_CLASS_VAR:
jvm_generate_var_initialization(p, v);
+ oberon_generate_static_initialization(p, x);
break;
case OBERON_CLASS_CONST:
case OBERON_CLASS_TYPE:
gen_error("jvm_generate_local_initialization: wat class %i", x -> class);
break;
}
-
- if(x -> class == OBERON_CLASS_PARAM)
- {
- if(x -> type -> class == OBERON_TYPE_ARRAY)
- {
- jvm_generate_array_duplicate_and_replace(p, v, x -> type);
- }
- else if(x -> type -> class == OBERON_TYPE_RECORD)
- {
- jvm_generate_record_duplicate_and_replace(p, v, x -> type);
- }
- }
}
void