Для обычных процедур всегда генерируется return

[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 be8c9292dd0444f3f50c0ce116baee2ad660f254..cb8eeef564ba2925b7eb5701002253f79cdd47d4 100644 (file)
--- a/src/backends/jvm/generator-jvm.c
+++ b/src/backends/jvm/generator-jvm.c
@@ -9,6 +9,7 @@
 #include <gc.h>
 
 #include "../../oberon-internals.h"
+#include "../../generator.h"
 #include "generator-jvm.h"
 #include "generator-jvm-abi.h"
 #include "generator-jvm-asm.h"
@@ -871,10 +872,12 @@ jvm_generate_local_object(gen_proc_t * p, oberon_object_t * x)
                case OBERON_CLASS_VAR:
                        jvm_generate_var(v);
                        break;
+               case OBERON_CLASS_CONST:
+               case OBERON_CLASS_TYPE:
                case OBERON_CLASS_PROC:
                        break;
                default:
-                       gen_error("jvm_generate_local_initialization: wat");
+                       gen_error("jvm_generate_local_initialization: wat class %i", x -> class);
                        break;
        }
 }
@@ -899,10 +902,12 @@ jvm_generate_local_initialization(gen_proc_t * p, oberon_object_t * x)
                case OBERON_CLASS_VAR:
                        jvm_generate_var_initialization(p, v);
                        break;
+               case OBERON_CLASS_CONST:
+               case OBERON_CLASS_TYPE:
                case OBERON_CLASS_PROC:
                        break;
                default:
-                       gen_error("jvm_generate_local_initialization: wat");
+                       gen_error("jvm_generate_local_initialization: wat class %i", x -> class);
                        break;
        }
 
@@ -977,6 +982,7 @@ oberon_generate_end_proc(oberon_context_t * ctx)
        m = ctx -> mod -> gen_mod;
        p = m -> class -> p;
 
+       oberon_generate_trap(ctx, -4);
        jvm_generate_function_end(p);
 }