diff options
Diffstat (limited to 'bcel-builder/src/main/java/org/aspectj/apache')
11 files changed, 870 insertions, 870 deletions
diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/Constants.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/Constants.java index 03fda5d89..96fdfdf6f 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/Constants.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/Constants.java @@ -64,116 +64,116 @@ import org.aspectj.apache.bcel.generic.Type; */ public interface Constants { // Major and minor version of the code - public final static short MAJOR_1_1 = 45; - public final static short MINOR_1_1 = 3; - public final static short MAJOR_1_2 = 46; - public final static short MINOR_1_2 = 0; - public final static short MAJOR_1_3 = 47; - public final static short MINOR_1_3 = 0; - public final static short MAJOR_1_4 = 48; - public final static short MINOR_1_4 = 0; - public final static short MAJOR_1_5 = 49; - public final static short MINOR_1_5 = 0; - public final static short MAJOR_1_6 = 50; - public final static short MINOR_1_6 = 0; - public final static short MAJOR_1_7 = 51; - public final static short MINOR_1_7 = 0; - public final static short MAJOR_1_8 = 52; - public final static short MINOR_1_8 = 0; - public final static short MAJOR_1_9 = 53; - public final static short MINOR_1_9 = 0; - public final static short MAJOR_10 = 54; - public final static short MINOR_10 = 0; - public final static short MAJOR_11 = 55; - public final static short MINOR_11 = 0; - public final static short MAJOR_12 = 56; - public final static short MINOR_12 = 0; - public final static short MAJOR_13 = 57; - public final static short MINOR_13 = 0; - public final static short MAJOR_14 = 58; - public final static short MINOR_14 = 0; - - public final static int PREVIEW_MINOR_VERSION = 65535; + short MAJOR_1_1 = 45; + short MINOR_1_1 = 3; + short MAJOR_1_2 = 46; + short MINOR_1_2 = 0; + short MAJOR_1_3 = 47; + short MINOR_1_3 = 0; + short MAJOR_1_4 = 48; + short MINOR_1_4 = 0; + short MAJOR_1_5 = 49; + short MINOR_1_5 = 0; + short MAJOR_1_6 = 50; + short MINOR_1_6 = 0; + short MAJOR_1_7 = 51; + short MINOR_1_7 = 0; + short MAJOR_1_8 = 52; + short MINOR_1_8 = 0; + short MAJOR_1_9 = 53; + short MINOR_1_9 = 0; + short MAJOR_10 = 54; + short MINOR_10 = 0; + short MAJOR_11 = 55; + short MINOR_11 = 0; + short MAJOR_12 = 56; + short MINOR_12 = 0; + short MAJOR_13 = 57; + short MINOR_13 = 0; + short MAJOR_14 = 58; + short MINOR_14 = 0; + + int PREVIEW_MINOR_VERSION = 65535; // Defaults - public final static short MAJOR = MAJOR_1_1; - public final static short MINOR = MINOR_1_1; + short MAJOR = MAJOR_1_1; + short MINOR = MINOR_1_1; /** Maximum value for an unsigned short */ - public final static int MAX_SHORT = 65535; // 2^16 - 1 + int MAX_SHORT = 65535; // 2^16 - 1 /** Maximum value for an unsigned byte */ - public final static int MAX_BYTE = 255; // 2^8 - 1 + int MAX_BYTE = 255; // 2^8 - 1 /** Access flags for classes, fields and methods */ - public final static short ACC_PUBLIC = 0x0001; - public final static short ACC_PRIVATE = 0x0002; - public final static short ACC_PROTECTED = 0x0004; - public final static short ACC_STATIC = 0x0008; + short ACC_PUBLIC = 0x0001; + short ACC_PRIVATE = 0x0002; + short ACC_PROTECTED = 0x0004; + short ACC_STATIC = 0x0008; - public final static short ACC_FINAL = 0x0010; - public final static short ACC_SYNCHRONIZED = 0x0020; - public final static short ACC_VOLATILE = 0x0040; - public final static short ACC_TRANSIENT = 0x0080; + short ACC_FINAL = 0x0010; + short ACC_SYNCHRONIZED = 0x0020; + short ACC_VOLATILE = 0x0040; + short ACC_TRANSIENT = 0x0080; - public final static short ACC_NATIVE = 0x0100; - public final static short ACC_INTERFACE = 0x0200; - public final static short ACC_ABSTRACT = 0x0400; - public final static short ACC_STRICT = 0x0800; + short ACC_NATIVE = 0x0100; + short ACC_INTERFACE = 0x0200; + short ACC_ABSTRACT = 0x0400; + short ACC_STRICT = 0x0800; - public final static short ACC_SYNTHETIC = 0x1000; + short ACC_SYNTHETIC = 0x1000; - public final static short ACC_ANNOTATION = 0x2000; - public final static short ACC_ENUM = 0x4000; - public final static int ACC_MODULE = 0x8000; - public final static short ACC_BRIDGE = 0x0040; - public final static short ACC_VARARGS = 0x0080; + short ACC_ANNOTATION = 0x2000; + short ACC_ENUM = 0x4000; + int ACC_MODULE = 0x8000; + short ACC_BRIDGE = 0x0040; + short ACC_VARARGS = 0x0080; // Module related // Indicates that any module which depends on the current module, // implicitly declares a dependence on the module indicated by this entry. - public final static int MODULE_ACC_TRANSITIVE = 0x0020; + int MODULE_ACC_TRANSITIVE = 0x0020; // Indicates that this dependence is mandatory in the static phase, i.e., at // compile time, but is optional in the dynamic phase, i.e., at run time. - public final static int MODULE_ACC_STATIC_PHASE = 0x0040; + int MODULE_ACC_STATIC_PHASE = 0x0040; // Indicates that this dependence was not explicitly or implicitly declared // in the source of the module declaration. - public final static int MODULE_ACC_SYNTHETIC = 0x1000; + int MODULE_ACC_SYNTHETIC = 0x1000; // Indicates that this dependence was implicitly declared in the source of // the module declaration - public final static int MODULE_ACC_MANDATED = 0x8000; + int MODULE_ACC_MANDATED = 0x8000; // Applies to classes compiled by new compilers only - public final static short ACC_SUPER = 0x0020; + short ACC_SUPER = 0x0020; - public final static short MAX_ACC_FLAG = ACC_STRICT; + short MAX_ACC_FLAG = ACC_STRICT; - public final static String[] ACCESS_NAMES = { "public", "private", "protected", "static", "final", "synchronized", "volatile", + String[] ACCESS_NAMES = { "public", "private", "protected", "static", "final", "synchronized", "volatile", "transient", "native", "interface", "abstract", "strictfp" }; /** Tags in constant pool to denote type of constant */ - public final static byte CONSTANT_Utf8 = 1; - public final static byte CONSTANT_Integer = 3; - public final static byte CONSTANT_Float = 4; - public final static byte CONSTANT_Long = 5; - public final static byte CONSTANT_Double = 6; - public final static byte CONSTANT_Class = 7; - public final static byte CONSTANT_Fieldref = 9; - public final static byte CONSTANT_String = 8; - public final static byte CONSTANT_Methodref = 10; - public final static byte CONSTANT_InterfaceMethodref = 11; - public final static byte CONSTANT_NameAndType = 12; - - public final static byte CONSTANT_MethodHandle = 15; - public final static byte CONSTANT_MethodType = 16; - public final static byte CONSTANT_Dynamic = 17; - public final static byte CONSTANT_InvokeDynamic = 18; - - public final static byte CONSTANT_Module = 19; - public final static byte CONSTANT_Package = 20; - - - public final static String[] CONSTANT_NAMES = { "", "CONSTANT_Utf8", "", "CONSTANT_Integer", "CONSTANT_Float", "CONSTANT_Long", + byte CONSTANT_Utf8 = 1; + byte CONSTANT_Integer = 3; + byte CONSTANT_Float = 4; + byte CONSTANT_Long = 5; + byte CONSTANT_Double = 6; + byte CONSTANT_Class = 7; + byte CONSTANT_Fieldref = 9; + byte CONSTANT_String = 8; + byte CONSTANT_Methodref = 10; + byte CONSTANT_InterfaceMethodref = 11; + byte CONSTANT_NameAndType = 12; + + byte CONSTANT_MethodHandle = 15; + byte CONSTANT_MethodType = 16; + byte CONSTANT_Dynamic = 17; + byte CONSTANT_InvokeDynamic = 18; + + byte CONSTANT_Module = 19; + byte CONSTANT_Package = 20; + + + String[] CONSTANT_NAMES = { "", "CONSTANT_Utf8", "", "CONSTANT_Integer", "CONSTANT_Float", "CONSTANT_Long", "CONSTANT_Double", "CONSTANT_Class", "CONSTANT_String", "CONSTANT_Fieldref", "CONSTANT_Methodref", "CONSTANT_InterfaceMethodref", "CONSTANT_NameAndType","","","CONSTANT_MethodHandle","CONSTANT_MethodType","","CONSTANT_InvokeDynamic", // J9: @@ -183,349 +183,349 @@ public interface Constants { * The name of the static initializer, also called "class initialization method" or "interface initialization * method". This is "<clinit>". */ - public final static String STATIC_INITIALIZER_NAME = "<clinit>"; + String STATIC_INITIALIZER_NAME = "<clinit>"; /** * The name of every constructor method in a class, also called "instance initialization method". This is * "<init>". */ - public final static String CONSTRUCTOR_NAME = "<init>"; + String CONSTRUCTOR_NAME = "<init>"; /** The names of the interfaces implemented by arrays */ - public final static String[] INTERFACES_IMPLEMENTED_BY_ARRAYS = { "java.lang.Cloneable", "java.io.Serializable" }; + String[] INTERFACES_IMPLEMENTED_BY_ARRAYS = { "java.lang.Cloneable", "java.io.Serializable" }; /** * Limitations of the Java Virtual Machine. See The Java Virtual Machine Specification, Second Edition, page 152, chapter 4.10. */ - public static final int MAX_CP_ENTRIES = 65535; - public static final int MAX_CODE_SIZE = 65536; // bytes + int MAX_CP_ENTRIES = 65535; + int MAX_CODE_SIZE = 65536; // bytes /** * Java VM opcodes. */ - public static final short NOP = 0; - public static final short ACONST_NULL = 1; - public static final short ICONST_M1 = 2; - public static final short ICONST_0 = 3; - public static final short ICONST_1 = 4; - public static final short ICONST_2 = 5; - public static final short ICONST_3 = 6; - public static final short ICONST_4 = 7; - public static final short ICONST_5 = 8; - public static final short LCONST_0 = 9; - public static final short LCONST_1 = 10; - public static final short FCONST_0 = 11; - public static final short FCONST_1 = 12; - public static final short FCONST_2 = 13; - public static final short DCONST_0 = 14; - public static final short DCONST_1 = 15; - public static final short BIPUSH = 16; - public static final short SIPUSH = 17; - public static final short LDC = 18; - public static final short LDC_W = 19; - public static final short LDC2_W = 20; - public static final short ILOAD = 21; - public static final short LLOAD = 22; - public static final short FLOAD = 23; - public static final short DLOAD = 24; - public static final short ALOAD = 25; - public static final short ILOAD_0 = 26; - public static final short ILOAD_1 = 27; - public static final short ILOAD_2 = 28; - public static final short ILOAD_3 = 29; - public static final short LLOAD_0 = 30; - public static final short LLOAD_1 = 31; - public static final short LLOAD_2 = 32; - public static final short LLOAD_3 = 33; - public static final short FLOAD_0 = 34; - public static final short FLOAD_1 = 35; - public static final short FLOAD_2 = 36; - public static final short FLOAD_3 = 37; - public static final short DLOAD_0 = 38; - public static final short DLOAD_1 = 39; - public static final short DLOAD_2 = 40; - public static final short DLOAD_3 = 41; - public static final short ALOAD_0 = 42; - public static final short ALOAD_1 = 43; - public static final short ALOAD_2 = 44; - public static final short ALOAD_3 = 45; - public static final short IALOAD = 46; - public static final short LALOAD = 47; - public static final short FALOAD = 48; - public static final short DALOAD = 49; - public static final short AALOAD = 50; - public static final short BALOAD = 51; - public static final short CALOAD = 52; - public static final short SALOAD = 53; - public static final short ISTORE = 54; - public static final short LSTORE = 55; - public static final short FSTORE = 56; - public static final short DSTORE = 57; - public static final short ASTORE = 58; - public static final short ISTORE_0 = 59; - public static final short ISTORE_1 = 60; - public static final short ISTORE_2 = 61; - public static final short ISTORE_3 = 62; - public static final short LSTORE_0 = 63; - public static final short LSTORE_1 = 64; - public static final short LSTORE_2 = 65; - public static final short LSTORE_3 = 66; - public static final short FSTORE_0 = 67; - public static final short FSTORE_1 = 68; - public static final short FSTORE_2 = 69; - public static final short FSTORE_3 = 70; - public static final short DSTORE_0 = 71; - public static final short DSTORE_1 = 72; - public static final short DSTORE_2 = 73; - public static final short DSTORE_3 = 74; - public static final short ASTORE_0 = 75; - public static final short ASTORE_1 = 76; - public static final short ASTORE_2 = 77; - public static final short ASTORE_3 = 78; - public static final short IASTORE = 79; - public static final short LASTORE = 80; - public static final short FASTORE = 81; - public static final short DASTORE = 82; - public static final short AASTORE = 83; - public static final short BASTORE = 84; - public static final short CASTORE = 85; - public static final short SASTORE = 86; - public static final short POP = 87; - public static final short POP2 = 88; - public static final short DUP = 89; - public static final short DUP_X1 = 90; - public static final short DUP_X2 = 91; - public static final short DUP2 = 92; - public static final short DUP2_X1 = 93; - public static final short DUP2_X2 = 94; - public static final short SWAP = 95; - public static final short IADD = 96; - public static final short LADD = 97; - public static final short FADD = 98; - public static final short DADD = 99; - public static final short ISUB = 100; - public static final short LSUB = 101; - public static final short FSUB = 102; - public static final short DSUB = 103; - public static final short IMUL = 104; - public static final short LMUL = 105; - public static final short FMUL = 106; - public static final short DMUL = 107; - public static final short IDIV = 108; - public static final short LDIV = 109; - public static final short FDIV = 110; - public static final short DDIV = 111; - public static final short IREM = 112; - public static final short LREM = 113; - public static final short FREM = 114; - public static final short DREM = 115; - public static final short INEG = 116; - public static final short LNEG = 117; - public static final short FNEG = 118; - public static final short DNEG = 119; - public static final short ISHL = 120; - public static final short LSHL = 121; - public static final short ISHR = 122; - public static final short LSHR = 123; - public static final short IUSHR = 124; - public static final short LUSHR = 125; - public static final short IAND = 126; - public static final short LAND = 127; - public static final short IOR = 128; - public static final short LOR = 129; - public static final short IXOR = 130; - public static final short LXOR = 131; - public static final short IINC = 132; - public static final short I2L = 133; - public static final short I2F = 134; - public static final short I2D = 135; - public static final short L2I = 136; - public static final short L2F = 137; - public static final short L2D = 138; - public static final short F2I = 139; - public static final short F2L = 140; - public static final short F2D = 141; - public static final short D2I = 142; - public static final short D2L = 143; - public static final short D2F = 144; - public static final short I2B = 145; - public static final short INT2BYTE = 145; // Old notion - public static final short I2C = 146; - public static final short INT2CHAR = 146; // Old notion - public static final short I2S = 147; - public static final short INT2SHORT = 147; // Old notion - public static final short LCMP = 148; - public static final short FCMPL = 149; - public static final short FCMPG = 150; - public static final short DCMPL = 151; - public static final short DCMPG = 152; - public static final short IFEQ = 153; - public static final short IFNE = 154; - public static final short IFLT = 155; - public static final short IFGE = 156; - public static final short IFGT = 157; - public static final short IFLE = 158; - public static final short IF_ICMPEQ = 159; - public static final short IF_ICMPNE = 160; - public static final short IF_ICMPLT = 161; - public static final short IF_ICMPGE = 162; - public static final short IF_ICMPGT = 163; - public static final short IF_ICMPLE = 164; - public static final short IF_ACMPEQ = 165; - public static final short IF_ACMPNE = 166; - public static final short GOTO = 167; - public static final short JSR = 168; - public static final short RET = 169; - public static final short TABLESWITCH = 170; - public static final short LOOKUPSWITCH = 171; - public static final short IRETURN = 172; - public static final short LRETURN = 173; - public static final short FRETURN = 174; - public static final short DRETURN = 175; - public static final short ARETURN = 176; - public static final short RETURN = 177; - public static final short GETSTATIC = 178; - public static final short PUTSTATIC = 179; - public static final short GETFIELD = 180; - public static final short PUTFIELD = 181; - public static final short INVOKEVIRTUAL = 182; - public static final short INVOKESPECIAL = 183; - public static final short INVOKENONVIRTUAL = 183; // Old name in JDK 1.0 - public static final short INVOKESTATIC = 184; - public static final short INVOKEINTERFACE = 185; - public static final short INVOKEDYNAMIC = 186; - public static final short NEW = 187; - public static final short NEWARRAY = 188; - public static final short ANEWARRAY = 189; - public static final short ARRAYLENGTH = 190; - public static final short ATHROW = 191; - public static final short CHECKCAST = 192; - public static final short INSTANCEOF = 193; - public static final short MONITORENTER = 194; - public static final short MONITOREXIT = 195; - public static final short WIDE = 196; - public static final short MULTIANEWARRAY = 197; - public static final short IFNULL = 198; - public static final short IFNONNULL = 199; - public static final short GOTO_W = 200; - public static final short JSR_W = 201; + short NOP = 0; + short ACONST_NULL = 1; + short ICONST_M1 = 2; + short ICONST_0 = 3; + short ICONST_1 = 4; + short ICONST_2 = 5; + short ICONST_3 = 6; + short ICONST_4 = 7; + short ICONST_5 = 8; + short LCONST_0 = 9; + short LCONST_1 = 10; + short FCONST_0 = 11; + short FCONST_1 = 12; + short FCONST_2 = 13; + short DCONST_0 = 14; + short DCONST_1 = 15; + short BIPUSH = 16; + short SIPUSH = 17; + short LDC = 18; + short LDC_W = 19; + short LDC2_W = 20; + short ILOAD = 21; + short LLOAD = 22; + short FLOAD = 23; + short DLOAD = 24; + short ALOAD = 25; + short ILOAD_0 = 26; + short ILOAD_1 = 27; + short ILOAD_2 = 28; + short ILOAD_3 = 29; + short LLOAD_0 = 30; + short LLOAD_1 = 31; + short LLOAD_2 = 32; + short LLOAD_3 = 33; + short FLOAD_0 = 34; + short FLOAD_1 = 35; + short FLOAD_2 = 36; + short FLOAD_3 = 37; + short DLOAD_0 = 38; + short DLOAD_1 = 39; + short DLOAD_2 = 40; + short DLOAD_3 = 41; + short ALOAD_0 = 42; + short ALOAD_1 = 43; + short ALOAD_2 = 44; + short ALOAD_3 = 45; + short IALOAD = 46; + short LALOAD = 47; + short FALOAD = 48; + short DALOAD = 49; + short AALOAD = 50; + short BALOAD = 51; + short CALOAD = 52; + short SALOAD = 53; + short ISTORE = 54; + short LSTORE = 55; + short FSTORE = 56; + short DSTORE = 57; + short ASTORE = 58; + short ISTORE_0 = 59; + short ISTORE_1 = 60; + short ISTORE_2 = 61; + short ISTORE_3 = 62; + short LSTORE_0 = 63; + short LSTORE_1 = 64; + short LSTORE_2 = 65; + short LSTORE_3 = 66; + short FSTORE_0 = 67; + short FSTORE_1 = 68; + short FSTORE_2 = 69; + short FSTORE_3 = 70; + short DSTORE_0 = 71; + short DSTORE_1 = 72; + short DSTORE_2 = 73; + short DSTORE_3 = 74; + short ASTORE_0 = 75; + short ASTORE_1 = 76; + short ASTORE_2 = 77; + short ASTORE_3 = 78; + short IASTORE = 79; + short LASTORE = 80; + short FASTORE = 81; + short DASTORE = 82; + short AASTORE = 83; + short BASTORE = 84; + short CASTORE = 85; + short SASTORE = 86; + short POP = 87; + short POP2 = 88; + short DUP = 89; + short DUP_X1 = 90; + short DUP_X2 = 91; + short DUP2 = 92; + short DUP2_X1 = 93; + short DUP2_X2 = 94; + short SWAP = 95; + short IADD = 96; + short LADD = 97; + short FADD = 98; + short DADD = 99; + short ISUB = 100; + short LSUB = 101; + short FSUB = 102; + short DSUB = 103; + short IMUL = 104; + short LMUL = 105; + short FMUL = 106; + short DMUL = 107; + short IDIV = 108; + short LDIV = 109; + short FDIV = 110; + short DDIV = 111; + short IREM = 112; + short LREM = 113; + short FREM = 114; + short DREM = 115; + short INEG = 116; + short LNEG = 117; + short FNEG = 118; + short DNEG = 119; + short ISHL = 120; + short LSHL = 121; + short ISHR = 122; + short LSHR = 123; + short IUSHR = 124; + short LUSHR = 125; + short IAND = 126; + short LAND = 127; + short IOR = 128; + short LOR = 129; + short IXOR = 130; + short LXOR = 131; + short IINC = 132; + short I2L = 133; + short I2F = 134; + short I2D = 135; + short L2I = 136; + short L2F = 137; + short L2D = 138; + short F2I = 139; + short F2L = 140; + short F2D = 141; + short D2I = 142; + short D2L = 143; + short D2F = 144; + short I2B = 145; + short INT2BYTE = 145; // Old notion + short I2C = 146; + short INT2CHAR = 146; // Old notion + short I2S = 147; + short INT2SHORT = 147; // Old notion + short LCMP = 148; + short FCMPL = 149; + short FCMPG = 150; + short DCMPL = 151; + short DCMPG = 152; + short IFEQ = 153; + short IFNE = 154; + short IFLT = 155; + short IFGE = 156; + short IFGT = 157; + short IFLE = 158; + short IF_ICMPEQ = 159; + short IF_ICMPNE = 160; + short IF_ICMPLT = 161; + short IF_ICMPGE = 162; + short IF_ICMPGT = 163; + short IF_ICMPLE = 164; + short IF_ACMPEQ = 165; + short IF_ACMPNE = 166; + short GOTO = 167; + short JSR = 168; + short RET = 169; + short TABLESWITCH = 170; + short LOOKUPSWITCH = 171; + short IRETURN = 172; + short LRETURN = 173; + short FRETURN = 174; + short DRETURN = 175; + short ARETURN = 176; + short RETURN = 177; + short GETSTATIC = 178; + short PUTSTATIC = 179; + short GETFIELD = 180; + short PUTFIELD = 181; + short INVOKEVIRTUAL = 182; + short INVOKESPECIAL = 183; + short INVOKENONVIRTUAL = 183; // Old name in JDK 1.0 + short INVOKESTATIC = 184; + short INVOKEINTERFACE = 185; + short INVOKEDYNAMIC = 186; + short NEW = 187; + short NEWARRAY = 188; + short ANEWARRAY = 189; + short ARRAYLENGTH = 190; + short ATHROW = 191; + short CHECKCAST = 192; + short INSTANCEOF = 193; + short MONITORENTER = 194; + short MONITOREXIT = 195; + short WIDE = 196; + short MULTIANEWARRAY = 197; + short IFNULL = 198; + short IFNONNULL = 199; + short GOTO_W = 200; + short JSR_W = 201; /** * Non-legal opcodes, may be used by JVM internally. */ - public static final short BREAKPOINT = 202; - public static final short LDC_QUICK = 203; - public static final short LDC_W_QUICK = 204; - public static final short LDC2_W_QUICK = 205; - public static final short GETFIELD_QUICK = 206; - public static final short PUTFIELD_QUICK = 207; - public static final short GETFIELD2_QUICK = 208; - public static final short PUTFIELD2_QUICK = 209; - public static final short GETSTATIC_QUICK = 210; - public static final short PUTSTATIC_QUICK = 211; - public static final short GETSTATIC2_QUICK = 212; - public static final short PUTSTATIC2_QUICK = 213; - public static final short INVOKEVIRTUAL_QUICK = 214; - public static final short INVOKENONVIRTUAL_QUICK = 215; - public static final short INVOKESUPER_QUICK = 216; - public static final short INVOKESTATIC_QUICK = 217; - public static final short INVOKEINTERFACE_QUICK = 218; - public static final short INVOKEVIRTUALOBJECT_QUICK = 219; - public static final short NEW_QUICK = 221; - public static final short ANEWARRAY_QUICK = 222; - public static final short MULTIANEWARRAY_QUICK = 223; - public static final short CHECKCAST_QUICK = 224; - public static final short INSTANCEOF_QUICK = 225; - public static final short INVOKEVIRTUAL_QUICK_W = 226; - public static final short GETFIELD_QUICK_W = 227; - public static final short PUTFIELD_QUICK_W = 228; - public static final short IMPDEP1 = 254; - public static final short IMPDEP2 = 255; + short BREAKPOINT = 202; + short LDC_QUICK = 203; + short LDC_W_QUICK = 204; + short LDC2_W_QUICK = 205; + short GETFIELD_QUICK = 206; + short PUTFIELD_QUICK = 207; + short GETFIELD2_QUICK = 208; + short PUTFIELD2_QUICK = 209; + short GETSTATIC_QUICK = 210; + short PUTSTATIC_QUICK = 211; + short GETSTATIC2_QUICK = 212; + short PUTSTATIC2_QUICK = 213; + short INVOKEVIRTUAL_QUICK = 214; + short INVOKENONVIRTUAL_QUICK = 215; + short INVOKESUPER_QUICK = 216; + short INVOKESTATIC_QUICK = 217; + short INVOKEINTERFACE_QUICK = 218; + short INVOKEVIRTUALOBJECT_QUICK = 219; + short NEW_QUICK = 221; + short ANEWARRAY_QUICK = 222; + short MULTIANEWARRAY_QUICK = 223; + short CHECKCAST_QUICK = 224; + short INSTANCEOF_QUICK = 225; + short INVOKEVIRTUAL_QUICK_W = 226; + short GETFIELD_QUICK_W = 227; + short PUTFIELD_QUICK_W = 228; + short IMPDEP1 = 254; + short IMPDEP2 = 255; /** * For internal purposes only. */ - public static final short PUSH = 4711; - public static final short SWITCH = 4712; + short PUSH = 4711; + short SWITCH = 4712; /** * Illegal codes */ - public static final short UNDEFINED = '/' - '0'; // -1; - public static final short UNPREDICTABLE = '.' - '0';// -2; - public static final short RESERVED = -3; - public static final String ILLEGAL_OPCODE = "<illegal opcode>"; - public static final String ILLEGAL_TYPE = "<illegal type>"; - - public static final byte T_BOOLEAN = 4; - public static final byte T_CHAR = 5; - public static final byte T_FLOAT = 6; - public static final byte T_DOUBLE = 7; - public static final byte T_BYTE = 8; - public static final byte T_SHORT = 9; - public static final byte T_INT = 10; - public static final byte T_LONG = 11; - - public static final byte T_VOID = 12; // Non-standard - public static final byte T_ARRAY = 13; - public static final byte T_OBJECT = 14; - public static final byte T_REFERENCE = 14; // Deprecated - public static final byte T_UNKNOWN = 15; - public static final byte T_ADDRESS = 16; + short UNDEFINED = '/' - '0'; // -1; + short UNPREDICTABLE = '.' - '0';// -2; + short RESERVED = -3; + String ILLEGAL_OPCODE = "<illegal opcode>"; + String ILLEGAL_TYPE = "<illegal type>"; + + byte T_BOOLEAN = 4; + byte T_CHAR = 5; + byte T_FLOAT = 6; + byte T_DOUBLE = 7; + byte T_BYTE = 8; + byte T_SHORT = 9; + byte T_INT = 10; + byte T_LONG = 11; + + byte T_VOID = 12; // Non-standard + byte T_ARRAY = 13; + byte T_OBJECT = 14; + byte T_REFERENCE = 14; // Deprecated + byte T_UNKNOWN = 15; + byte T_ADDRESS = 16; /** * The primitive type names corresponding to the T_XX constants, e.g., TYPE_NAMES[T_INT] = "int" */ - public static final String[] TYPE_NAMES = { ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, "boolean", "char", "float", + String[] TYPE_NAMES = { ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, "boolean", "char", "float", "double", "byte", "short", "int", "long", "void", "array", "object", "unknown" // Non-standard }; /** * The primitive class names corresponding to the T_XX constants, e.g., CLASS_TYPE_NAMES[T_INT] = "java.lang.Integer" */ - public static final String[] CLASS_TYPE_NAMES = { ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, "java.lang.Boolean", + String[] CLASS_TYPE_NAMES = { ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, "java.lang.Boolean", "java.lang.Character", "java.lang.Float", "java.lang.Double", "java.lang.Byte", "java.lang.Short", "java.lang.Integer", "java.lang.Long", "java.lang.Void", ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE }; /** * The signature characters corresponding to primitive types, e.g., SHORT_TYPE_NAMES[T_INT] = "I" */ - public static final String[] SHORT_TYPE_NAMES = { ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, "Z", "C", "F", "D", + String[] SHORT_TYPE_NAMES = { ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, "Z", "C", "F", "D", "B", "S", "I", "J", "V", ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE }; - public static int PUSH_INST = 0x0001; - public static int CONSTANT_INST = 0x0002; - public static long LOADCLASS_INST = 0x0004; - public static int CP_INST = 0x0008; - public static int INDEXED = 0x0010; - public static int LOAD_INST = 0x0020; // load instruction - public static int LV_INST = 0x0040; // local variable instruction - public static int POP_INST = 0x0080; - public static int STORE_INST = 0x0100; - public static long STACK_INST = 0x0200; - public static long BRANCH_INSTRUCTION = 0x0400; - public static long TARGETER_INSTRUCTION = 0x0800; - public static long NEGATABLE = 0x1000; - public static long IF_INST = 0x2000; - public static long JSR_INSTRUCTION = 0x4000; - public static long RET_INST = 0x8000; - public static long EXCEPTION_THROWER = 0x10000; - - public static final byte[] iLen = new byte[256]; - public static final byte UNDEFINED_LENGTH = 'X' - '0'; - public static final byte VARIABLE_LENGTH = 'V' - '0'; - public static final byte[] stackEntriesProduced = new byte[256]; - public static final Type[] types = new Type[256]; - public static final long[] instFlags = new long[256]; - - public static final Class<Throwable>[][] instExcs = new Class[256][]; - - static final Object _unused = ConstantsInitializer.initialize(); + int PUSH_INST = 0x0001; + int CONSTANT_INST = 0x0002; + long LOADCLASS_INST = 0x0004; + int CP_INST = 0x0008; + int INDEXED = 0x0010; + int LOAD_INST = 0x0020; // load instruction + int LV_INST = 0x0040; // local variable instruction + int POP_INST = 0x0080; + int STORE_INST = 0x0100; + long STACK_INST = 0x0200; + long BRANCH_INSTRUCTION = 0x0400; + long TARGETER_INSTRUCTION = 0x0800; + long NEGATABLE = 0x1000; + long IF_INST = 0x2000; + long JSR_INSTRUCTION = 0x4000; + long RET_INST = 0x8000; + long EXCEPTION_THROWER = 0x10000; + + byte[] iLen = new byte[256]; + byte UNDEFINED_LENGTH = 'X' - '0'; + byte VARIABLE_LENGTH = 'V' - '0'; + byte[] stackEntriesProduced = new byte[256]; + Type[] types = new Type[256]; + long[] instFlags = new long[256]; + + Class<Throwable>[][] instExcs = new Class[256][]; + + Object _unused = ConstantsInitializer.initialize(); /** * How the byte code operands are to be interpreted. */ - public static final short[][] TYPE_OF_OPERANDS = { {}/* nop */, {}/* aconst_null */, {}/* iconst_m1 */, {}/* iconst_0 */, + short[][] TYPE_OF_OPERANDS = { {}/* nop */, {}/* aconst_null */, {}/* iconst_m1 */, {}/* iconst_0 */, {}/* iconst_1 */, {}/* iconst_2 */, {}/* iconst_3 */, {}/* iconst_4 */, {}/* iconst_5 */, {}/* lconst_0 */, {}/* lconst_1 */, {}/* fconst_0 */, {}/* fconst_1 */, {}/* fconst_2 */, {}/* dconst_0 */, {}/* dconst_1 */, { T_BYTE }/* bipush */, { T_SHORT }/* sipush */, { T_BYTE }/* ldc */, { T_SHORT }/* ldc_w */, { T_SHORT }/* ldc2_w */, { T_BYTE }/* iload */, @@ -565,7 +565,7 @@ public interface Constants { /** * Names of opcodes. */ - public static final String[] OPCODE_NAMES = { "nop", "aconst_null", "iconst_m1", "iconst_0", "iconst_1", "iconst_2", + String[] OPCODE_NAMES = { "nop", "aconst_null", "iconst_m1", "iconst_0", "iconst_1", "iconst_2", "iconst_3", "iconst_4", "iconst_5", "lconst_0", "lconst_1", "fconst_0", "fconst_1", "fconst_2", "dconst_0", "dconst_1", "bipush", "sipush", "ldc", "ldc_w", "ldc2_w", "iload", "lload", "fload", "dload", "aload", "iload_0", "iload_1", "iload_2", "iload_3", "lload_0", "lload_1", "lload_2", "lload_3", "fload_0", "fload_1", "fload_2", "fload_3", @@ -595,7 +595,7 @@ public interface Constants { /** * Number of words consumed on operand stack by instructions. */ - public static final int[] CONSUME_STACK = { 0/* nop */, 0/* aconst_null */, 0/* iconst_m1 */, 0/* iconst_0 */, 0/* iconst_1 */, + int[] CONSUME_STACK = { 0/* nop */, 0/* aconst_null */, 0/* iconst_m1 */, 0/* iconst_0 */, 0/* iconst_1 */, 0/* iconst_2 */, 0/* iconst_3 */, 0/* iconst_4 */, 0/* iconst_5 */, 0/* lconst_0 */, 0/* lconst_1 */, 0/* fconst_0 */, 0/* fconst_1 */, 0/* fconst_2 */, 0/* dconst_0 */, 0/* dconst_1 */, 0/* bipush */, 0/* sipush */, 0/* ldc */, 0/* ldc_w */, 0/* ldc2_w */, 0/* iload */, 0/* lload */, 0/* fload */, 0/* dload */, 0/* aload */, 0/* iload_0 */, 0/* iload_1 */, @@ -631,43 +631,43 @@ public interface Constants { }; // Attributes and their corresponding names. - public static final byte ATTR_UNKNOWN = -1; - public static final byte ATTR_SOURCE_FILE = 0; - public static final byte ATTR_CONSTANT_VALUE = 1; - public static final byte ATTR_CODE = 2; - public static final byte ATTR_EXCEPTIONS = 3; - public static final byte ATTR_LINE_NUMBER_TABLE = 4; - public static final byte ATTR_LOCAL_VARIABLE_TABLE = 5; - public static final byte ATTR_INNER_CLASSES = 6; - public static final byte ATTR_SYNTHETIC = 7; - public static final byte ATTR_DEPRECATED = 8; - public static final byte ATTR_PMG = 9; - public static final byte ATTR_SIGNATURE = 10; - public static final byte ATTR_STACK_MAP = 11; - public static final byte ATTR_RUNTIME_VISIBLE_ANNOTATIONS = 12; - public static final byte ATTR_RUNTIME_INVISIBLE_ANNOTATIONS = 13; - public static final byte ATTR_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS = 14; - public static final byte ATTR_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS = 15; - public static final byte ATTR_LOCAL_VARIABLE_TYPE_TABLE = 16; - public static final byte ATTR_ENCLOSING_METHOD = 17; - public static final byte ATTR_ANNOTATION_DEFAULT = 18; - public static final byte ATTR_BOOTSTRAPMETHODS = 19; - public static final byte ATTR_RUNTIME_VISIBLE_TYPE_ANNOTATIONS = 20; - public static final byte ATTR_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS = 21; - public static final byte ATTR_METHOD_PARAMETERS = 22; + byte ATTR_UNKNOWN = -1; + byte ATTR_SOURCE_FILE = 0; + byte ATTR_CONSTANT_VALUE = 1; + byte ATTR_CODE = 2; + byte ATTR_EXCEPTIONS = 3; + byte ATTR_LINE_NUMBER_TABLE = 4; + byte ATTR_LOCAL_VARIABLE_TABLE = 5; + byte ATTR_INNER_CLASSES = 6; + byte ATTR_SYNTHETIC = 7; + byte ATTR_DEPRECATED = 8; + byte ATTR_PMG = 9; + byte ATTR_SIGNATURE = 10; + byte ATTR_STACK_MAP = 11; + byte ATTR_RUNTIME_VISIBLE_ANNOTATIONS = 12; + byte ATTR_RUNTIME_INVISIBLE_ANNOTATIONS = 13; + byte ATTR_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS = 14; + byte ATTR_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS = 15; + byte ATTR_LOCAL_VARIABLE_TYPE_TABLE = 16; + byte ATTR_ENCLOSING_METHOD = 17; + byte ATTR_ANNOTATION_DEFAULT = 18; + byte ATTR_BOOTSTRAPMETHODS = 19; + byte ATTR_RUNTIME_VISIBLE_TYPE_ANNOTATIONS = 20; + byte ATTR_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS = 21; + byte ATTR_METHOD_PARAMETERS = 22; // J9: - public static final byte ATTR_MODULE = 23; - public static final byte ATTR_MODULE_PACKAGES = 24; - public static final byte ATTR_MODULE_MAIN_CLASS = 25; + byte ATTR_MODULE = 23; + byte ATTR_MODULE_PACKAGES = 24; + byte ATTR_MODULE_MAIN_CLASS = 25; // J11: - public static final byte ATTR_NEST_HOST = 26; - public static final byte ATTR_NEST_MEMBERS = 27; + byte ATTR_NEST_HOST = 26; + byte ATTR_NEST_MEMBERS = 27; - public static final short KNOWN_ATTRIBUTES = 28; + short KNOWN_ATTRIBUTES = 28; - public static final String[] ATTRIBUTE_NAMES = { + String[] ATTRIBUTE_NAMES = { "SourceFile", "ConstantValue", "Code", "Exceptions", "LineNumberTable", "LocalVariableTable", "InnerClasses", "Synthetic", "Deprecated", "PMGClass", "Signature", "StackMap", "RuntimeVisibleAnnotations", "RuntimeInvisibleAnnotations", "RuntimeVisibleParameterAnnotations", @@ -679,16 +679,16 @@ public interface Constants { /** * Constants used in the StackMap attribute. */ - public static final byte ITEM_Bogus = 0; - public static final byte ITEM_Integer = 1; - public static final byte ITEM_Float = 2; - public static final byte ITEM_Double = 3; - public static final byte ITEM_Long = 4; - public static final byte ITEM_Null = 5; - public static final byte ITEM_InitObject = 6; - public static final byte ITEM_Object = 7; - public static final byte ITEM_NewObject = 8; - - public static final String[] ITEM_NAMES = { "Bogus", "Integer", "Float", "Double", "Long", "Null", "InitObject", "Object", + byte ITEM_Bogus = 0; + byte ITEM_Integer = 1; + byte ITEM_Float = 2; + byte ITEM_Double = 3; + byte ITEM_Long = 4; + byte ITEM_Null = 5; + byte ITEM_InitObject = 6; + byte ITEM_Object = 7; + byte ITEM_NewObject = 8; + + String[] ITEM_NAMES = { "Bogus", "Integer", "Float", "Double", "Long", "Null", "InitObject", "Object", "NewObject" }; } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/ExceptionConstants.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/ExceptionConstants.java index a83199ee7..b03b3cd0c 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/ExceptionConstants.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/ExceptionConstants.java @@ -65,86 +65,86 @@ public interface ExceptionConstants { /** * The mother of all exceptions */ - public static final Class<Throwable> THROWABLE = Throwable.class; + Class<Throwable> THROWABLE = Throwable.class; /** * Super class of any run-time exception */ - public static final Class<RuntimeException> RUNTIME_EXCEPTION = RuntimeException.class; + Class<RuntimeException> RUNTIME_EXCEPTION = RuntimeException.class; /** * Super class of any linking exception (aka Linkage Error) */ - public static final Class<LinkageError> LINKING_EXCEPTION = LinkageError.class; + Class<LinkageError> LINKING_EXCEPTION = LinkageError.class; /** * Linking Exceptions */ - public static final Class<ClassCircularityError> CLASS_CIRCULARITY_ERROR = ClassCircularityError.class; - public static final Class<ClassFormatError> CLASS_FORMAT_ERROR = ClassFormatError.class; - public static final Class<ExceptionInInitializerError> EXCEPTION_IN_INITIALIZER_ERROR = ExceptionInInitializerError.class; - public static final Class<IncompatibleClassChangeError> INCOMPATIBLE_CLASS_CHANGE_ERROR = IncompatibleClassChangeError.class; - public static final Class<AbstractMethodError> ABSTRACT_METHOD_ERROR = AbstractMethodError.class; - public static final Class<IllegalAccessError> ILLEGAL_ACCESS_ERROR = IllegalAccessError.class; - public static final Class<InstantiationError> INSTANTIATION_ERROR = InstantiationError.class; - public static final Class<NoSuchFieldError> NO_SUCH_FIELD_ERROR = NoSuchFieldError.class; - public static final Class<NoSuchMethodError> NO_SUCH_METHOD_ERROR = NoSuchMethodError.class; - public static final Class<NoClassDefFoundError> NO_CLASS_DEF_FOUND_ERROR = NoClassDefFoundError.class; - public static final Class<UnsatisfiedLinkError> UNSATISFIED_LINK_ERROR = UnsatisfiedLinkError.class; - public static final Class<VerifyError> VERIFY_ERROR = VerifyError.class; + Class<ClassCircularityError> CLASS_CIRCULARITY_ERROR = ClassCircularityError.class; + Class<ClassFormatError> CLASS_FORMAT_ERROR = ClassFormatError.class; + Class<ExceptionInInitializerError> EXCEPTION_IN_INITIALIZER_ERROR = ExceptionInInitializerError.class; + Class<IncompatibleClassChangeError> INCOMPATIBLE_CLASS_CHANGE_ERROR = IncompatibleClassChangeError.class; + Class<AbstractMethodError> ABSTRACT_METHOD_ERROR = AbstractMethodError.class; + Class<IllegalAccessError> ILLEGAL_ACCESS_ERROR = IllegalAccessError.class; + Class<InstantiationError> INSTANTIATION_ERROR = InstantiationError.class; + Class<NoSuchFieldError> NO_SUCH_FIELD_ERROR = NoSuchFieldError.class; + Class<NoSuchMethodError> NO_SUCH_METHOD_ERROR = NoSuchMethodError.class; + Class<NoClassDefFoundError> NO_CLASS_DEF_FOUND_ERROR = NoClassDefFoundError.class; + Class<UnsatisfiedLinkError> UNSATISFIED_LINK_ERROR = UnsatisfiedLinkError.class; + Class<VerifyError> VERIFY_ERROR = VerifyError.class; /* UnsupportedClassVersionError is new in JDK 1.2 */ // public static final Class UnsupportedClassVersionError = UnsupportedClassVersionError.class; /** * Run-Time Exceptions */ - public static final Class<NullPointerException> NULL_POINTER_EXCEPTION = NullPointerException.class; - public static final Class<ArrayIndexOutOfBoundsException> ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION = ArrayIndexOutOfBoundsException.class; - public static final Class<ArithmeticException> ARITHMETIC_EXCEPTION = ArithmeticException.class; - public static final Class<NegativeArraySizeException> NEGATIVE_ARRAY_SIZE_EXCEPTION = NegativeArraySizeException.class; - public static final Class<ClassCastException> CLASS_CAST_EXCEPTION = ClassCastException.class; - public static final Class<IllegalMonitorStateException> ILLEGAL_MONITOR_STATE = IllegalMonitorStateException.class; + Class<NullPointerException> NULL_POINTER_EXCEPTION = NullPointerException.class; + Class<ArrayIndexOutOfBoundsException> ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION = ArrayIndexOutOfBoundsException.class; + Class<ArithmeticException> ARITHMETIC_EXCEPTION = ArithmeticException.class; + Class<NegativeArraySizeException> NEGATIVE_ARRAY_SIZE_EXCEPTION = NegativeArraySizeException.class; + Class<ClassCastException> CLASS_CAST_EXCEPTION = ClassCastException.class; + Class<IllegalMonitorStateException> ILLEGAL_MONITOR_STATE = IllegalMonitorStateException.class; /** * Pre-defined exception arrays according to chapters 5.1-5.4 of the Java Virtual Machine Specification */ - public static final Class[] EXCS_CLASS_AND_INTERFACE_RESOLUTION = { NO_CLASS_DEF_FOUND_ERROR, CLASS_FORMAT_ERROR, VERIFY_ERROR, + Class[] EXCS_CLASS_AND_INTERFACE_RESOLUTION = { NO_CLASS_DEF_FOUND_ERROR, CLASS_FORMAT_ERROR, VERIFY_ERROR, ABSTRACT_METHOD_ERROR, EXCEPTION_IN_INITIALIZER_ERROR, ILLEGAL_ACCESS_ERROR }; // Chapter 5.1 - public static final Class[] EXCS_CLASS_AND_INTERFACE_RESOLUTION_MULTIANEWARRAY = { NO_CLASS_DEF_FOUND_ERROR, + Class[] EXCS_CLASS_AND_INTERFACE_RESOLUTION_MULTIANEWARRAY = { NO_CLASS_DEF_FOUND_ERROR, CLASS_FORMAT_ERROR, VERIFY_ERROR, ABSTRACT_METHOD_ERROR, EXCEPTION_IN_INITIALIZER_ERROR, ILLEGAL_ACCESS_ERROR, NEGATIVE_ARRAY_SIZE_EXCEPTION, ILLEGAL_ACCESS_ERROR }; - public static final Class[] EXCS_CLASS_AND_INTERFACE_RESOLUTION_ANEWARRAY = { NO_CLASS_DEF_FOUND_ERROR, CLASS_FORMAT_ERROR, + Class[] EXCS_CLASS_AND_INTERFACE_RESOLUTION_ANEWARRAY = { NO_CLASS_DEF_FOUND_ERROR, CLASS_FORMAT_ERROR, VERIFY_ERROR, ABSTRACT_METHOD_ERROR, EXCEPTION_IN_INITIALIZER_ERROR, ILLEGAL_ACCESS_ERROR, NEGATIVE_ARRAY_SIZE_EXCEPTION }; // Chapter 5.1 - public static final Class[] EXCS_CLASS_AND_INTERFACE_RESOLUTION_CHECKCAST = { NO_CLASS_DEF_FOUND_ERROR, CLASS_FORMAT_ERROR, + Class[] EXCS_CLASS_AND_INTERFACE_RESOLUTION_CHECKCAST = { NO_CLASS_DEF_FOUND_ERROR, CLASS_FORMAT_ERROR, VERIFY_ERROR, ABSTRACT_METHOD_ERROR, EXCEPTION_IN_INITIALIZER_ERROR, ILLEGAL_ACCESS_ERROR, CLASS_CAST_EXCEPTION }; // Chapter // 5.1 - public static final Class[] EXCS_CLASS_AND_INTERFACE_RESOLUTION_FOR_ALLOCATIONS = { NO_CLASS_DEF_FOUND_ERROR, + Class[] EXCS_CLASS_AND_INTERFACE_RESOLUTION_FOR_ALLOCATIONS = { NO_CLASS_DEF_FOUND_ERROR, CLASS_FORMAT_ERROR, VERIFY_ERROR, ABSTRACT_METHOD_ERROR, EXCEPTION_IN_INITIALIZER_ERROR, ILLEGAL_ACCESS_ERROR, INSTANTIATION_ERROR, ILLEGAL_ACCESS_ERROR }; - public static final Class[] EXCS_FIELD_AND_METHOD_RESOLUTION = { NO_SUCH_FIELD_ERROR, ILLEGAL_ACCESS_ERROR, + Class[] EXCS_FIELD_AND_METHOD_RESOLUTION = { NO_SUCH_FIELD_ERROR, ILLEGAL_ACCESS_ERROR, NO_SUCH_METHOD_ERROR }; // Chapter 5.2 - public static final Class[] EXCS_FIELD_AND_METHOD_RESOLUTION_GETFIELD_PUTFIELD = { NO_SUCH_FIELD_ERROR, ILLEGAL_ACCESS_ERROR, + Class[] EXCS_FIELD_AND_METHOD_RESOLUTION_GETFIELD_PUTFIELD = { NO_SUCH_FIELD_ERROR, ILLEGAL_ACCESS_ERROR, NO_SUCH_METHOD_ERROR, INCOMPATIBLE_CLASS_CHANGE_ERROR, NULL_POINTER_EXCEPTION }; - public static final Class[] EXCS_FIELD_AND_METHOD_RESOLUTION_GETSTATIC_PUTSTATIC = { NO_SUCH_FIELD_ERROR, ILLEGAL_ACCESS_ERROR, + Class[] EXCS_FIELD_AND_METHOD_RESOLUTION_GETSTATIC_PUTSTATIC = { NO_SUCH_FIELD_ERROR, ILLEGAL_ACCESS_ERROR, NO_SUCH_METHOD_ERROR, INCOMPATIBLE_CLASS_CHANGE_ERROR }; - public static final Class[] EXCS_INTERFACE_METHOD_RESOLUTION_INVOKEINTERFACE = { INCOMPATIBLE_CLASS_CHANGE_ERROR, + Class[] EXCS_INTERFACE_METHOD_RESOLUTION_INVOKEINTERFACE = { INCOMPATIBLE_CLASS_CHANGE_ERROR, ILLEGAL_ACCESS_ERROR, ABSTRACT_METHOD_ERROR, UNSATISFIED_LINK_ERROR }; - public static final Class[] EXCS_INTERFACE_METHOD_RESOLUTION_INVOKESPECIAL_INVOKEVIRTUAL = { INCOMPATIBLE_CLASS_CHANGE_ERROR, + Class[] EXCS_INTERFACE_METHOD_RESOLUTION_INVOKESPECIAL_INVOKEVIRTUAL = { INCOMPATIBLE_CLASS_CHANGE_ERROR, NULL_POINTER_EXCEPTION, ABSTRACT_METHOD_ERROR, UNSATISFIED_LINK_ERROR }; // public static final Class[] EXCS_INVOKEDYNAMIC = { BOOTSTRAP_METHOD_ERROR}; - public static final Class[] EXCS_INTERFACE_METHOD_RESOLUTION_INVOKESTATIC = { INCOMPATIBLE_CLASS_CHANGE_ERROR, + Class[] EXCS_INTERFACE_METHOD_RESOLUTION_INVOKESTATIC = { INCOMPATIBLE_CLASS_CHANGE_ERROR, UNSATISFIED_LINK_ERROR }; - public static final Class[] EXCS_INTERFACE_METHOD_RESOLUTION = new Class[0]; // Chapter 5.3 (as below) - public static final Class[] EXCS_STRING_RESOLUTION = new Class[0]; + Class[] EXCS_INTERFACE_METHOD_RESOLUTION = new Class[0]; // Chapter 5.3 (as below) + Class[] EXCS_STRING_RESOLUTION = new Class[0]; // Chapter 5.4 (no errors but the ones that _always_ could happen! How stupid.) - public static final Class[] EXCS_ARRAY_EXCEPTION = { NULL_POINTER_EXCEPTION, ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION }; + Class[] EXCS_ARRAY_EXCEPTION = { NULL_POINTER_EXCEPTION, ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION }; } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ClassVisitor.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ClassVisitor.java index 5c60f818f..695c78c4e 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ClassVisitor.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ClassVisitor.java @@ -64,117 +64,117 @@ import org.aspectj.apache.bcel.classfile.annotation.RuntimeVisTypeAnnos; /** * Interface to make use of the Visitor pattern programming style. I.e. a class that implements this interface can traverse the * contents of a Java class just by calling the `accept' method which all classes have. - * + * * Implemented by wish of <A HREF="http://www.inf.fu-berlin.de/~bokowski">Boris Bokowski</A>. - * + * * @version $Id: ClassVisitor.java,v 1.4 2009/09/15 19:40:13 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ public interface ClassVisitor { - public void visitCode(Code obj); + void visitCode(Code obj); + + void visitCodeException(CodeException obj); + + void visitConstantClass(ConstantClass obj); + + void visitConstantDouble(ConstantDouble obj); + + void visitConstantFieldref(ConstantFieldref obj); + + void visitConstantFloat(ConstantFloat obj); + + void visitConstantInteger(ConstantInteger obj); - public void visitCodeException(CodeException obj); + void visitConstantInterfaceMethodref(ConstantInterfaceMethodref obj); - public void visitConstantClass(ConstantClass obj); + void visitConstantLong(ConstantLong obj); - public void visitConstantDouble(ConstantDouble obj); + void visitConstantMethodref(ConstantMethodref obj); - public void visitConstantFieldref(ConstantFieldref obj); + void visitConstantMethodHandle(ConstantMethodHandle obj); - public void visitConstantFloat(ConstantFloat obj); + void visitConstantNameAndType(ConstantNameAndType obj); - public void visitConstantInteger(ConstantInteger obj); + void visitConstantMethodType(ConstantMethodType obj); - public void visitConstantInterfaceMethodref(ConstantInterfaceMethodref obj); + void visitConstantInvokeDynamic(ConstantInvokeDynamic obj); - public void visitConstantLong(ConstantLong obj); + void visitConstantDynamic(ConstantDynamic obj); - public void visitConstantMethodref(ConstantMethodref obj); - - public void visitConstantMethodHandle(ConstantMethodHandle obj); + void visitConstantPool(ConstantPool obj); - public void visitConstantNameAndType(ConstantNameAndType obj); - - public void visitConstantMethodType(ConstantMethodType obj); - - public void visitConstantInvokeDynamic(ConstantInvokeDynamic obj); - - public void visitConstantDynamic(ConstantDynamic obj); + void visitConstantString(ConstantString obj); - public void visitConstantPool(ConstantPool obj); + void visitConstantModule(ConstantModule obj); - public void visitConstantString(ConstantString obj); + void visitConstantPackage(ConstantPackage obj); - public void visitConstantModule(ConstantModule obj); + void visitConstantUtf8(ConstantUtf8 obj); - public void visitConstantPackage(ConstantPackage obj); + void visitConstantValue(ConstantValue obj); - public void visitConstantUtf8(ConstantUtf8 obj); + void visitDeprecated(Deprecated obj); - public void visitConstantValue(ConstantValue obj); + void visitExceptionTable(ExceptionTable obj); - public void visitDeprecated(Deprecated obj); + void visitField(Field obj); - public void visitExceptionTable(ExceptionTable obj); + void visitInnerClass(InnerClass obj); - public void visitField(Field obj); + void visitInnerClasses(InnerClasses obj); - public void visitInnerClass(InnerClass obj); + void visitJavaClass(JavaClass obj); - public void visitInnerClasses(InnerClasses obj); + void visitLineNumber(LineNumber obj); - public void visitJavaClass(JavaClass obj); + void visitLineNumberTable(LineNumberTable obj); - public void visitLineNumber(LineNumber obj); + void visitLocalVariable(LocalVariable obj); - public void visitLineNumberTable(LineNumberTable obj); + void visitLocalVariableTable(LocalVariableTable obj); - public void visitLocalVariable(LocalVariable obj); + void visitMethod(Method obj); - public void visitLocalVariableTable(LocalVariableTable obj); + void visitSignature(Signature obj); - public void visitMethod(Method obj); + void visitSourceFile(SourceFile obj); - public void visitSignature(Signature obj); + void visitSynthetic(Synthetic obj); - public void visitSourceFile(SourceFile obj); + void visitBootstrapMethods(BootstrapMethods obj); - public void visitSynthetic(Synthetic obj); - - public void visitBootstrapMethods(BootstrapMethods obj); + void visitUnknown(Unknown obj); - public void visitUnknown(Unknown obj); + void visitStackMap(StackMap obj); - public void visitStackMap(StackMap obj); + void visitStackMapEntry(StackMapEntry obj); - public void visitStackMapEntry(StackMapEntry obj); + void visitEnclosingMethod(EnclosingMethod obj); - public void visitEnclosingMethod(EnclosingMethod obj); + void visitRuntimeVisibleAnnotations(RuntimeVisAnnos obj); - public void visitRuntimeVisibleAnnotations(RuntimeVisAnnos obj); + void visitRuntimeInvisibleAnnotations(RuntimeInvisAnnos obj); - public void visitRuntimeInvisibleAnnotations(RuntimeInvisAnnos obj); + void visitRuntimeVisibleParameterAnnotations(RuntimeVisParamAnnos obj); - public void visitRuntimeVisibleParameterAnnotations(RuntimeVisParamAnnos obj); + void visitRuntimeInvisibleParameterAnnotations(RuntimeInvisParamAnnos obj); - public void visitRuntimeInvisibleParameterAnnotations(RuntimeInvisParamAnnos obj); + void visitRuntimeVisibleTypeAnnotations(RuntimeVisTypeAnnos obj); - public void visitRuntimeVisibleTypeAnnotations(RuntimeVisTypeAnnos obj); + void visitRuntimeInvisibleTypeAnnotations(RuntimeInvisTypeAnnos obj); - public void visitRuntimeInvisibleTypeAnnotations(RuntimeInvisTypeAnnos obj); + void visitAnnotationDefault(AnnotationDefault obj); - public void visitAnnotationDefault(AnnotationDefault obj); + void visitLocalVariableTypeTable(LocalVariableTypeTable obj); - public void visitLocalVariableTypeTable(LocalVariableTypeTable obj); + void visitMethodParameters(MethodParameters methodParameters); - public void visitMethodParameters(MethodParameters methodParameters); - // J9: - public void visitModule(Module module); - public void visitModulePackages(ModulePackages modulePackage); - public void visitModuleMainClass(ModuleMainClass moduleMainClass); + void visitModule(Module module); + void visitModulePackages(ModulePackages modulePackage); + void visitModuleMainClass(ModuleMainClass moduleMainClass); // J11: - public void visitNestHost(NestHost nestHost); - public void visitNestMembers(NestMembers nestMembers); + void visitNestHost(NestHost nestHost); + void visitNestMembers(NestMembers nestMembers); } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantObject.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantObject.java index 70e9b1d0d..d9e342a66 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantObject.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantObject.java @@ -56,11 +56,11 @@ package org.aspectj.apache.bcel.classfile; /** * This interface denotes those constants that have a "natural" value, such as ConstantLong, ConstantString, etc.. - * + * * @version $Id: ConstantObject.java,v 1.4 2009/09/10 03:59:33 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see Constant */ public interface ConstantObject { - public abstract Object getConstantValue(ConstantPool cp); + Object getConstantValue(ConstantPool cp); } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Node.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Node.java index 5bef82979..6bc1da6ef 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Node.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Node.java @@ -61,5 +61,5 @@ package org.aspectj.apache.bcel.classfile; * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ public interface Node { - public void accept(ClassVisitor obj); + void accept(ClassVisitor obj); } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/SimpleConstant.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/SimpleConstant.java index 84ff40cf9..d775d1f0a 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/SimpleConstant.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/SimpleConstant.java @@ -54,5 +54,5 @@ package org.aspectj.apache.bcel.classfile; public interface SimpleConstant { - public String getStringValue(); + String getStringValue(); } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstVisitor.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstVisitor.java index 424ff4a66..b4eaa488d 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstVisitor.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstVisitor.java @@ -64,184 +64,184 @@ package org.aspectj.apache.bcel.generic; * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ public interface InstVisitor { - public void visitStackInstruction(Instruction obj); - public void visitLocalVariableInstruction(InstructionLV obj); - public void visitBranchInstruction(InstructionBranch obj); - public void visitLoadClass(Instruction obj); - public void visitFieldInstruction(Instruction obj); - public void visitIfInstruction(Instruction obj); - public void visitConversionInstruction(Instruction obj); - public void visitPopInstruction(Instruction obj); - public void visitStoreInstruction(Instruction obj); - public void visitTypedInstruction(Instruction obj); - public void visitSelect(InstructionSelect obj); - public void visitJsrInstruction(InstructionBranch obj); - public void visitGotoInstruction(Instruction obj); - public void visitUnconditionalBranch(Instruction obj); - public void visitPushInstruction(Instruction obj); - public void visitArithmeticInstruction(Instruction obj); - public void visitCPInstruction(Instruction obj); - public void visitInvokeInstruction(InvokeInstruction obj); - public void visitArrayInstruction(Instruction obj); - public void visitAllocationInstruction(Instruction obj); - public void visitReturnInstruction(Instruction obj); - public void visitFieldOrMethod(Instruction obj); - public void visitConstantPushInstruction(Instruction obj); - public void visitExceptionThrower(Instruction obj); - public void visitLoadInstruction(Instruction obj); - public void visitVariableLengthInstruction(Instruction obj); - public void visitStackProducer(Instruction obj); - public void visitStackConsumer(Instruction obj); - public void visitACONST_NULL(Instruction obj); - public void visitGETSTATIC(FieldInstruction obj); - public void visitIF_ICMPLT(Instruction obj); - public void visitMONITOREXIT(Instruction obj); - public void visitIFLT(Instruction obj); - public void visitLSTORE(Instruction obj); - public void visitPOP2(Instruction obj); - public void visitBASTORE(Instruction obj); - public void visitISTORE(Instruction obj); - public void visitCHECKCAST(Instruction obj); - public void visitFCMPG(Instruction obj); - public void visitI2F(Instruction obj); - public void visitATHROW(Instruction obj); - public void visitDCMPL(Instruction obj); - public void visitARRAYLENGTH(Instruction obj); - public void visitDUP(Instruction obj); - public void visitINVOKESTATIC(InvokeInstruction obj); - public void visitLCONST(Instruction obj); - public void visitDREM(Instruction obj); - public void visitIFGE(Instruction obj); - public void visitCALOAD(Instruction obj); - public void visitLASTORE(Instruction obj); - public void visitI2D(Instruction obj); - public void visitDADD(Instruction obj); - public void visitINVOKESPECIAL(InvokeInstruction obj); - public void visitIAND(Instruction obj); - public void visitPUTFIELD(FieldInstruction obj); - public void visitILOAD(Instruction obj); - public void visitDLOAD(Instruction obj); - public void visitDCONST(Instruction obj); - public void visitNEW(Instruction obj); - public void visitIFNULL(Instruction obj); - public void visitLSUB(Instruction obj); - public void visitL2I(Instruction obj); - public void visitISHR(Instruction obj); - public void visitTABLESWITCH(TABLESWITCH obj); - public void visitIINC(IINC obj); - public void visitDRETURN(Instruction obj); - public void visitFSTORE(Instruction obj); - public void visitDASTORE(Instruction obj); - public void visitIALOAD(Instruction obj); - public void visitDDIV(Instruction obj); - public void visitIF_ICMPGE(Instruction obj); - public void visitLAND(Instruction obj); - public void visitIDIV(Instruction obj); - public void visitLOR(Instruction obj); - public void visitCASTORE(Instruction obj); - public void visitFREM(Instruction obj); - public void visitLDC(Instruction obj); - public void visitBIPUSH(Instruction obj); - public void visitDSTORE(Instruction obj); - public void visitF2L(Instruction obj); - public void visitFMUL(Instruction obj); - public void visitLLOAD(Instruction obj); - public void visitJSR(InstructionBranch obj); - public void visitFSUB(Instruction obj); - public void visitSASTORE(Instruction obj); - public void visitALOAD(Instruction obj); - public void visitDUP2_X2(Instruction obj); - public void visitRETURN(Instruction obj); - public void visitDALOAD(Instruction obj); - public void visitSIPUSH(Instruction obj); - public void visitDSUB(Instruction obj); - public void visitL2F(Instruction obj); - public void visitIF_ICMPGT(Instruction obj); - public void visitF2D(Instruction obj); - public void visitI2L(Instruction obj); - public void visitIF_ACMPNE(Instruction obj); - public void visitPOP(Instruction obj); - public void visitI2S(Instruction obj); - public void visitIFEQ(Instruction obj); - public void visitSWAP(Instruction obj); - public void visitIOR(Instruction obj); - public void visitIREM(Instruction obj); - public void visitIASTORE(Instruction obj); - public void visitNEWARRAY(Instruction obj); - public void visitINVOKEINTERFACE(INVOKEINTERFACE obj); - public void visitINEG(Instruction obj); - public void visitLCMP(Instruction obj); - public void visitJSR_W(InstructionBranch obj); - public void visitMULTIANEWARRAY(MULTIANEWARRAY obj); - public void visitDUP_X2(Instruction obj); - public void visitSALOAD(Instruction obj); - public void visitIFNONNULL(Instruction obj); - public void visitDMUL(Instruction obj); - public void visitIFNE(Instruction obj); - public void visitIF_ICMPLE(Instruction obj); - public void visitLDC2_W(Instruction obj); - public void visitGETFIELD(FieldInstruction obj); - public void visitLADD(Instruction obj); - public void visitNOP(Instruction obj); - public void visitFALOAD(Instruction obj); - public void visitINSTANCEOF(Instruction obj); - public void visitIFLE(Instruction obj); - public void visitLXOR(Instruction obj); - public void visitLRETURN(Instruction obj); - public void visitFCONST(Instruction obj); - public void visitIUSHR(Instruction obj); - public void visitBALOAD(Instruction obj); - public void visitDUP2(Instruction obj); - public void visitIF_ACMPEQ(Instruction obj); - public void visitIMPDEP1(Instruction obj); - public void visitMONITORENTER(Instruction obj); - public void visitLSHL(Instruction obj); - public void visitDCMPG(Instruction obj); - public void visitD2L(Instruction obj); - public void visitIMPDEP2(Instruction obj); - public void visitL2D(Instruction obj); - public void visitRET(RET obj); - public void visitIFGT(Instruction obj); - public void visitIXOR(Instruction obj); - public void visitINVOKEVIRTUAL(InvokeInstruction obj); - public void visitFASTORE(Instruction obj); - public void visitIRETURN(Instruction obj); - public void visitIF_ICMPNE(Instruction obj); - public void visitFLOAD(Instruction obj); - public void visitLDIV(Instruction obj); - public void visitPUTSTATIC(FieldInstruction obj); - public void visitAALOAD(Instruction obj); - public void visitD2I(Instruction obj); - public void visitIF_ICMPEQ(Instruction obj); - public void visitAASTORE(Instruction obj); - public void visitARETURN(Instruction obj); - public void visitDUP2_X1(Instruction obj); - public void visitFNEG(Instruction obj); - public void visitGOTO_W(Instruction obj); - public void visitD2F(Instruction obj); - public void visitGOTO(Instruction obj); - public void visitISUB(Instruction obj); - public void visitF2I(Instruction obj); - public void visitDNEG(Instruction obj); - public void visitICONST(Instruction obj); - public void visitFDIV(Instruction obj); - public void visitI2B(Instruction obj); - public void visitLNEG(Instruction obj); - public void visitLREM(Instruction obj); - public void visitIMUL(Instruction obj); - public void visitIADD(Instruction obj); - public void visitLSHR(Instruction obj); - public void visitLOOKUPSWITCH(LOOKUPSWITCH obj); - public void visitDUP_X1(Instruction obj); - public void visitFCMPL(Instruction obj); - public void visitI2C(Instruction obj); - public void visitLMUL(Instruction obj); - public void visitLUSHR(Instruction obj); - public void visitISHL(Instruction obj); - public void visitLALOAD(Instruction obj); - public void visitASTORE(Instruction obj); - public void visitANEWARRAY(Instruction obj); - public void visitFRETURN(Instruction obj); - public void visitFADD(Instruction obj); - public void visitBREAKPOINT(Instruction obj); + void visitStackInstruction(Instruction obj); + void visitLocalVariableInstruction(InstructionLV obj); + void visitBranchInstruction(InstructionBranch obj); + void visitLoadClass(Instruction obj); + void visitFieldInstruction(Instruction obj); + void visitIfInstruction(Instruction obj); + void visitConversionInstruction(Instruction obj); + void visitPopInstruction(Instruction obj); + void visitStoreInstruction(Instruction obj); + void visitTypedInstruction(Instruction obj); + void visitSelect(InstructionSelect obj); + void visitJsrInstruction(InstructionBranch obj); + void visitGotoInstruction(Instruction obj); + void visitUnconditionalBranch(Instruction obj); + void visitPushInstruction(Instruction obj); + void visitArithmeticInstruction(Instruction obj); + void visitCPInstruction(Instruction obj); + void visitInvokeInstruction(InvokeInstruction obj); + void visitArrayInstruction(Instruction obj); + void visitAllocationInstruction(Instruction obj); + void visitReturnInstruction(Instruction obj); + void visitFieldOrMethod(Instruction obj); + void visitConstantPushInstruction(Instruction obj); + void visitExceptionThrower(Instruction obj); + void visitLoadInstruction(Instruction obj); + void visitVariableLengthInstruction(Instruction obj); + void visitStackProducer(Instruction obj); + void visitStackConsumer(Instruction obj); + void visitACONST_NULL(Instruction obj); + void visitGETSTATIC(FieldInstruction obj); + void visitIF_ICMPLT(Instruction obj); + void visitMONITOREXIT(Instruction obj); + void visitIFLT(Instruction obj); + void visitLSTORE(Instruction obj); + void visitPOP2(Instruction obj); + void visitBASTORE(Instruction obj); + void visitISTORE(Instruction obj); + void visitCHECKCAST(Instruction obj); + void visitFCMPG(Instruction obj); + void visitI2F(Instruction obj); + void visitATHROW(Instruction obj); + void visitDCMPL(Instruction obj); + void visitARRAYLENGTH(Instruction obj); + void visitDUP(Instruction obj); + void visitINVOKESTATIC(InvokeInstruction obj); + void visitLCONST(Instruction obj); + void visitDREM(Instruction obj); + void visitIFGE(Instruction obj); + void visitCALOAD(Instruction obj); + void visitLASTORE(Instruction obj); + void visitI2D(Instruction obj); + void visitDADD(Instruction obj); + void visitINVOKESPECIAL(InvokeInstruction obj); + void visitIAND(Instruction obj); + void visitPUTFIELD(FieldInstruction obj); + void visitILOAD(Instruction obj); + void visitDLOAD(Instruction obj); + void visitDCONST(Instruction obj); + void visitNEW(Instruction obj); + void visitIFNULL(Instruction obj); + void visitLSUB(Instruction obj); + void visitL2I(Instruction obj); + void visitISHR(Instruction obj); + void visitTABLESWITCH(TABLESWITCH obj); + void visitIINC(IINC obj); + void visitDRETURN(Instruction obj); + void visitFSTORE(Instruction obj); + void visitDASTORE(Instruction obj); + void visitIALOAD(Instruction obj); + void visitDDIV(Instruction obj); + void visitIF_ICMPGE(Instruction obj); + void visitLAND(Instruction obj); + void visitIDIV(Instruction obj); + void visitLOR(Instruction obj); + void visitCASTORE(Instruction obj); + void visitFREM(Instruction obj); + void visitLDC(Instruction obj); + void visitBIPUSH(Instruction obj); + void visitDSTORE(Instruction obj); + void visitF2L(Instruction obj); + void visitFMUL(Instruction obj); + void visitLLOAD(Instruction obj); + void visitJSR(InstructionBranch obj); + void visitFSUB(Instruction obj); + void visitSASTORE(Instruction obj); + void visitALOAD(Instruction obj); + void visitDUP2_X2(Instruction obj); + void visitRETURN(Instruction obj); + void visitDALOAD(Instruction obj); + void visitSIPUSH(Instruction obj); + void visitDSUB(Instruction obj); + void visitL2F(Instruction obj); + void visitIF_ICMPGT(Instruction obj); + void visitF2D(Instruction obj); + void visitI2L(Instruction obj); + void visitIF_ACMPNE(Instruction obj); + void visitPOP(Instruction obj); + void visitI2S(Instruction obj); + void visitIFEQ(Instruction obj); + void visitSWAP(Instruction obj); + void visitIOR(Instruction obj); + void visitIREM(Instruction obj); + void visitIASTORE(Instruction obj); + void visitNEWARRAY(Instruction obj); + void visitINVOKEINTERFACE(INVOKEINTERFACE obj); + void visitINEG(Instruction obj); + void visitLCMP(Instruction obj); + void visitJSR_W(InstructionBranch obj); + void visitMULTIANEWARRAY(MULTIANEWARRAY obj); + void visitDUP_X2(Instruction obj); + void visitSALOAD(Instruction obj); + void visitIFNONNULL(Instruction obj); + void visitDMUL(Instruction obj); + void visitIFNE(Instruction obj); + void visitIF_ICMPLE(Instruction obj); + void visitLDC2_W(Instruction obj); + void visitGETFIELD(FieldInstruction obj); + void visitLADD(Instruction obj); + void visitNOP(Instruction obj); + void visitFALOAD(Instruction obj); + void visitINSTANCEOF(Instruction obj); + void visitIFLE(Instruction obj); + void visitLXOR(Instruction obj); + void visitLRETURN(Instruction obj); + void visitFCONST(Instruction obj); + void visitIUSHR(Instruction obj); + void visitBALOAD(Instruction obj); + void visitDUP2(Instruction obj); + void visitIF_ACMPEQ(Instruction obj); + void visitIMPDEP1(Instruction obj); + void visitMONITORENTER(Instruction obj); + void visitLSHL(Instruction obj); + void visitDCMPG(Instruction obj); + void visitD2L(Instruction obj); + void visitIMPDEP2(Instruction obj); + void visitL2D(Instruction obj); + void visitRET(RET obj); + void visitIFGT(Instruction obj); + void visitIXOR(Instruction obj); + void visitINVOKEVIRTUAL(InvokeInstruction obj); + void visitFASTORE(Instruction obj); + void visitIRETURN(Instruction obj); + void visitIF_ICMPNE(Instruction obj); + void visitFLOAD(Instruction obj); + void visitLDIV(Instruction obj); + void visitPUTSTATIC(FieldInstruction obj); + void visitAALOAD(Instruction obj); + void visitD2I(Instruction obj); + void visitIF_ICMPEQ(Instruction obj); + void visitAASTORE(Instruction obj); + void visitARETURN(Instruction obj); + void visitDUP2_X1(Instruction obj); + void visitFNEG(Instruction obj); + void visitGOTO_W(Instruction obj); + void visitD2F(Instruction obj); + void visitGOTO(Instruction obj); + void visitISUB(Instruction obj); + void visitF2I(Instruction obj); + void visitDNEG(Instruction obj); + void visitICONST(Instruction obj); + void visitFDIV(Instruction obj); + void visitI2B(Instruction obj); + void visitLNEG(Instruction obj); + void visitLREM(Instruction obj); + void visitIMUL(Instruction obj); + void visitIADD(Instruction obj); + void visitLSHR(Instruction obj); + void visitLOOKUPSWITCH(LOOKUPSWITCH obj); + void visitDUP_X1(Instruction obj); + void visitFCMPL(Instruction obj); + void visitI2C(Instruction obj); + void visitLMUL(Instruction obj); + void visitLUSHR(Instruction obj); + void visitISHL(Instruction obj); + void visitLALOAD(Instruction obj); + void visitASTORE(Instruction obj); + void visitANEWARRAY(Instruction obj); + void visitFRETURN(Instruction obj); + void visitFADD(Instruction obj); + void visitBREAKPOINT(Instruction obj); } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionConstants.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionConstants.java index e6f884793..8b5a0da5c 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionConstants.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionConstants.java @@ -56,7 +56,7 @@ package org.aspectj.apache.bcel.generic; import org.aspectj.apache.bcel.Constants; -/** +/** * This interface contains shareable instruction objects. * * In order to save memory you can use some instructions multiply, @@ -76,172 +76,172 @@ import org.aspectj.apache.bcel.Constants; public interface InstructionConstants { /** Predefined instruction objects */ - public static final Instruction NOP = new Instruction(Constants.NOP); - public static final Instruction ACONST_NULL = new Instruction(Constants.ACONST_NULL); - public static final Instruction ICONST_M1 = new Instruction(Constants.ICONST_M1); - public static final Instruction ICONST_0 = new Instruction(Constants.ICONST_0); - public static final Instruction ICONST_1 = new Instruction(Constants.ICONST_1); - public static final Instruction ICONST_2 = new Instruction(Constants.ICONST_2); - public static final Instruction ICONST_3 = new Instruction(Constants.ICONST_3); - public static final Instruction ICONST_4 = new Instruction(Constants.ICONST_4); - public static final Instruction ICONST_5 = new Instruction(Constants.ICONST_5); - public static final Instruction LCONST_0 = new Instruction(Constants.LCONST_0); - public static final Instruction LCONST_1 = new Instruction(Constants.LCONST_1); - public static final Instruction FCONST_0 = new Instruction(Constants.FCONST_0); - public static final Instruction FCONST_1 = new Instruction(Constants.FCONST_1); - public static final Instruction FCONST_2 = new Instruction(Constants.FCONST_2); - public static final Instruction DCONST_0 = new Instruction(Constants.DCONST_0); - public static final Instruction DCONST_1 = new Instruction(Constants.DCONST_1); - public static final Instruction IALOAD = new Instruction(Constants.IALOAD); - public static final Instruction LALOAD = new Instruction(Constants.LALOAD); - public static final Instruction FALOAD = new Instruction(Constants.FALOAD); - public static final Instruction DALOAD = new Instruction(Constants.DALOAD); - public static final Instruction AALOAD = new Instruction(Constants.AALOAD); - public static final Instruction BALOAD = new Instruction(Constants.BALOAD); - public static final Instruction CALOAD = new Instruction(Constants.CALOAD); - public static final Instruction SALOAD = new Instruction(Constants.SALOAD); - public static final Instruction IASTORE = new Instruction(Constants.IASTORE); - public static final Instruction LASTORE = new Instruction(Constants.LASTORE); - public static final Instruction FASTORE = new Instruction(Constants.FASTORE); - public static final Instruction DASTORE = new Instruction(Constants.DASTORE); - public static final Instruction AASTORE = new Instruction(Constants.AASTORE); - public static final Instruction BASTORE = new Instruction(Constants.BASTORE); - public static final Instruction CASTORE = new Instruction(Constants.CASTORE); - public static final Instruction SASTORE = new Instruction(Constants.SASTORE); - public static final Instruction POP = new Instruction(Constants.POP); - public static final Instruction POP2 = new Instruction(Constants.POP2); - public static final Instruction DUP = new Instruction(Constants.DUP); - public static final Instruction DUP_X1 = new Instruction(Constants.DUP_X1); - public static final Instruction DUP_X2 = new Instruction(Constants.DUP_X2); - public static final Instruction DUP2 = new Instruction(Constants.DUP2); - public static final Instruction DUP2_X1 = new Instruction(Constants.DUP2_X1); - public static final Instruction DUP2_X2 = new Instruction(Constants.DUP2_X2); - public static final Instruction SWAP = new Instruction(Constants.SWAP); - public static final Instruction IADD = new Instruction(Constants.IADD); - public static final Instruction LADD = new Instruction(Constants.LADD); - public static final Instruction FADD = new Instruction(Constants.FADD); - public static final Instruction DADD = new Instruction(Constants.DADD); - public static final Instruction ISUB = new Instruction(Constants.ISUB); - public static final Instruction LSUB = new Instruction(Constants.LSUB); - public static final Instruction FSUB = new Instruction(Constants.FSUB); - public static final Instruction DSUB = new Instruction(Constants.DSUB); - public static final Instruction IMUL = new Instruction(Constants.IMUL); - public static final Instruction LMUL = new Instruction(Constants.LMUL); - public static final Instruction FMUL = new Instruction(Constants.FMUL); - public static final Instruction DMUL = new Instruction(Constants.DMUL); - public static final Instruction IDIV = new Instruction(Constants.IDIV); - public static final Instruction LDIV = new Instruction(Constants.LDIV); - public static final Instruction FDIV = new Instruction(Constants.FDIV); - public static final Instruction DDIV = new Instruction(Constants.DDIV); - public static final Instruction IREM = new Instruction(Constants.IREM); - public static final Instruction LREM = new Instruction(Constants.LREM); - public static final Instruction FREM = new Instruction(Constants.FREM); - public static final Instruction DREM = new Instruction(Constants.DREM); - public static final Instruction INEG = new Instruction(Constants.INEG); - public static final Instruction LNEG = new Instruction(Constants.LNEG); - public static final Instruction FNEG = new Instruction(Constants.FNEG); - public static final Instruction DNEG = new Instruction(Constants.DNEG); - public static final Instruction ISHL = new Instruction(Constants.ISHL); - public static final Instruction LSHL = new Instruction(Constants.LSHL); - public static final Instruction ISHR = new Instruction(Constants.ISHR); - public static final Instruction LSHR = new Instruction(Constants.LSHR); - public static final Instruction IUSHR = new Instruction(Constants.IUSHR); - public static final Instruction LUSHR = new Instruction(Constants.LUSHR); - public static final Instruction IAND = new Instruction(Constants.IAND); - public static final Instruction LAND = new Instruction(Constants.LAND); - public static final Instruction IOR = new Instruction(Constants.IOR); - public static final Instruction LOR = new Instruction(Constants.LOR); - public static final Instruction IXOR = new Instruction(Constants.IXOR); - public static final Instruction LXOR = new Instruction(Constants.LXOR); - public static final Instruction I2L = new Instruction(Constants.I2L); - public static final Instruction I2F = new Instruction(Constants.I2F); - public static final Instruction I2D = new Instruction(Constants.I2D); - public static final Instruction L2I = new Instruction(Constants.L2I); - public static final Instruction L2F = new Instruction(Constants.L2F); - public static final Instruction L2D = new Instruction(Constants.L2D); - public static final Instruction F2I = new Instruction(Constants.F2I); - public static final Instruction F2L = new Instruction(Constants.F2L); - public static final Instruction F2D = new Instruction(Constants.F2D); - public static final Instruction D2I = new Instruction(Constants.D2I); - public static final Instruction D2L = new Instruction(Constants.D2L); - public static final Instruction D2F = new Instruction(Constants.D2F); - public static final Instruction I2B = new Instruction(Constants.I2B); - public static final Instruction I2C = new Instruction(Constants.I2C); - public static final Instruction I2S = new Instruction(Constants.I2S); - public static final Instruction LCMP = new Instruction(Constants.LCMP); - public static final Instruction FCMPL = new Instruction(Constants.FCMPL); - public static final Instruction FCMPG = new Instruction(Constants.FCMPG); - public static final Instruction DCMPL = new Instruction(Constants.DCMPL); - public static final Instruction DCMPG = new Instruction(Constants.DCMPG); - public static final Instruction IRETURN = new Instruction(Constants.IRETURN); - public static final Instruction LRETURN = new Instruction(Constants.LRETURN); - public static final Instruction FRETURN = new Instruction(Constants.FRETURN); - public static final Instruction DRETURN = new Instruction(Constants.DRETURN); - public static final Instruction ARETURN = new Instruction(Constants.ARETURN); - public static final Instruction RETURN = new Instruction(Constants.RETURN); - public static final Instruction ARRAYLENGTH = new Instruction(Constants.ARRAYLENGTH); - public static final Instruction ATHROW = new Instruction(Constants.ATHROW); - public static final Instruction MONITORENTER = new Instruction(Constants.MONITORENTER); - public static final Instruction MONITOREXIT = new Instruction(Constants.MONITOREXIT); - public static final Instruction IMPDEP1 = new Instruction(Constants.IMPDEP1); - public static final Instruction IMPDEP2 = new Instruction(Constants.IMPDEP2); + Instruction NOP = new Instruction(Constants.NOP); + Instruction ACONST_NULL = new Instruction(Constants.ACONST_NULL); + Instruction ICONST_M1 = new Instruction(Constants.ICONST_M1); + Instruction ICONST_0 = new Instruction(Constants.ICONST_0); + Instruction ICONST_1 = new Instruction(Constants.ICONST_1); + Instruction ICONST_2 = new Instruction(Constants.ICONST_2); + Instruction ICONST_3 = new Instruction(Constants.ICONST_3); + Instruction ICONST_4 = new Instruction(Constants.ICONST_4); + Instruction ICONST_5 = new Instruction(Constants.ICONST_5); + Instruction LCONST_0 = new Instruction(Constants.LCONST_0); + Instruction LCONST_1 = new Instruction(Constants.LCONST_1); + Instruction FCONST_0 = new Instruction(Constants.FCONST_0); + Instruction FCONST_1 = new Instruction(Constants.FCONST_1); + Instruction FCONST_2 = new Instruction(Constants.FCONST_2); + Instruction DCONST_0 = new Instruction(Constants.DCONST_0); + Instruction DCONST_1 = new Instruction(Constants.DCONST_1); + Instruction IALOAD = new Instruction(Constants.IALOAD); + Instruction LALOAD = new Instruction(Constants.LALOAD); + Instruction FALOAD = new Instruction(Constants.FALOAD); + Instruction DALOAD = new Instruction(Constants.DALOAD); + Instruction AALOAD = new Instruction(Constants.AALOAD); + Instruction BALOAD = new Instruction(Constants.BALOAD); + Instruction CALOAD = new Instruction(Constants.CALOAD); + Instruction SALOAD = new Instruction(Constants.SALOAD); + Instruction IASTORE = new Instruction(Constants.IASTORE); + Instruction LASTORE = new Instruction(Constants.LASTORE); + Instruction FASTORE = new Instruction(Constants.FASTORE); + Instruction DASTORE = new Instruction(Constants.DASTORE); + Instruction AASTORE = new Instruction(Constants.AASTORE); + Instruction BASTORE = new Instruction(Constants.BASTORE); + Instruction CASTORE = new Instruction(Constants.CASTORE); + Instruction SASTORE = new Instruction(Constants.SASTORE); + Instruction POP = new Instruction(Constants.POP); + Instruction POP2 = new Instruction(Constants.POP2); + Instruction DUP = new Instruction(Constants.DUP); + Instruction DUP_X1 = new Instruction(Constants.DUP_X1); + Instruction DUP_X2 = new Instruction(Constants.DUP_X2); + Instruction DUP2 = new Instruction(Constants.DUP2); + Instruction DUP2_X1 = new Instruction(Constants.DUP2_X1); + Instruction DUP2_X2 = new Instruction(Constants.DUP2_X2); + Instruction SWAP = new Instruction(Constants.SWAP); + Instruction IADD = new Instruction(Constants.IADD); + Instruction LADD = new Instruction(Constants.LADD); + Instruction FADD = new Instruction(Constants.FADD); + Instruction DADD = new Instruction(Constants.DADD); + Instruction ISUB = new Instruction(Constants.ISUB); + Instruction LSUB = new Instruction(Constants.LSUB); + Instruction FSUB = new Instruction(Constants.FSUB); + Instruction DSUB = new Instruction(Constants.DSUB); + Instruction IMUL = new Instruction(Constants.IMUL); + Instruction LMUL = new Instruction(Constants.LMUL); + Instruction FMUL = new Instruction(Constants.FMUL); + Instruction DMUL = new Instruction(Constants.DMUL); + Instruction IDIV = new Instruction(Constants.IDIV); + Instruction LDIV = new Instruction(Constants.LDIV); + Instruction FDIV = new Instruction(Constants.FDIV); + Instruction DDIV = new Instruction(Constants.DDIV); + Instruction IREM = new Instruction(Constants.IREM); + Instruction LREM = new Instruction(Constants.LREM); + Instruction FREM = new Instruction(Constants.FREM); + Instruction DREM = new Instruction(Constants.DREM); + Instruction INEG = new Instruction(Constants.INEG); + Instruction LNEG = new Instruction(Constants.LNEG); + Instruction FNEG = new Instruction(Constants.FNEG); + Instruction DNEG = new Instruction(Constants.DNEG); + Instruction ISHL = new Instruction(Constants.ISHL); + Instruction LSHL = new Instruction(Constants.LSHL); + Instruction ISHR = new Instruction(Constants.ISHR); + Instruction LSHR = new Instruction(Constants.LSHR); + Instruction IUSHR = new Instruction(Constants.IUSHR); + Instruction LUSHR = new Instruction(Constants.LUSHR); + Instruction IAND = new Instruction(Constants.IAND); + Instruction LAND = new Instruction(Constants.LAND); + Instruction IOR = new Instruction(Constants.IOR); + Instruction LOR = new Instruction(Constants.LOR); + Instruction IXOR = new Instruction(Constants.IXOR); + Instruction LXOR = new Instruction(Constants.LXOR); + Instruction I2L = new Instruction(Constants.I2L); + Instruction I2F = new Instruction(Constants.I2F); + Instruction I2D = new Instruction(Constants.I2D); + Instruction L2I = new Instruction(Constants.L2I); + Instruction L2F = new Instruction(Constants.L2F); + Instruction L2D = new Instruction(Constants.L2D); + Instruction F2I = new Instruction(Constants.F2I); + Instruction F2L = new Instruction(Constants.F2L); + Instruction F2D = new Instruction(Constants.F2D); + Instruction D2I = new Instruction(Constants.D2I); + Instruction D2L = new Instruction(Constants.D2L); + Instruction D2F = new Instruction(Constants.D2F); + Instruction I2B = new Instruction(Constants.I2B); + Instruction I2C = new Instruction(Constants.I2C); + Instruction I2S = new Instruction(Constants.I2S); + Instruction LCMP = new Instruction(Constants.LCMP); + Instruction FCMPL = new Instruction(Constants.FCMPL); + Instruction FCMPG = new Instruction(Constants.FCMPG); + Instruction DCMPL = new Instruction(Constants.DCMPL); + Instruction DCMPG = new Instruction(Constants.DCMPG); + Instruction IRETURN = new Instruction(Constants.IRETURN); + Instruction LRETURN = new Instruction(Constants.LRETURN); + Instruction FRETURN = new Instruction(Constants.FRETURN); + Instruction DRETURN = new Instruction(Constants.DRETURN); + Instruction ARETURN = new Instruction(Constants.ARETURN); + Instruction RETURN = new Instruction(Constants.RETURN); + Instruction ARRAYLENGTH = new Instruction(Constants.ARRAYLENGTH); + Instruction ATHROW = new Instruction(Constants.ATHROW); + Instruction MONITORENTER = new Instruction(Constants.MONITORENTER); + Instruction MONITOREXIT = new Instruction(Constants.MONITOREXIT); + Instruction IMPDEP1 = new Instruction(Constants.IMPDEP1); + Instruction IMPDEP2 = new Instruction(Constants.IMPDEP2); // You can use these constants in multiple places safely, any attempt to change the index // for these constants will cause an exception - public static final InstructionLV THIS = new InstructionCLV(Constants.ALOAD,0); - public static final InstructionLV ALOAD_0 = new InstructionCLV(Constants.ALOAD_0); - public static final InstructionLV ALOAD_1 = new InstructionCLV(Constants.ALOAD_1); - public static final InstructionLV ALOAD_2 = new InstructionCLV(Constants.ALOAD_2); - public static final InstructionLV ALOAD_3 = new InstructionCLV(Constants.ALOAD_3); - public static final InstructionLV ILOAD_0 = new InstructionCLV(Constants.ILOAD_0); - public static final InstructionLV ILOAD_1 = new InstructionCLV(Constants.ILOAD_1); - public static final InstructionLV ILOAD_2 = new InstructionCLV(Constants.ILOAD_2); - public static final InstructionLV ILOAD_3 = new InstructionCLV(Constants.ILOAD_3); - public static final InstructionLV DLOAD_0 = new InstructionCLV(Constants.DLOAD_0); - public static final InstructionLV DLOAD_1 = new InstructionCLV(Constants.DLOAD_1); - public static final InstructionLV DLOAD_2 = new InstructionCLV(Constants.DLOAD_2); - public static final InstructionLV DLOAD_3 = new InstructionCLV(Constants.DLOAD_3); - public static final InstructionLV FLOAD_0 = new InstructionCLV(Constants.FLOAD_0); - public static final InstructionLV FLOAD_1 = new InstructionCLV(Constants.FLOAD_1); - public static final InstructionLV FLOAD_2 = new InstructionCLV(Constants.FLOAD_2); - public static final InstructionLV FLOAD_3 = new InstructionCLV(Constants.FLOAD_3); - public static final InstructionLV LLOAD_0 = new InstructionCLV(Constants.LLOAD_0); - public static final InstructionLV LLOAD_1 = new InstructionCLV(Constants.LLOAD_1); - public static final InstructionLV LLOAD_2 = new InstructionCLV(Constants.LLOAD_2); - public static final InstructionLV LLOAD_3 = new InstructionCLV(Constants.LLOAD_3); - public static final InstructionLV ASTORE_0 = new InstructionCLV(Constants.ASTORE_0); - public static final InstructionLV ASTORE_1 = new InstructionCLV(Constants.ASTORE_1); - public static final InstructionLV ASTORE_2 = new InstructionCLV(Constants.ASTORE_2); - public static final InstructionLV ASTORE_3 = new InstructionCLV(Constants.ASTORE_3); - public static final InstructionLV ISTORE_0 = new InstructionCLV(Constants.ISTORE_0); - public static final InstructionLV ISTORE_1 = new InstructionCLV(Constants.ISTORE_1); - public static final InstructionLV ISTORE_2 = new InstructionCLV(Constants.ISTORE_2); - public static final InstructionLV ISTORE_3 = new InstructionCLV(Constants.ISTORE_3); - public static final InstructionLV LSTORE_0 = new InstructionCLV(Constants.LSTORE_0); - public static final InstructionLV LSTORE_1 = new InstructionCLV(Constants.LSTORE_1); - public static final InstructionLV LSTORE_2 = new InstructionCLV(Constants.LSTORE_2); - public static final InstructionLV LSTORE_3 = new InstructionCLV(Constants.LSTORE_3); - public static final InstructionLV FSTORE_0 = new InstructionCLV(Constants.FSTORE_0); - public static final InstructionLV FSTORE_1 = new InstructionCLV(Constants.FSTORE_1); - public static final InstructionLV FSTORE_2 = new InstructionCLV(Constants.FSTORE_2); - public static final InstructionLV FSTORE_3 = new InstructionCLV(Constants.FSTORE_3); - public static final InstructionLV DSTORE_0 = new InstructionCLV(Constants.DSTORE_0); - public static final InstructionLV DSTORE_1 = new InstructionCLV(Constants.DSTORE_1); - public static final InstructionLV DSTORE_2 = new InstructionCLV(Constants.DSTORE_2); - public static final InstructionLV DSTORE_3 = new InstructionCLV(Constants.DSTORE_3); + InstructionLV THIS = new InstructionCLV(Constants.ALOAD,0); + InstructionLV ALOAD_0 = new InstructionCLV(Constants.ALOAD_0); + InstructionLV ALOAD_1 = new InstructionCLV(Constants.ALOAD_1); + InstructionLV ALOAD_2 = new InstructionCLV(Constants.ALOAD_2); + InstructionLV ALOAD_3 = new InstructionCLV(Constants.ALOAD_3); + InstructionLV ILOAD_0 = new InstructionCLV(Constants.ILOAD_0); + InstructionLV ILOAD_1 = new InstructionCLV(Constants.ILOAD_1); + InstructionLV ILOAD_2 = new InstructionCLV(Constants.ILOAD_2); + InstructionLV ILOAD_3 = new InstructionCLV(Constants.ILOAD_3); + InstructionLV DLOAD_0 = new InstructionCLV(Constants.DLOAD_0); + InstructionLV DLOAD_1 = new InstructionCLV(Constants.DLOAD_1); + InstructionLV DLOAD_2 = new InstructionCLV(Constants.DLOAD_2); + InstructionLV DLOAD_3 = new InstructionCLV(Constants.DLOAD_3); + InstructionLV FLOAD_0 = new InstructionCLV(Constants.FLOAD_0); + InstructionLV FLOAD_1 = new InstructionCLV(Constants.FLOAD_1); + InstructionLV FLOAD_2 = new InstructionCLV(Constants.FLOAD_2); + InstructionLV FLOAD_3 = new InstructionCLV(Constants.FLOAD_3); + InstructionLV LLOAD_0 = new InstructionCLV(Constants.LLOAD_0); + InstructionLV LLOAD_1 = new InstructionCLV(Constants.LLOAD_1); + InstructionLV LLOAD_2 = new InstructionCLV(Constants.LLOAD_2); + InstructionLV LLOAD_3 = new InstructionCLV(Constants.LLOAD_3); + InstructionLV ASTORE_0 = new InstructionCLV(Constants.ASTORE_0); + InstructionLV ASTORE_1 = new InstructionCLV(Constants.ASTORE_1); + InstructionLV ASTORE_2 = new InstructionCLV(Constants.ASTORE_2); + InstructionLV ASTORE_3 = new InstructionCLV(Constants.ASTORE_3); + InstructionLV ISTORE_0 = new InstructionCLV(Constants.ISTORE_0); + InstructionLV ISTORE_1 = new InstructionCLV(Constants.ISTORE_1); + InstructionLV ISTORE_2 = new InstructionCLV(Constants.ISTORE_2); + InstructionLV ISTORE_3 = new InstructionCLV(Constants.ISTORE_3); + InstructionLV LSTORE_0 = new InstructionCLV(Constants.LSTORE_0); + InstructionLV LSTORE_1 = new InstructionCLV(Constants.LSTORE_1); + InstructionLV LSTORE_2 = new InstructionCLV(Constants.LSTORE_2); + InstructionLV LSTORE_3 = new InstructionCLV(Constants.LSTORE_3); + InstructionLV FSTORE_0 = new InstructionCLV(Constants.FSTORE_0); + InstructionLV FSTORE_1 = new InstructionCLV(Constants.FSTORE_1); + InstructionLV FSTORE_2 = new InstructionCLV(Constants.FSTORE_2); + InstructionLV FSTORE_3 = new InstructionCLV(Constants.FSTORE_3); + InstructionLV DSTORE_0 = new InstructionCLV(Constants.DSTORE_0); + InstructionLV DSTORE_1 = new InstructionCLV(Constants.DSTORE_1); + InstructionLV DSTORE_2 = new InstructionCLV(Constants.DSTORE_2); + InstructionLV DSTORE_3 = new InstructionCLV(Constants.DSTORE_3); /** Get object via its opcode, for immutable instructions like * branch instructions entries are set to null. */ - public static final Instruction[] INSTRUCTIONS = new Instruction[256]; - + Instruction[] INSTRUCTIONS = new Instruction[256]; + /** Interfaces may have no static initializers, so we simulate this * with an inner class. */ - static final Clinit bla = new Clinit(); + Clinit bla = new Clinit(); - static class Clinit { + class Clinit { Clinit() { INSTRUCTIONS[Constants.NOP] = NOP; INSTRUCTIONS[Constants.ACONST_NULL] = ACONST_NULL; @@ -352,7 +352,7 @@ public interface InstructionConstants { INSTRUCTIONS[Constants.MONITOREXIT] = MONITOREXIT; INSTRUCTIONS[Constants.IMPDEP1] = IMPDEP1; INSTRUCTIONS[Constants.IMPDEP2] = IMPDEP2; - + INSTRUCTIONS[Constants.ALOAD_0] = ALOAD_0;INSTRUCTIONS[Constants.ALOAD_1] = ALOAD_1; INSTRUCTIONS[Constants.ALOAD_2] = ALOAD_2;INSTRUCTIONS[Constants.ALOAD_3] = ALOAD_3; INSTRUCTIONS[Constants.LLOAD_0] = LLOAD_0;INSTRUCTIONS[Constants.LLOAD_1] = LLOAD_1; diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionTargeter.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionTargeter.java index 950ed3fa9..27bace608 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionTargeter.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionTargeter.java @@ -65,6 +65,6 @@ package org.aspectj.apache.bcel.generic; * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ public interface InstructionTargeter { - public boolean containsTarget(InstructionHandle ih); - public void updateTarget(InstructionHandle old_ih, InstructionHandle new_ih); + boolean containsTarget(InstructionHandle ih); + void updateTarget(InstructionHandle old_ih, InstructionHandle new_ih); } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassPath.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassPath.java index c39d2195b..35666b334 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassPath.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassPath.java @@ -366,28 +366,28 @@ public class ClassPath implements Serializable { /** * @return input stream for class file. */ - public abstract InputStream getInputStream() throws IOException; + InputStream getInputStream() throws IOException; /** * @return canonical path to class file. */ - public abstract String getPath(); + String getPath(); /** * @return base path of found class, i.e. class is contained relative to * that path, which may either denote a directory, or zip file */ - public abstract String getBase(); + String getBase(); /** * @return modification time of class file. */ - public abstract long getTime(); + long getTime(); /** * @return size of class file. */ - public abstract long getSize(); + long getSize(); } private static class Dir extends PathEntry { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/Repository.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/Repository.java index eea889e61..1f6031b71 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/Repository.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/Repository.java @@ -59,7 +59,7 @@ import org.aspectj.apache.bcel.classfile.JavaClass; /** * Abstract definition of a class repository. Instances may be used to load classes from different sources and may be used in the * Repository.setRepository method. - * + * * @see org.aspectj.apache.bcel.Repository * @version $Id: Repository.java,v 1.5 2009/09/09 19:56:20 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> @@ -69,30 +69,30 @@ public interface Repository { /** * Store the provided class under "clazz.getClassName()" */ - public void storeClass(JavaClass clazz); + void storeClass(JavaClass clazz); /** * Remove class from repository */ - public void removeClass(JavaClass clazz); + void removeClass(JavaClass clazz); /** * Find the class with the name provided, if the class isn't there, return NULL. */ - public JavaClass findClass(String className); + JavaClass findClass(String className); /** * Find the class with the name provided, if the class isn't there, make an attempt to load it. */ - public JavaClass loadClass(String className) throws java.lang.ClassNotFoundException; + JavaClass loadClass(String className) throws java.lang.ClassNotFoundException; /** * Find the JavaClass instance for the given run-time class object */ - public JavaClass loadClass(Class clazz) throws java.lang.ClassNotFoundException; + JavaClass loadClass(Class clazz) throws java.lang.ClassNotFoundException; /** * Clear all entries from cache. */ - public void clear(); + void clear(); } |