JVM: исправлена лишняя печать локальных переменных (.var)

diff --git a/Test.obn b/Test.obn
index f8a3688761c9e28b3c33aad87cd805f41a96d9d1..6fae5299c4ceb508ddf3708622d39e419e562a12 100644 (file)
--- a/Test.obn
+++ b/Test.obn
@@ -1,22 +1,3 @@
 MODULE Test;
 
-IMPORT Out, CPMath, CPStrings;
-
-
-VAR
-  s : ARRAY 80 OF CHAR;
-  v, m, r, f : LONGREAL;
-  e : LONGINT;
-
-BEGIN
-  v := CPMath.Pi();
-  m := CPMath.Mantissa(v);
-  e := CPMath.Exponent(v);
-  r := CPMath.Real(m, e);
-  f := CPMath.Frac(v);
-  Out.LongReal(v, 0); Out.Ln;
-  Out.LongReal(m, 0); Out.Ln;
-  Out.Int(e, 0); Out.Ln;
-  Out.LongReal(r, 0); Out.Ln;
-  Out.LongReal(f, 0); Out.Ln;
 END Test.

diff --git a/src/backends/jvm/generator-jvm-abi.c b/src/backends/jvm/generator-jvm-abi.c
index d1e87f16a964bbb76f69eefe6c550081abda82cb..f277188bb6c54f48bff60ae3a1cbae8ca0b2bc81 100644 (file)
--- a/src/backends/jvm/generator-jvm-abi.c
+++ b/src/backends/jvm/generator-jvm-abi.c
@@ -256,12 +256,13 @@ jvm_generate_var(gen_var_t * v)
                case JVM_STORAGE_REGISTER:
                case JVM_STORAGE_PARAM:
                case JVM_STORAGE_PARAM_VAR:
-               case JVM_STORAGE_FRAME:
-               case JVM_STORAGE_FRAME_VAR:
                case JVM_STORAGE_FRAME_PARAM:
                case JVM_STORAGE_FRAME_PARAM_VAR:
                        jvm_generate(p, 0, 0, ".var %i is '%s' %s from start to end", reg, name, desc);
                        break;
+               case JVM_STORAGE_FRAME:
+               case JVM_STORAGE_FRAME_VAR:
+                       break;
                case JVM_STORAGE_REGISTER_VAR:
                        jvm_generate(p, 0, 0, ".var %i is '%s' [%s from start to end", reg, name, desc);
                        break;