From 4844910be8170dc35fb1b993bb2c9e7e6d7d15e6 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 3 Jun 2005 04:11:54 +0000 Subject: [PATCH] renamed Type.fromDescriptor() to Type.instance() darcs-hash:20050603041154-5007d-55bab0641ed0c19724691ec93d29814044876f78.gz --- src/org/ibex/classgen/CPGen.java | 6 +++--- src/org/ibex/classgen/ClassGen.java | 2 +- src/org/ibex/classgen/FieldRef.java | 2 +- src/org/ibex/classgen/MethodGen.java | 2 +- src/org/ibex/classgen/MethodRef.java | 2 +- src/org/ibex/classgen/Type.java | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/org/ibex/classgen/CPGen.java b/src/org/ibex/classgen/CPGen.java index 8ac9e7f..d249bfd 100644 --- a/src/org/ibex/classgen/CPGen.java +++ b/src/org/ibex/classgen/CPGen.java @@ -87,11 +87,11 @@ class CPGen { private String fixme() { throw new Error("fixme"); } Object key() throws ClassGen.ClassReadExn { switch(tag) { - case 7: return Type.fromDescriptor(((Utf8Ent)e1).s); + case 7: return Type.instance(((Utf8Ent)e1).s); case 8: return (((Utf8Ent)e1).s); case 9: { NameAndTypeKey nt = (NameAndTypeKey) e2.key(); - Type t = Type.fromDescriptor(nt.type); + Type t = Type.instance(nt.type); if(t == null) throw new ClassGen.ClassReadExn("invalid type descriptor"); return new FieldRef((Type.Class)e1.key(), nt.name, t); } @@ -166,7 +166,7 @@ class CPGen { public final Type getType(int index) throws ClassGen.ClassReadExn { Ent e = getByIndex(index); - if (e instanceof Utf8Ent) return Type.fromDescriptor(((Utf8Ent)e).s); + if (e instanceof Utf8Ent) return Type.instance(((Utf8Ent)e).s); else return (Type)e.key(); } diff --git a/src/org/ibex/classgen/ClassGen.java b/src/org/ibex/classgen/ClassGen.java index e336723..39bd113 100644 --- a/src/org/ibex/classgen/ClassGen.java +++ b/src/org/ibex/classgen/ClassGen.java @@ -62,7 +62,7 @@ public class ClassGen implements CGConst { /** @see #ClassGen(Type.Class, Type.Class, int) */ public ClassGen(String name, String superName, int flags) { - this(Type.fromDescriptor(name).asClass(), Type.fromDescriptor(superName).asClass(), flags); + this(Type.instance(name).asClass(), Type.instance(superName).asClass(), flags); } /** @see #ClassGen(Type.Class, Type.Class, int, Type.Class[]) */ diff --git a/src/org/ibex/classgen/FieldRef.java b/src/org/ibex/classgen/FieldRef.java index 9a4b790..62460e1 100644 --- a/src/org/ibex/classgen/FieldRef.java +++ b/src/org/ibex/classgen/FieldRef.java @@ -13,5 +13,5 @@ public class FieldRef extends ClassGen.FieldOrMethodRef { /** Equivalent to FieldRef(new Type.Class(s), ...) @see #FieldRef(Type.Class, String, Type, ) */ - public FieldRef(String s, String name, Type t) { this(Type.fromDescriptor(s).asClass(), name, t); } + public FieldRef(String s, String name, Type t) { this(Type.instance(s).asClass(), name, t); } } diff --git a/src/org/ibex/classgen/MethodGen.java b/src/org/ibex/classgen/MethodGen.java index 632fc79..2fde5d3 100644 --- a/src/org/ibex/classgen/MethodGen.java +++ b/src/org/ibex/classgen/MethodGen.java @@ -55,7 +55,7 @@ public class MethodGen implements CGConst { name = cp.getUtf8ByIndex(in.readShort()); String descriptor = cp.getUtf8ByIndex(in.readShort()); String ret = descriptor.substring(descriptor.indexOf(')')+1); - this.ret = Type.fromDescriptor(ret); + this.ret = Type.instance(ret); //String args = descriptor.substring(1, descriptor.indexOf(')')); args = new Type[0]; // FIXME codeAttrs = null; diff --git a/src/org/ibex/classgen/MethodRef.java b/src/org/ibex/classgen/MethodRef.java index 6460280..2f69e9a 100644 --- a/src/org/ibex/classgen/MethodRef.java +++ b/src/org/ibex/classgen/MethodRef.java @@ -17,7 +17,7 @@ public class MethodRef extends ClassGen.FieldOrMethodRef { @see #MethodRef(Type.Class, String, Type, Type[]) */ public MethodRef(String s, String name, Type ret, Type[] args) { - this(Type.fromDescriptor(s).asClass(), name, ret, args); + this(Type.instance(s).asClass(), name, ret, args); } MethodRef(MethodRef i) { super(i); } diff --git a/src/org/ibex/classgen/Type.java b/src/org/ibex/classgen/Type.java index bc6160c..a8a68d8 100644 --- a/src/org/ibex/classgen/Type.java +++ b/src/org/ibex/classgen/Type.java @@ -30,10 +30,10 @@ public class Type { public static final Type[] NO_ARGS = new Type[0]; /** guarantee: there will only be one instance of Type for a given descriptor ==> equals() and == are interchangeable */ - public static Type fromDescriptor(String d) { + public static Type instance(String d) { Type ret = (Type)instances.get(d); if (ret != null) return ret; - if (d.endsWith("[")) return new Type.Array(fromDescriptor(d.substring(d.length()-1))); + if (d.endsWith("[")) return new Type.Array(instance(d.substring(d.length()-1))); return new Type.Class(d); } @@ -42,7 +42,7 @@ public class Type { public int hashCode() { return descriptor.hashCode(); } public boolean equals(java.lang.Object o) { return this==o; } - public Type.Array makeArray() { return (Type.Array)fromDescriptor(descriptor+"["); } + public Type.Array makeArray() { return (Type.Array)instance(descriptor+"["); } public Type.Ref asRef() { throw new RuntimeException("attempted to use "+this+" as a Type.Ref, which it is not"); } public Type.Class asClass() { throw new RuntimeException("attempted to use "+this+" as a Type.Class, which it is not"); } -- 1.7.10.4