From 6d02ca13f481e213ee0ae26f7acdd40b20dfc6af Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 27 Jun 2005 08:17:49 +0000 Subject: [PATCH] mass rename: ACC_FOO darcs-hash:20050627081749-5007d-0809071d4e8aef3f76eb7ff5fa7c52b39fcca3ad.gz --- Makefile | 2 +- src/org/ibex/classgen/CGConst.java | 26 ++++++++++----------- src/org/ibex/classgen/ClassFile.java | 42 +++++++++++++++++----------------- src/org/ibex/classgen/FieldGen.java | 6 ++--- src/org/ibex/classgen/MethodGen.java | 16 ++++++------- 5 files changed, 46 insertions(+), 46 deletions(-) diff --git a/Makefile b/Makefile index 4a9bb40..9a965e3 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ $(classes): $(sources) $(JAVAC) -d build $(sources) test: $(classes) - java -cp build org.ibex.classgen.ClassFile + java -cp build org.ibex.classgen.ClassFile org.ibex.classgen.ClassFile clean: rm -rf build/* diff --git a/src/org/ibex/classgen/CGConst.java b/src/org/ibex/classgen/CGConst.java index 6649e8b..d789292 100644 --- a/src/org/ibex/classgen/CGConst.java +++ b/src/org/ibex/classgen/CGConst.java @@ -3,27 +3,27 @@ package org.ibex.classgen; public interface CGConst { // Class only - public static final int ACC_INTERFACE = 0x0200; - public static final int ACC_SUPER = 0x0020; + public static final int INTERFACE = 0x0200; + public static final int SUPER = 0x0020; // Field/Method only - public static final int ACC_PUBLIC = 0x0001; - public static final int ACC_PRIVATE = 0x0002; - public static final int ACC_PROTECTED = 0x0004; - public static final int ACC_STATIC = 0x0008; - public static final int ACC_FINAL = 0x0010; + public static final int PUBLIC = 0x0001; + public static final int PRIVATE = 0x0002; + public static final int PROTECTED = 0x0004; + public static final int STATIC = 0x0008; + public static final int FINAL = 0x0010; // Class/Method only - public static final int ACC_ABSTRACT = 0x0400; + public static final int ABSTRACT = 0x0400; // Method Only - public static final int ACC_SYNCHRONIZED = 0x0020; - public static final int ACC_NATIVE = 0x0100; - public static final int ACC_STRICT = 0x0800; + public static final int SYNCHRONIZED = 0x0020; + public static final int NATIVE = 0x0100; + public static final int STRICT = 0x0800; // Field only - public static final int ACC_VOLATILE = 0x0040; - public static final int ACC_TRANSIENT = 0x0080; + public static final int VOLATILE = 0x0040; + public static final int TRANSIENT = 0x0080; // Constant Pool Stuff diff --git a/src/org/ibex/classgen/ClassFile.java b/src/org/ibex/classgen/ClassFile.java index dd2247c..8cb2853 100644 --- a/src/org/ibex/classgen/ClassFile.java +++ b/src/org/ibex/classgen/ClassFile.java @@ -19,17 +19,17 @@ public class ClassFile implements CGConst { static String flagsToString(int flags, boolean isClass) { StringBuffer sb = new StringBuffer(32); - if ((flags & ACC_PUBLIC) != 0) sb.append("public "); - if ((flags & ACC_PRIVATE) != 0) sb.append("private "); - if ((flags & ACC_PROTECTED) != 0) sb.append("protected "); - if ((flags & ACC_STATIC) != 0) sb.append("static "); - if ((flags & ACC_FINAL) != 0) sb.append("final "); - if ((flags & ACC_ABSTRACT) != 0) sb.append("abstract "); - if (!isClass && (flags & ACC_SYNCHRONIZED) != 0) sb.append("synchronized "); - if (!isClass && (flags & ACC_NATIVE) != 0) sb.append("native "); - if (!isClass && (flags & ACC_STRICT) != 0) sb.append("strictfp "); - if (!isClass && (flags & ACC_VOLATILE) != 0) sb.append("volatile "); - if (!isClass && (flags & ACC_TRANSIENT) != 0) sb.append("transient "); + if ((flags & PUBLIC) != 0) sb.append("public "); + if ((flags & PRIVATE) != 0) sb.append("private "); + if ((flags & PROTECTED) != 0) sb.append("protected "); + if ((flags & STATIC) != 0) sb.append("static "); + if ((flags & FINAL) != 0) sb.append("final "); + if ((flags & ABSTRACT) != 0) sb.append("abstract "); + if (!isClass && (flags & SYNCHRONIZED) != 0) sb.append("synchronized "); + if (!isClass && (flags & NATIVE) != 0) sb.append("native "); + if (!isClass && (flags & STRICT) != 0) sb.append("strictfp "); + if (!isClass && (flags & VOLATILE) != 0) sb.append("volatile "); + if (!isClass && (flags & TRANSIENT) != 0) sb.append("transient "); return sb.toString(); } @@ -38,7 +38,7 @@ public class ClassFile implements CGConst { String debugToString() { return debugToString(new StringBuffer(4096)).toString(); } StringBuffer debugToString(StringBuffer sb) { sb.append(flagsToString(flags,true)); - sb.append((flags & ACC_INTERFACE) != 0 ? "interface " : "class "); + sb.append((flags & INTERFACE) != 0 ? "interface " : "class "); sb.append(thisType.debugToString()); if (superType != null) sb.append(" extends " + superType.debugToString()); if (interfaces != null && interfaces.length > 0) sb.append(" implements"); @@ -63,7 +63,7 @@ public class ClassFile implements CGConst { public ClassFile(Type.Class thisType, Type.Class superType, int flags) { this(thisType, superType, flags, null); } public ClassFile(Type.Class thisType, Type.Class superType, int flags, Type.Class[] interfaces) { - if((flags & ~(ACC_PUBLIC|ACC_FINAL|ACC_SUPER|ACC_INTERFACE|ACC_ABSTRACT)) != 0) + if((flags & ~(PUBLIC|FINAL|SUPER|INTERFACE|ABSTRACT)) != 0) throw new IllegalArgumentException("invalid flags"); this.thisType = thisType; this.superType = superType; @@ -79,14 +79,14 @@ public class ClassFile implements CGConst { @param ret The return type of the method @param args The arguments to the method @param flags The flags for the method - (ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED, ACC_STATIC, ACC_SYNCHRONIZED, ACC_NATIVE, ACC_ABSTRACT, ACC_STRICT) + (PUBLIC, PRIVATE, PROTECTED, STATIC, SYNCHRONIZED, NATIVE, ABSTRACT, STRICT) @return A new MethodGen object for the method @exception IllegalArgumentException if illegal flags are specified @see MethodGen @see CGConst */ public final MethodGen addMethod(String name, Type ret, Type[] args, int flags) { - MethodGen mg = new MethodGen(this, name, ret, args, flags, (this.flags & ACC_INTERFACE) != 0); + MethodGen mg = new MethodGen(this, name, ret, args, flags, (this.flags & INTERFACE) != 0); methods.addElement(mg); return mg; } @@ -95,7 +95,7 @@ public class ClassFile implements CGConst { @param name The name of the filed (not the signature, just the name) @param type The type of the field @param flags The flags for the field - (ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED, ACC_STATIC, ACC_FINAL, ACC_VOLATILE, ACC_TRANSIENT) + (PUBLIC, PRIVATE, PROTECTED, STATIC, FINAL, VOLATILE, TRANSIENT) @return A new FieldGen object for the method @exception IllegalArgumentException if illegal flags are specified @see FieldGen @@ -206,7 +206,7 @@ public class ClassFile implements CGConst { major = i.readShort(); ConstantPool cp = new ConstantPool(i); flags = i.readShort(); - if((flags & ~(ACC_PUBLIC|ACC_FINAL|ACC_SUPER|ACC_INTERFACE|ACC_ABSTRACT)) != 0) + if((flags & ~(PUBLIC|FINAL|SUPER|INTERFACE|ABSTRACT)) != 0) throw new ClassReadExn("invalid flags: " + Integer.toString(flags,16)); thisType = (Type.Class) cp.getKeyByIndex(i.readShort()); superType = (Type.Class) cp.getKeyByIndex(i.readShort()); @@ -215,7 +215,7 @@ public class ClassFile implements CGConst { int numFields = i.readShort(); for(int j=0; j 0) attrs.put("Exceptions",""); attrs.finish(cp); codeAttrs.finish(cp); @@ -953,7 +953,7 @@ public class MethodGen implements CGConst { } void dump(DataOutput o, ConstantPool cp) throws IOException { - if((flags & (ACC_NATIVE|ACC_ABSTRACT))==0) generateCode(cp); + if((flags & (NATIVE|ABSTRACT))==0) generateCode(cp); generateExceptions(cp); o.writeShort(flags); -- 1.7.10.4