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;
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());
}
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 {
} else if (argLength == 7) {
throw new Error("should never happen - variable length instruction not explicitly handled");
} else {
- int iarg = ((Integer)arg).intValue();
+ int iarg = (arg instanceof Type.Primitive)
+ ? ((Type.Primitive)arg).toArraySpec()
+ : ((Integer)arg).intValue();
if (argLength == 1) {
if ((opdata & OP_UNSIGNED_FLAG) != 0 ? iarg >= 256 : (iarg < -128 || iarg >= 128))
throw new ClassFile.Exn("overflow of s/u1 option");
String s = null;
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 = "\"" + s + "\"";
+ 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");