X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fclassgen%2FType.java;h=af3da6bf3c353af64dce129060b634ee7da2eb38;hb=81fd22a1bc8c3117a5279da19fd3443976d03095;hp=491cc1227a2194dee33741d1f7e929f441d684ae;hpb=69b2d27ebab56f1b0e4df2a3a301f4d852439e8e;p=org.ibex.classgen.git
diff --git a/src/org/ibex/classgen/Type.java b/src/org/ibex/classgen/Type.java
index 491cc12..af3da6b 100644
--- a/src/org/ibex/classgen/Type.java
+++ b/src/org/ibex/classgen/Type.java
@@ -38,6 +38,7 @@ public class Type {
}
public String toString() { return toString; }
+ public String debugToString() { return toString; }
public final String getDescriptor() { return descriptor; }
public int hashCode() { return descriptor.hashCode(); }
public boolean equals(java.lang.Object o) { return this==o; }
@@ -69,6 +70,13 @@ public class Type {
public boolean isRef() { return true; }
}
+ public static class Array extends Type.Ref {
+ protected Array(Type t) { super("[" + t.getDescriptor(), t.toString() + "[]"); }
+ public Type.Array asArray() { return this; }
+ public boolean isArray() { return true; }
+ public int dimension() { return getDescriptor().lastIndexOf('['); }
+ }
+
public static class Class extends Type.Ref {
protected Class(String s) { super(_initHelper(s), _initHelper2(s)); }
public Type.Class asClass() { return this; }
@@ -90,8 +98,33 @@ public class Type {
return a;
}
- public Method method(String name, Type returnType, Type[] argTypes) { return new Method(name, returnType, argTypes); }
public Field field(String name, Type type) { return new Field(name, type); }
+ public Method method(String name, Type returnType, Type[] argTypes) { return new Method(name, returnType, argTypes); }
+ public Method method(String signature) {
+ // FEATURE: This parser is ugly but it works (and shouldn't be a problem) might want to clean it up though
+ String s = signature;
+ String name = s.startsWith("(") ? "" : s.substring(0, s.indexOf('('));
+ s = s.substring(s.indexOf('('));
+ int p = s.indexOf(')');
+ if(p == -1) throw new IllegalArgumentException("invalid method type descriptor");
+ String argsDesc = s.substring(1,p);
+ String retDesc = s.substring(p+1);
+ Type[] argsBuf = new Type[argsDesc.length()];
+ int i;
+ for(i=0,p=0;argsDesc.length() > 0;i++,p=0) {
+ while(p < argsDesc.length() && argsDesc.charAt(p) == '[') p++;
+ if(p == argsDesc.length()) throw new IllegalArgumentException("invalid method type descriptor");
+ if(argsDesc.charAt(p) == 'L') {
+ p = argsDesc.indexOf(';');
+ if(p == -1) throw new IllegalArgumentException("invalid method type descriptor");
+ }
+ argsBuf[i] = Type.instance(argsDesc.substring(0,p+1));
+ argsDesc = argsDesc.substring(p+1);
+ }
+ Type args[] = new Type[i];
+ System.arraycopy(argsBuf,0,args,0,i);
+ return method(name, Type.instance(retDesc), args);
+ }
public abstract class Member {
public final String name;
@@ -109,7 +142,6 @@ public class Type {
}
public class Field extends Member {
- /** Create a reference to field name of class c with the type t */
public final Type type;
private Field(String name, Type t) { super(name); this.type = t; }
public String getDescriptor() { return name; }
@@ -117,7 +149,9 @@ public class Type {
public class Method extends Member {
final Type[] argTypes;
- final Type returnType;
+ public final Type returnType;
+ public Type getArgType(int i) { return argTypes[i]; }
+ public int getNumArgs() { return argTypes.length; }
private Method(String name, Type returnType, Type[] argTypes) {
super(name);
this.argTypes = argTypes;
@@ -132,14 +166,16 @@ public class Type {
return sb.toString();
}
}
-
- }
-
- public static class Array extends Type.Ref {
- protected Array(Type t) { super("[" + t.getDescriptor(), t.toString() + "[]"); }
- public Type.Array asArray() { return this; }
- public boolean isArray() { return true; }
- public int dimension() { return getDescriptor().lastIndexOf('['); }
+ }
+
+ // FEATURE: This probably isn't the best place for these
+ static String methodTypeDescriptor(Type[] argTypes, Type returnType) {
+ StringBuffer sb = new StringBuffer(argTypes.length*4);
+ sb.append("(");
+ for(int i=0;i