projects
/
org.ibex.classgen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Member.getDescriptor
[org.ibex.classgen.git]
/
src
/
org
/
ibex
/
classgen
/
ConstantPool.java
diff --git
a/src/org/ibex/classgen/ConstantPool.java
b/src/org/ibex/classgen/ConstantPool.java
index
eb2a565
..
eb2497d
100644
(file)
--- a/
src/org/ibex/classgen/ConstantPool.java
+++ b/
src/org/ibex/classgen/ConstantPool.java
@@
-123,10
+123,10
@@
class ConstantPool implements CGConst {
if(member.name == null) throw new Error("should never happen");
switch(tag) {
case CONSTANT_FIELDREF:
if(member.name == null) throw new Error("should never happen");
switch(tag) {
case CONSTANT_FIELDREF:
- return klass.getTypeClass().field(member.name.s, Type.instance(member.type.s));
+ return klass.getTypeClass().field(member.name.s, member.type.s);
case CONSTANT_METHODREF:
case CONSTANT_INTERFACEMETHODREF:
case CONSTANT_METHODREF:
case CONSTANT_INTERFACEMETHODREF:
- Type.Class.Method m = klass.getTypeClass().method(member.name.s + member.type.s);
+ Type.Class.Method m = klass.getTypeClass().method(member.name.s,member.type.s);
return tag == CONSTANT_INTERFACEMETHODREF ? (Object) new InterfaceMethodKey(m) : (Object) m;
default:
throw new Error("should never happen");
return tag == CONSTANT_INTERFACEMETHODREF ? (Object) new InterfaceMethodKey(m) : (Object) m;
default:
throw new Error("should never happen");
@@
-236,7
+236,7
@@
class ConstantPool implements CGConst {
: m instanceof Type.Class.Method ? CONSTANT_METHODREF
: 0;
if (tag == 0) throw new Error("should never happen");
: m instanceof Type.Class.Method ? CONSTANT_METHODREF
: 0;
if (tag == 0) throw new Error("should never happen");
- ent = new MemberEnt(tag, m.getDeclaringClass(), m.name, m.getDescriptor());
+ ent = new MemberEnt(tag, m.getDeclaringClass(), m.name, m.getTypeDescriptor());
}
else {
throw new IllegalArgumentException("Unknown type passed to add");
}
else {
throw new IllegalArgumentException("Unknown type passed to add");