X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fclassgen%2FMethodGen.java;h=50ff3af0dac1821327c8103ea81a400439b15916;hb=d54f8660ded621af4065b8907255c162df0f6eb0;hp=bc80d75d731129bb116f3cc7156a95065318fb0b;hpb=0b535cb6b45f0d8a1d43eee75a3fe187ed383ef8;p=org.ibex.classgen.git

diff --git a/src/org/ibex/classgen/MethodGen.java b/src/org/ibex/classgen/MethodGen.java
index bc80d75..50ff3af 100644
--- a/src/org/ibex/classgen/MethodGen.java
+++ b/src/org/ibex/classgen/MethodGen.java
@@ -15,8 +15,8 @@ public class MethodGen extends Type.Class.Method.Body {
     private final Vector exnTable = new Vector();
     private final Hashtable thrownExceptions = new Hashtable();
     
-    private int maxStack = 16;
-    private int maxLocals;
+    int maxStack = 16;
+    int maxLocals;
     
     private int size;
     private int capacity;
@@ -39,7 +39,7 @@ public class MethodGen extends Type.Class.Method.Body {
         this(in.readShort(), cp.getUtf8KeyByIndex(in.readShort()), c, in, cp); }
 
     private MethodGen(short flags, String name, Type.Class c, DataInput in, ConstantPool cp) throws IOException {
-        this(flags, name, c.method(name+cp.getUtf8KeyByIndex(in.readShort())), c, in, cp); }
+        this(flags, name, c.method(name,cp.getUtf8KeyByIndex(in.readShort())), c, in, cp); }
     private MethodGen(short flags, String name, Type.Class.Method m,
                       Type.Class c, DataInput in, ConstantPool cp) throws IOException {
         m.super(flags, new ClassFile.AttrGen(in,cp));
@@ -133,7 +133,7 @@ public class MethodGen extends Type.Class.Method.Body {
                     break;
                 }
                 case MULTIANEWARRAY:
-                    arg = new MultiANewArray((Type.Class)cp.getKeyByIndex(in.readUnsignedShort()),in.readUnsignedByte());
+                    arg = new MultiANewArray((Type.Array)cp.getKeyByIndex(in.readUnsignedShort()),in.readUnsignedByte());
                     break;
                 case INVOKEINTERFACE: {
                     ConstantPool.Ent ent = cp.getByIndex(in.readUnsignedShort());
@@ -532,9 +532,9 @@ public class MethodGen extends Type.Class.Method.Body {
     }
     
     public static class MultiANewArray {
-        public Type.Class type;
+        public Type.Array type;
         public int dims;
-        public MultiANewArray(Type.Class type, int dims) { this.type = type; this.dims = dims; }
+        public MultiANewArray(Type.Array type, int dims) { this.type = type; this.dims = dims; }
     }
     
     public static class Wide {
@@ -996,9 +996,9 @@ public class MethodGen extends Type.Class.Method.Body {
             sb.append(i).append(": ");
             sb.append(OP_NAMES[op[i]&0xff]);
             String s = null;
-            if (arg[i] instanceof Type) s = ((Type)arg[i]).debugToString();
-            else if (arg[i] instanceof Type.Class.Member) s = ((Type.Class.Member)arg[i]).debugToString();
-            else if (arg[i] instanceof String) s = "\"" + s + "\"";
+            if (arg[i] instanceof Type) s = ((Type)arg[i]).toString();
+            else if (arg[i] instanceof Type.Class.Member) s = ((Type.Class.Member)arg[i]).toString();
+            else if (arg[i] instanceof String) s = "\"" + arg[i] + "\"";
             else if (arg[i] != null) s = arg[i].toString();
             if (s != null) sb.append(" ").append(s);
             sb.append("\n");