Исправлено действие конструкции WITH

[dsw-obn.git] / src / backends / jvm / generator-jvm.c

diff --git a/src/backends/jvm/generator-jvm.c b/src/backends/jvm/generator-jvm.c
index 4f49cfb86ca94df0b220be27f0d5fad68ac99a3b..91b82bf8c0465f99626d544d4f787421a15d0e23 100644 (file)
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -78,7 +78,7 @@ jvm_generate_hard_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t
                }
                else
                {
-                       jvm_generate(p, 2, 2, "invokestatic java/lang/Double/doubleToRawIntBits(D)J");
+                       jvm_generate(p, 2, 2, "invokestatic java/lang/Double/doubleToRawLongBits(D)J");
                        jvm_generate_cast_prefix(p, 'l', postfix);
                }
        }
@@ -103,6 +103,14 @@ jvm_generate_hard_cast_type(gen_proc_t * p, oberon_type_t * from, oberon_type_t
        }
 }
 
+static void
+check_index(gen_proc_t * p, oberon_type_t * index_type)
+{
+       // TODO проверка валидности границ
+       char prefix = jvm_get_prefix(index_type);
+       jvm_generate_cast_prefix(p, prefix, 'i');
+}
+
 /*
  * Генерирует код для инициализации массива со статическим базовым типом
  * ( aref -- )
@@ -579,6 +587,7 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type)
                        break;
                case OBERON_TYPE_RECORD:
                        m = type -> module -> gen_mod;
+                       t -> full_name = jvm_get_class_full_name(type);
                        oberon_generate_record_class(c -> dir, m, type);
                        break;
                case OBERON_TYPE_PROCEDURE:
@@ -596,6 +605,14 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type)
                t -> postfix = jvm_get_postfix(type);
        }
 
+       if(type -> class == OBERON_TYPE_POINTER ||
+               type -> class == OBERON_TYPE_PROCEDURE ||
+               type -> class == OBERON_TYPE_RECORD ||
+               type -> class == OBERON_TYPE_SYSTEM_PTR)
+       {
+               t -> full_name = jvm_get_class_full_name(type);
+       }
+
        t -> cell_size = jvm_cell_size_for_type(type);
 
        if(type -> class != OBERON_TYPE_NIL)
@@ -760,6 +777,18 @@ oberon_generator_init_var(oberon_context_t * ctx, oberon_object_t * var)
        }
 }
 
+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_generator_init_temp_var(oberon_context_t * ctx, oberon_object_t * var)
 {
@@ -777,6 +806,7 @@ oberon_generator_init_temp_var(oberon_context_t * ctx, oberon_object_t * var)
        var -> gen_var = jvm_create_function_temp_var(p, t);
        jvm_generate_var(var -> gen_var);
        jvm_generate_var_initialization(p, var -> gen_var);
+       oberon_generate_static_initialization(p, var);
 }
 
 void
@@ -821,18 +851,6 @@ oberon_generator_fini_module(oberon_module_t * mod)
 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)
 {
@@ -1146,14 +1164,6 @@ oberon_generate_branch(oberon_context_t * ctx, oberon_expr_t * cond, bool gotoif
        }
 }
 
-static void
-check_index(gen_proc_t * p, oberon_type_t * index_type)
-{
-       // TODO проверка валидности границ
-       char prefix = jvm_get_prefix(index_type);
-       jvm_generate_cast_prefix(p, prefix, 'i');
-}
-
 static void
 push_varptr(gen_proc_t * p, oberon_expr_t * expr)
 {
@@ -1286,6 +1296,7 @@ jvm_generate_expr_new_pointer(gen_proc_t * p, oberon_type_t * type, int num, obe
        for(int i = 0; i < num; i++)
        {
                push_expr(p, arg);
+               check_index(p, arg -> result);
                arg = arg -> next;
        }
 
@@ -1350,6 +1361,10 @@ push_item(gen_proc_t * p, oberon_item_t * item)
                        jvm_generate_array_len(p, item -> integer);
                        jvm_generate_cast_prefix(p, 'i', jvm_get_postfix(item -> result));
                        break;
+               case MODE_AS:
+                       push_item(p, item -> parent);
+                       jvm_generate_cast_type(p, item -> parent -> result, item -> result);
+                       break;
                default:
                        gen_error("push_item: unk mode %i", item -> mode);
                        break;
@@ -1935,3 +1950,11 @@ oberon_set_out_directory(oberon_context_t * ctx, const char * path)
 
        c -> dir = new_string(path);
 }
+
+void
+oberon_set_typecheck(oberon_object_t * var, bool enable)
+{
+       var -> gen_var -> typecheck = enable;
+       var -> gen_var -> forcetype = (enable) ? (var -> type -> gen_type) : (NULL);
+}
+