Исправлено присваивание NIL

[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 065d9634c48a73b4b3900e63a17fd3e6f5a7ff6e..90b0e88f777caa2c3731b55241603b971d126af6 100644 (file)
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -424,7 +424,7 @@ oberon_generate_procedure_pointer_class(oberon_object_t * proc)
        int cell_size = jvm_cell_size_for_type(proc -> type -> base);
        jvm_generate(p, use_size, cell_size, "invokestatic %s%s", full_name, signature);
 
-       if(proc -> type -> base -> class == OBERON_TYPE_VOID)
+       if(proc -> type -> base -> class == OBERON_TYPE_NOTYPE)
        {
                jvm_generate(p, 0, 0, "return");
        }
@@ -475,18 +475,23 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type)
        memset(t, 0, sizeof *t);
        type -> gen_type = t;
 
-       if(type -> class != OBERON_TYPE_VOID)
+       if(type -> class != OBERON_TYPE_NOTYPE)
        {
                t -> wide = jvm_is_wide_type(type);
                t -> prefix = jvm_get_prefix(type);
                t -> postfix = jvm_get_postfix(type);
        }
+
        t -> cell_size = jvm_cell_size_for_type(type);
-       t -> desc = jvm_get_descriptor(type);
+
+       if(type -> class != OBERON_TYPE_NIL)
+       {
+               t -> desc = jvm_get_descriptor(type);
+       }
 
        switch(type -> class)
        {
-               case OBERON_TYPE_VOID:
+               case OBERON_TYPE_NOTYPE:
                case OBERON_TYPE_INTEGER:
                case OBERON_TYPE_BOOLEAN:
                case OBERON_TYPE_ARRAY:
@@ -495,6 +500,7 @@ oberon_generator_init_type(oberon_context_t * ctx, oberon_type_t * type)
                case OBERON_TYPE_CHAR:
                case OBERON_TYPE_STRING:
                case OBERON_TYPE_SET:
+               case OBERON_TYPE_NIL:
                        break;
                case OBERON_TYPE_RECORD:
                        ;
@@ -1036,8 +1042,6 @@ jvm_generate_call_proc(gen_proc_t * p, oberon_item_t * desig)
                }
        }
 
-       printf("direct_call == %i\n", direct_call);
-
        oberon_type_t * procsig;
        procsig = desig -> parent -> result;
 
@@ -1187,20 +1191,17 @@ push_item(gen_proc_t * p, oberon_item_t * item)
                        ;
                        char postfix = jvm_get_postfix(item -> result);
                        int cell_size = jvm_cell_size_for_postfix(postfix);
-                       assert(item -> parent -> is_item);
-                       push_item(p, (oberon_item_t *) item -> parent);
+                       push_item(p, item -> parent);
                        push_expr(p, item -> args);
                        jvm_generate(p, 1 + 1, cell_size, "%caload", postfix);
                        break;
                case MODE_FIELD:
-                       assert(item -> parent -> is_item);
-                       push_item(p, (oberon_item_t *) item -> parent);
+                       push_item(p, item -> parent);
                        jvm_generate_load(p, item -> var -> gen_var);
                        break;
                case MODE_DEREF:
                        /* Все объекты в jvm представляются как указатели */
-                       assert(item -> parent -> is_item);
-                       push_item(p, (oberon_item_t *) item -> parent);
+                       push_item(p, item -> parent);
                        break;
                case MODE_NIL:
                        jvm_generate(p, 0, 1, "aconst_null");
@@ -1641,29 +1642,3 @@ oberon_generate_assign(oberon_context_t * ctx, oberon_expr_t * src, oberon_expr_
 
        store_expr(p, dst, src);
 }
-
-void
-oberon_generate_code(oberon_context_t * ctx)
-{
-       printf("generate code\n");
-}
-
-void
-oberon_generator_dump(oberon_context_t * ctx, char * path)
-{
-       printf("jit: dump code\n");
-}
-
-void *
-oberon_generator_get_procedure(oberon_context_t * ctx, const char * name)
-{
-       printf("jit: get pointer to procedure %s\n", name);
-       return NULL;
-}
-
-void *
-oberon_generator_get_var(oberon_context_t * ctx, const char * name)
-{
-       printf("jit: get pointer to var %s\n", name);
-       return NULL;
-}