projects
/
org.ibex.classgen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
11cdbef
)
ditch debugToString
author
brian
<brian@brianweb.net>
Sun, 3 Jul 2005 19:40:16 +0000
(19:40 +0000)
committer
brian
<brian@brianweb.net>
Sun, 3 Jul 2005 19:40:16 +0000
(19:40 +0000)
darcs-hash:
20050703194016
-24bed-
a6e356f93ef17f0e5a85ffa5e48e6d8a6f2cd202
.gz
src/org/ibex/classgen/ClassFile.java
patch
|
blob
|
history
src/org/ibex/classgen/ConstantPool.java
patch
|
blob
|
history
src/org/ibex/classgen/FieldGen.java
patch
|
blob
|
history
src/org/ibex/classgen/JSSA.java
patch
|
blob
|
history
src/org/ibex/classgen/MethodGen.java
patch
|
blob
|
history
src/org/ibex/classgen/Type.java
patch
|
blob
|
history
diff --git
a/src/org/ibex/classgen/ClassFile.java
b/src/org/ibex/classgen/ClassFile.java
index
036f923
..
3739114
100644
(file)
--- a/
src/org/ibex/classgen/ClassFile.java
+++ b/
src/org/ibex/classgen/ClassFile.java
@@
-45,14
+45,14
@@
public class ClassFile extends Type.Class.Body {
public Type.Class getType() { return thisType; }
public int getFlags() { return flags; }
public Type.Class getType() { return thisType; }
public int getFlags() { return flags; }
- String debugToString() { return debugToString(new StringBuffer(4096)).toString(); }
- StringBuffer debugToString(StringBuffer sb) {
+ public String toString() { return toString(new StringBuffer(4096)).toString(); }
+ StringBuffer toString(StringBuffer sb) {
sb.append(flagsToString(flags,true));
sb.append((flags & INTERFACE) != 0 ? "interface " : "class ");
sb.append(flagsToString(flags,true));
sb.append((flags & INTERFACE) != 0 ? "interface " : "class ");
- sb.append(thisType.debugToString());
- if (superType != null) sb.append(" extends " + superType.debugToString());
+ sb.append(thisType.toString());
+ if (superType != null) sb.append(" extends " + superType.toString());
if (interfaces != null && interfaces.length > 0) sb.append(" implements");
if (interfaces != null && interfaces.length > 0) sb.append(" implements");
- for(int i=0; i<interfaces.length; i++) sb.append((i==0?" ":", ")+interfaces[i].debugToString());
+ for(int i=0; i<interfaces.length; i++) sb.append((i==0?" ":", ")+interfaces[i].toString());
sb.append(" {");
sb.append(" // v"+major+"."+minor);
ConstantPool.Utf8Key sourceFile = (ConstantPool.Utf8Key) attrs.get("SourceFile");
sb.append(" {");
sb.append(" // v"+major+"."+minor);
ConstantPool.Utf8Key sourceFile = (ConstantPool.Utf8Key) attrs.get("SourceFile");
@@
-60,11
+60,11
@@
public class ClassFile extends Type.Class.Body {
sb.append("\n");
for(int i=0; i<fields.size(); i++) {
sb.append(" ");
sb.append("\n");
for(int i=0; i<fields.size(); i++) {
sb.append(" ");
- ((FieldGen)fields.elementAt(i)).debugToString(sb);
+ ((FieldGen)fields.elementAt(i)).toString(sb);
sb.append("\n");
}
for(int i=0; i<methods.size(); i++) {
sb.append("\n");
}
for(int i=0; i<methods.size(); i++) {
- ((MethodGen)methods.elementAt(i)).debugToString(sb,thisType.getShortName());
+ ((MethodGen)methods.elementAt(i)).toString(sb,thisType.getShortName());
sb.append("\n");
}
sb.append("}");
sb.append("\n");
}
sb.append("}");
@@
-312,10
+312,10
@@
public class ClassFile extends Type.Class.Body {
}
else if (args.length==1) {
if (args[0].endsWith(".class")) {
}
else if (args.length==1) {
if (args[0].endsWith(".class")) {
- System.out.println(new ClassFile(new DataInputStream(new FileInputStream(args[0]))).debugToString());
+ System.out.println(new ClassFile(new DataInputStream(new FileInputStream(args[0]))).toString());
} else {
InputStream is = Class.forName(args[0]).getClassLoader().getResourceAsStream(args[0].replace('.', '/')+".class");
} else {
InputStream is = Class.forName(args[0]).getClassLoader().getResourceAsStream(args[0].replace('.', '/')+".class");
- System.out.println(new ClassFile(new DataInputStream(is)).debugToString());
+ System.out.println(new ClassFile(new DataInputStream(is)).toString());
}
} else {
/*
}
} else {
/*
diff --git
a/src/org/ibex/classgen/ConstantPool.java
b/src/org/ibex/classgen/ConstantPool.java
index
967d317
..
bdfddf0
100644
(file)
--- a/
src/org/ibex/classgen/ConstantPool.java
+++ b/
src/org/ibex/classgen/ConstantPool.java
@@
-23,7
+23,6
@@
class ConstantPool implements CGConst {
Object key;
Ent(int tag) { this.tag = tag; }
void dump(DataOutput o) throws IOException { o.writeByte(tag); }
Object key;
Ent(int tag) { this.tag = tag; }
void dump(DataOutput o) throws IOException { o.writeByte(tag); }
- String debugToString() { return toString(); } // so we can remove this method when not debugging
abstract Object _key();
final Object key() { return key == null ? (key = _key()) : key; }
int slots() { return 1; } // number of slots this ent takes up
abstract Object _key();
final Object key() { return key == null ? (key = _key()) : key; }
int slots() { return 1; } // number of slots this ent takes up
@@
-41,7
+40,7
@@
class ConstantPool implements CGConst {
String s;
Utf8Ent() { super(CONSTANT_UTF8); }
Utf8Ent(String s) { this(); this.s = s; }
String s;
Utf8Ent() { super(CONSTANT_UTF8); }
Utf8Ent(String s) { this(); this.s = s; }
- String debugToString() { return s; }
+ public String toString() { return s; }
void dump(DataOutput o) throws IOException { super.dump(o); o.writeUTF(s); }
Object _key() { return new Utf8Key(s); }
}
void dump(DataOutput o) throws IOException { super.dump(o); o.writeUTF(s); }
Object _key() { return new Utf8Key(s); }
}
@@
-88,7
+87,7
@@
class ConstantPool implements CGConst {
Type.Class getTypeClass() { return (Type.Class) key(); }
Object _key() { return Type.Class.instance(utf8.s); }
void unref() { utf8.unref(); super.unref(); }
Type.Class getTypeClass() { return (Type.Class) key(); }
Object _key() { return Type.Class.instance(utf8.s); }
void unref() { utf8.unref(); super.unref(); }
- String debugToString() { return "[Class: " + utf8.s + "]"; }
+ public String toString() { return "[Class: " + utf8.s + "]"; }
}
class NameAndTypeEnt extends Ent {
}
class NameAndTypeEnt extends Ent {
@@
-196,7
+195,7
@@
class ConstantPool implements CGConst {
String getUtf8KeyByIndex(int index) {
Ent e = getByIndex(index);
String getUtf8KeyByIndex(int index) {
Ent e = getByIndex(index);
- if(!(e instanceof Utf8Ent)) throw new IllegalArgumentException("that isn't a utf8 (" + e.debugToString() + ")");
+ if(!(e instanceof Utf8Ent)) throw new IllegalArgumentException("that isn't a utf8 (" + e.toString() + ")");
return ((Utf8Ent)e).s;
}
return ((Utf8Ent)e).s;
}
@@
-309,7
+308,7
@@
class ConstantPool implements CGConst {
Sort.sort(ents, compareFunc);
o.writeShort(usedSlots);
for(int i=0;i<ents.length;i++) {
Sort.sort(ents, compareFunc);
o.writeShort(usedSlots);
for(int i=0;i<ents.length;i++) {
- //System.err.println("" + ents[i].n + ": " + ents[i].debugToString());
+ //System.err.println("" + ents[i].n + ": " + ents[i].toString());
ents[i].dump(o);
}
}
ents[i].dump(o);
}
}
diff --git
a/src/org/ibex/classgen/FieldGen.java
b/src/org/ibex/classgen/FieldGen.java
index
3640834
..
0fa6069
100644
(file)
--- a/
src/org/ibex/classgen/FieldGen.java
+++ b/
src/org/ibex/classgen/FieldGen.java
@@
-6,9
+6,9
@@
import java.io.*;
@see ClassFile#addField */
public class FieldGen extends Type.Class.Field.Body {
@see ClassFile#addField */
public class FieldGen extends Type.Class.Field.Body {
- StringBuffer debugToString(StringBuffer sb) {
+ StringBuffer toString(StringBuffer sb) {
sb.append(ClassFile.flagsToString(flags, false));
sb.append(ClassFile.flagsToString(flags, false));
- sb.append(getField().getType().debugToString());
+ sb.append(getField().getType().toString());
sb.append(" ");
sb.append(getField().getName());
if (attrs.contains("ConstantValue")) sb.append(" = \"").append(attrs.get("ConstantValue")).append("\"");
sb.append(" ");
sb.append(getField().getName());
if (attrs.contains("ConstantValue")) sb.append(" = \"").append(attrs.get("ConstantValue")).append("\"");
diff --git
a/src/org/ibex/classgen/JSSA.java
b/src/org/ibex/classgen/JSSA.java
index
376324a
..
23c88bc
100644
(file)
--- a/
src/org/ibex/classgen/JSSA.java
+++ b/
src/org/ibex/classgen/JSSA.java
@@
-526,6
+526,6
@@
public class JSSA extends MethodGen implements CGConst {
public static void main(String[] args) throws Exception {
InputStream is = Class.forName(args[0]).getClassLoader().getResourceAsStream(args[0].replace('.', '/')+".class");
public static void main(String[] args) throws Exception {
InputStream is = Class.forName(args[0]).getClassLoader().getResourceAsStream(args[0].replace('.', '/')+".class");
- System.out.println(new ClassFile(new DataInputStream(is), true).debugToString());
+ System.out.println(new ClassFile(new DataInputStream(is), true).toString());
}
}
}
}
diff --git
a/src/org/ibex/classgen/MethodGen.java
b/src/org/ibex/classgen/MethodGen.java
index
94f0fad
..
e8e2a4f
100644
(file)
--- a/
src/org/ibex/classgen/MethodGen.java
+++ b/
src/org/ibex/classgen/MethodGen.java
@@
-996,8
+996,8
@@
public class MethodGen extends Type.Class.Method.Body {
sb.append(i).append(": ");
sb.append(OP_NAMES[op[i]&0xff]);
String s = null;
sb.append(i).append(": ");
sb.append(OP_NAMES[op[i]&0xff]);
String s = null;
- if (arg[i] instanceof Type) s = ((Type)arg[i]).debugToString();
- else if (arg[i] instanceof Type.Class.Member) s = ((Type.Class.Member)arg[i]).debugToString();
+ 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] != null) s = arg[i].toString();
if (s != null) sb.append(" ").append(s);
else if (arg[i] instanceof String) s = "\"" + s + "\"";
else if (arg[i] != null) s = arg[i].toString();
if (s != null) sb.append(" ").append(s);
diff --git
a/src/org/ibex/classgen/Type.java
b/src/org/ibex/classgen/Type.java
index
491e3bb
..
9e30f19
100644
(file)
--- a/
src/org/ibex/classgen/Type.java
+++ b/
src/org/ibex/classgen/Type.java
@@
-40,9
+40,6
@@
public abstract class Type implements CGConst {
return new Type.Class(d);
}
return new Type.Class(d);
}
- public final String toString() { return super.toString(); }
- public abstract String debugToString();
-
public final String getDescriptor() { return descriptor; }
public Type.Array makeArray() { return (Type.Array)Type.fromDescriptor("["+descriptor); }
public final String getDescriptor() { return descriptor; }
public Type.Array makeArray() { return (Type.Array)Type.fromDescriptor("["+descriptor); }
@@
-71,13
+68,13
@@
public abstract class Type implements CGConst {
super(descriptor);
this.humanReadable = humanReadable;
}
super(descriptor);
this.humanReadable = humanReadable;
}
- public String debugToString() { return humanReadable; }
+ public String toString() { return humanReadable; }
public boolean isPrimitive() { return true; }
}
public abstract static class Ref extends Type {
protected Ref(String descriptor) { super(descriptor); }
public boolean isPrimitive() { return true; }
}
public abstract static class Ref extends Type {
protected Ref(String descriptor) { super(descriptor); }
- public abstract String debugToString();
+ public abstract String toString();
public Type.Ref asRef() { return this; }
public boolean isRef() { return true; }
}
public Type.Ref asRef() { return this; }
public boolean isRef() { return true; }
}
@@
-87,7
+84,7
@@
public abstract class Type implements CGConst {
protected Array(Type t) { super("[" + t.getDescriptor()); base = t; }
public Type.Array asArray() { return this; }
public boolean isArray() { return true; }
protected Array(Type t) { super("[" + t.getDescriptor()); base = t; }
public Type.Array asArray() { return this; }
public boolean isArray() { return true; }
- public String debugToString() { return base.debugToString() + "[]"; }
+ public String toString() { return base.toString() + "[]"; }
public Type getElementType() { return Type.fromDescriptor(getDescriptor().substring(0, getDescriptor().length()-1)); }
}
public Type getElementType() { return Type.fromDescriptor(getDescriptor().substring(0, getDescriptor().length()-1)); }
}
@@
-111,7
+108,7
@@
public abstract class Type implements CGConst {
return cf.superType.extendsOrImplements(c, cx);
}
String internalForm() { return descriptor.substring(1, descriptor.length()-1); }
return cf.superType.extendsOrImplements(c, cx);
}
String internalForm() { return descriptor.substring(1, descriptor.length()-1); }
- public String debugToString() { return internalForm().replace('/','.'); }
+ public String toString() { return internalForm().replace('/','.'); }
public String getName() { return internalForm().replace('/','.'); }
public String getShortName() {
int p = descriptor.lastIndexOf('/');
public String getName() { return internalForm().replace('/','.'); }
public String getShortName() {
int p = descriptor.lastIndexOf('/');
@@
-177,7
+174,7
@@
public abstract class Type implements CGConst {
public Type.Class getDeclaringClass() { return Type.Class.this; }
public String getName() { return name; }
public abstract String getTypeDescriptor();
public Type.Class getDeclaringClass() { return Type.Class.this; }
public String getName() { return name; }
public abstract String getTypeDescriptor();
- public abstract String debugToString();
+ public abstract String toString();
}
public class Field extends Member {
}
public class Field extends Member {
@@
-185,7
+182,7
@@
public abstract class Type implements CGConst {
private Field(String name, Type t) { super(name); this.type = t; }
public String getTypeDescriptor() { return type.getDescriptor(); }
public Type getType() { return type; }
private Field(String name, Type t) { super(name); this.type = t; }
public String getTypeDescriptor() { return type.getDescriptor(); }
public Type getType() { return type; }
- public String debugToString() { return getDeclaringClass().debugToString()+"."+name+"["+type.debugToString()+"]"; }
+ public String toString() { return getDeclaringClass().toString()+"."+name+"["+type.toString()+"]"; }
public class Body extends HasAttributes {
public Field getField() { return Field.this; }
public Body(int flags, ClassFile.AttrGen attrs) {
public class Body extends HasAttributes {
public Field getField() { return Field.this; }
public Body(int flags, ClassFile.AttrGen attrs) {
@@
-208,17
+205,17
@@
public abstract class Type implements CGConst {
}
public boolean isConstructor() { return getName().equals("<init>"); }
public boolean isClassInitializer() { return getName().equals("<clinit>"); }
}
public boolean isConstructor() { return getName().equals("<init>"); }
public boolean isClassInitializer() { return getName().equals("<clinit>"); }
- public String debugToString() {
+ public String toString() {
StringBuffer sb = new StringBuffer();
if (name.equals("<clinit>")) sb.append("static ");
else {
if (name.equals("<init>"))
sb.append(Class.this.getShortName());
else
StringBuffer sb = new StringBuffer();
if (name.equals("<clinit>")) sb.append("static ");
else {
if (name.equals("<init>"))
sb.append(Class.this.getShortName());
else
- sb.append(returnType.debugToString()).append(".").append(name);
+ sb.append(returnType.toString()).append(".").append(name);
sb.append("(");
for(int i=0; i<argTypes.length; i++)
sb.append("(");
for(int i=0; i<argTypes.length; i++)
- sb.append((i==0?"":", ")+argTypes[i].debugToString());
+ sb.append((i==0?"":", ")+argTypes[i].toString());
sb.append(") ");
}
return sb.toString();
sb.append(") ");
}
return sb.toString();
@@
-245,15
+242,15
@@
public abstract class Type implements CGConst {
super(flags, attrs);
if ((flags & ~VALID_METHOD_FLAGS) != 0) throw new IllegalArgumentException("invalid flags");
}
super(flags, attrs);
if ((flags & ~VALID_METHOD_FLAGS) != 0) throw new IllegalArgumentException("invalid flags");
}
- public void debugToString(StringBuffer sb, String constructorName) {
+ public void toString(StringBuffer sb, String constructorName) {
int flags = getFlags();
sb.append(" ").append(ClassFile.flagsToString(flags,false));
int flags = getFlags();
sb.append(" ").append(ClassFile.flagsToString(flags,false));
- sb.append(Method.this.debugToString());
+ sb.append(Method.this.toString());
java.util.Hashtable thrownExceptions = getThrownExceptions();
if (thrownExceptions.size() > 0) {
sb.append("throws");
for(java.util.Enumeration e = thrownExceptions.keys();e.hasMoreElements();)
java.util.Hashtable thrownExceptions = getThrownExceptions();
if (thrownExceptions.size() > 0) {
sb.append("throws");
for(java.util.Enumeration e = thrownExceptions.keys();e.hasMoreElements();)
- sb.append(" ").append(((Type.Class)e.nextElement()).debugToString()).append(",");
+ sb.append(" ").append(((Type.Class)e.nextElement()).toString()).append(",");
sb.setLength(sb.length()-1);
sb.append(" ");
}
sb.setLength(sb.length()-1);
sb.append(" ");
}