X-Git-Url: http://git.megacz.com/?p=org.ibex.classgen.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fclassgen%2FMethodRef.java;h=6dbb46feaf8463122979d052a97d77c827b6025c;hp=52ccf2fa74ae1a48dbb262102732963a8c492f69;hb=20b36057bc5aee6e799cce02a3bf289916889fc1;hpb=2b7157f2b687f5500bf45ab2c9175ef1b33ccc48

diff --git a/src/org/ibex/classgen/MethodRef.java b/src/org/ibex/classgen/MethodRef.java
index 52ccf2f..6dbb46f 100644
--- a/src/org/ibex/classgen/MethodRef.java
+++ b/src/org/ibex/classgen/MethodRef.java
@@ -7,36 +7,25 @@ package org.ibex.classgen;
     @see CGConst#INVOKESPECIAL
     @see CGConst#INVOKEINTERFACE
 */
-public class MethodRef extends ClassGen.FieldOrMethodRef {
+public class MethodRef extends MemberRef {
+    
+    final Type[] argTypes;
+    final Type   returnType;
+
     /** Create a reference to method <i>name</i> of class <i>c</i> with the return type <i>ret</i> and the
         arguments <i>args</i> */
-    public MethodRef(Type.Object c, String name, Type ret, Type[] args) {
-        super(c,name,getDescriptor(ret,args));
-    }
-    /** Equivalent to MethodRef(new Type.Object(s),...)
-        @see #MethodRef(Type.Object,String,Type,Type[])
-    */
-    public MethodRef(String s, String name, Type ret, Type[] args) {
-        this(Type.fromDescriptor(s).asObject(), name, ret, args);
+    public MethodRef(Type.Class c, String name, Type returnType, Type[] argTypes) {
+        super(c, name);
+        this.argTypes = argTypes;
+        this.returnType = returnType;
     }
-    MethodRef(MethodRef i) { super(i); }
     
-    static String getDescriptor(Type ret, Type[] args) {
-        StringBuffer sb = new StringBuffer(args.length*4);
+    public String getDescriptor() {
+        StringBuffer sb = new StringBuffer(argTypes.length*4);
         sb.append("(");
-        for(int i=0;i<args.length;i++) sb.append(args[i].getDescriptor());
+        for(int i=0;i<argTypes.length;i++) sb.append(argTypes[i].getDescriptor());
         sb.append(")");
-        sb.append(ret.getDescriptor());
+        sb.append(returnType.getDescriptor());
         return sb.toString();
     }
-    
-    /** MethodRef class used for the INVOKEINTERFACE bytecode. Although this contains the same
-        data as a normal MethodRef, these are treated differently in the byte code format. In general,
-        users don't need to be concerned with this though because MethodRef's are automatically converted
-        to MethodRef.I's when they are applied to an INVOKEINTERFACE bytecode */
-    public static class I extends MethodRef {
-        public I(Type.Object c, String name, Type ret, Type[] args) { super(c,name,ret,args); }
-        public I(String s, String name, Type ret, Type[] args) { super(s,name,ret,args); }
-        I(MethodRef m) { super(m); }
-    }
 }