You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2015/09/11 02:30:22 UTC
svn commit: r1702355 [8/8] - in /commons/proper/bcel/trunk: ./
src/main/java/org/apache/commons/bcel6/
src/main/java/org/apache/commons/bcel6/classfile/
src/main/java/org/apache/commons/bcel6/generic/
src/main/java/org/apache/commons/bcel6/util/ src/ma...
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/MethodHTML.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/MethodHTML.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/MethodHTML.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/MethodHTML.java Fri Sep 11 00:30:19 2015
@@ -21,7 +21,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.classfile.Attribute;
import org.apache.commons.bcel6.classfile.Code;
import org.apache.commons.bcel6.classfile.ConstantValue;
@@ -89,7 +89,7 @@ final class MethodHTML {
attribute_html.writeAttribute(attributes[i], name + "@" + i);
}
for (int i = 0; i < attributes.length; i++) {
- if (attributes[i].getTag() == Constants.ATTR_CONSTANT_VALUE) { // Default value
+ if (attributes[i].getTag() == Const.ATTR_CONSTANT_VALUE) { // Default value
String str = ((ConstantValue) attributes[i]).toString();
// Reference attribute in _attributes.html
file.print("<TD>= <A HREF=\"" + class_name + "_attributes.html#" + name + "@" + i
@@ -137,7 +137,7 @@ final class MethodHTML {
attribute_html.writeAttribute(attributes[i], "method" + method_number + "@" + i,
method_number);
byte tag = attributes[i].getTag();
- if (tag == Constants.ATTR_EXCEPTIONS) {
+ if (tag == Const.ATTR_EXCEPTIONS) {
file.print("<TR VALIGN=TOP><TD COLSPAN=2></TD><TH ALIGN=LEFT>throws</TH><TD>");
int[] exceptions = ((ExceptionTable) attributes[i]).getExceptionIndexTable();
for (int j = 0; j < exceptions.length; j++) {
@@ -147,7 +147,7 @@ final class MethodHTML {
}
}
file.println("</TD></TR>");
- } else if (tag == Constants.ATTR_CODE) {
+ } else if (tag == Const.ATTR_CODE) {
Attribute[] c_a = ((Code) attributes[i]).getAttributes();
for (int j = 0; j < c_a.length; j++) {
attribute_html.writeAttribute(c_a[j], "method" + method_number + "@" + i + "@"
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/DOUBLE_Upper.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/DOUBLE_Upper.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/DOUBLE_Upper.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/DOUBLE_Upper.java Fri Sep 11 00:30:19 2015
@@ -18,7 +18,7 @@
package org.apache.commons.bcel6.verifier.statics;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.generic.Type;
/**
@@ -32,7 +32,7 @@ public final class DOUBLE_Upper extends
/** The constructor; this class must not be instantiated from the outside. */
private DOUBLE_Upper(){
- super(Constants.T_UNKNOWN, "Long_Upper");
+ super(Const.T_UNKNOWN, "Long_Upper");
}
/** Use this method to get the single instance of this class. */
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LONG_Upper.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LONG_Upper.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LONG_Upper.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LONG_Upper.java Fri Sep 11 00:30:19 2015
@@ -18,7 +18,7 @@
package org.apache.commons.bcel6.verifier.statics;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.generic.Type;
/**
@@ -32,7 +32,7 @@ public final class LONG_Upper extends Ty
/** The constructor; this class must not be instantiated from the outside. */
private LONG_Upper(){
- super(Constants.T_UNKNOWN, "Long_Upper");
+ super(Const.T_UNKNOWN, "Long_Upper");
}
/** Use this method to get the single instance of this class. */
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass1Verifier.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass1Verifier.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass1Verifier.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass1Verifier.java Fri Sep 11 00:30:19 2015
@@ -141,7 +141,7 @@ public final class Pass1Verifier extends
* (otherwise you would not be able to load it into BCEL).</P>
*
* @see org.apache.commons.bcel6.Repository
- * @see org.apache.commons.bcel6.Constants#JVM_CLASSFILE_MAGIC
+ * @see org.apache.commons.bcel6.Const#JVM_CLASSFILE_MAGIC
*/
@Override
public VerificationResult do_verify(){
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass2Verifier.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass2Verifier.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass2Verifier.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass2Verifier.java Fri Sep 11 00:30:19 2015
@@ -25,7 +25,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.Repository;
import org.apache.commons.bcel6.classfile.Attribute;
import org.apache.commons.bcel6.classfile.ClassFormatException;
@@ -438,7 +438,7 @@ public final class Pass2Verifier extends
/////////////////////////////
@Override
public void visitConstantClass(ConstantClass obj){
- if (obj.getTag() != Constants.CONSTANT_Class){
+ if (obj.getTag() != Const.CONSTANT_Class){
throw new ClassConstraintException("Wrong constant tag in '"+tostring(obj)+"'.");
}
checkIndex(obj, obj.getNameIndex(), CONST_Utf8);
@@ -446,7 +446,7 @@ public final class Pass2Verifier extends
}
@Override
public void visitConstantFieldref(ConstantFieldref obj){
- if (obj.getTag() != Constants.CONSTANT_Fieldref){
+ if (obj.getTag() != Const.CONSTANT_Fieldref){
throw new ClassConstraintException("Wrong constant tag in '"+tostring(obj)+"'.");
}
checkIndex(obj, obj.getClassIndex(), CONST_Class);
@@ -454,7 +454,7 @@ public final class Pass2Verifier extends
}
@Override
public void visitConstantMethodref(ConstantMethodref obj){
- if (obj.getTag() != Constants.CONSTANT_Methodref){
+ if (obj.getTag() != Const.CONSTANT_Methodref){
throw new ClassConstraintException("Wrong constant tag in '"+tostring(obj)+"'.");
}
checkIndex(obj, obj.getClassIndex(), CONST_Class);
@@ -462,7 +462,7 @@ public final class Pass2Verifier extends
}
@Override
public void visitConstantInterfaceMethodref(ConstantInterfaceMethodref obj){
- if (obj.getTag() != Constants.CONSTANT_InterfaceMethodref){
+ if (obj.getTag() != Const.CONSTANT_InterfaceMethodref){
throw new ClassConstraintException("Wrong constant tag in '"+tostring(obj)+"'.");
}
checkIndex(obj, obj.getClassIndex(), CONST_Class);
@@ -470,42 +470,42 @@ public final class Pass2Verifier extends
}
@Override
public void visitConstantString(ConstantString obj){
- if (obj.getTag() != Constants.CONSTANT_String){
+ if (obj.getTag() != Const.CONSTANT_String){
throw new ClassConstraintException("Wrong constant tag in '"+tostring(obj)+"'.");
}
checkIndex(obj, obj.getStringIndex(), CONST_Utf8);
}
@Override
public void visitConstantInteger(ConstantInteger obj){
- if (obj.getTag() != Constants.CONSTANT_Integer){
+ if (obj.getTag() != Const.CONSTANT_Integer){
throw new ClassConstraintException("Wrong constant tag in '"+tostring(obj)+"'.");
}
// no indices to check
}
@Override
public void visitConstantFloat(ConstantFloat obj){
- if (obj.getTag() != Constants.CONSTANT_Float){
+ if (obj.getTag() != Const.CONSTANT_Float){
throw new ClassConstraintException("Wrong constant tag in '"+tostring(obj)+"'.");
}
//no indices to check
}
@Override
public void visitConstantLong(ConstantLong obj){
- if (obj.getTag() != Constants.CONSTANT_Long){
+ if (obj.getTag() != Const.CONSTANT_Long){
throw new ClassConstraintException("Wrong constant tag in '"+tostring(obj)+"'.");
}
//no indices to check
}
@Override
public void visitConstantDouble(ConstantDouble obj){
- if (obj.getTag() != Constants.CONSTANT_Double){
+ if (obj.getTag() != Const.CONSTANT_Double){
throw new ClassConstraintException("Wrong constant tag in '"+tostring(obj)+"'.");
}
//no indices to check
}
@Override
public void visitConstantNameAndType(ConstantNameAndType obj){
- if (obj.getTag() != Constants.CONSTANT_NameAndType){
+ if (obj.getTag() != Const.CONSTANT_NameAndType){
throw new ClassConstraintException("Wrong constant tag in '"+tostring(obj)+"'.");
}
checkIndex(obj, obj.getNameIndex(), CONST_Utf8);
@@ -514,7 +514,7 @@ public final class Pass2Verifier extends
}
@Override
public void visitConstantUtf8(ConstantUtf8 obj){
- if (obj.getTag() != Constants.CONSTANT_Utf8){
+ if (obj.getTag() != Const.CONSTANT_Utf8){
throw new ClassConstraintException("Wrong constant tag in '"+tostring(obj)+"'.");
}
//no indices to check
@@ -561,8 +561,8 @@ public final class Pass2Verifier extends
}
}
- if ((obj.getAccessFlags() & ~(Constants.ACC_PUBLIC|Constants.ACC_PRIVATE|Constants.ACC_PROTECTED|Constants.ACC_STATIC|
- Constants.ACC_FINAL|Constants.ACC_VOLATILE|Constants.ACC_TRANSIENT)) > 0){
+ if ((obj.getAccessFlags() & ~(Const.ACC_PUBLIC|Const.ACC_PRIVATE|Const.ACC_PROTECTED|Const.ACC_STATIC|
+ Const.ACC_FINAL|Const.ACC_VOLATILE|Const.ACC_TRANSIENT)) > 0){
addMessage("Field '"+tostring(obj)+
"' has access flag(s) other than ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED,"+
" ACC_STATIC, ACC_FINAL, ACC_VOLATILE, ACC_TRANSIENT set (ignored).");
@@ -672,7 +672,7 @@ public final class Pass2Verifier extends
}
// Nearly forgot this! Funny return values are allowed, but a non-empty arguments list makes a different method out of it!
- if (name.equals(Constants.STATIC_INITIALIZER_NAME) && (ts.length != 0)){
+ if (name.equals(Const.STATIC_INITIALIZER_NAME) && (ts.length != 0)){
throw new ClassConstraintException(
"Method '"+tostring(obj)+"' has illegal name '"+name+"'."+
" Its name resembles the class or interface initialization method"+
@@ -723,7 +723,7 @@ public final class Pass2Verifier extends
}
// A specific instance initialization method... (vmspec2,Page 116).
- if (name.equals(Constants.CONSTRUCTOR_NAME)) {
+ if (name.equals(Const.CONSTRUCTOR_NAME)) {
//..may have at most one of ACC_PRIVATE, ACC_PROTECTED, ACC_PUBLIC set: is checked above.
//..may also have ACC_STRICT set, but none of the other flags in table 4.5 (vmspec2, page 115)
if (obj.isStatic() ||
@@ -737,8 +737,8 @@ public final class Pass2Verifier extends
}
}
else{ // isInterface!
- if (!name.equals(Constants.STATIC_INITIALIZER_NAME)){//vmspec2, p.116, 2nd paragraph
- if (jc.getMajor() >= Constants.MAJOR_1_8) {
+ if (!name.equals(Const.STATIC_INITIALIZER_NAME)){//vmspec2, p.116, 2nd paragraph
+ if (jc.getMajor() >= Const.MAJOR_1_8) {
if (!(obj.isPublic() ^ obj.isPrivate())) {
throw new ClassConstraintException("Interface method '" + tostring(obj) + "' must have" +
" exactly one of its ACC_PUBLIC and ACC_PRIVATE modifiers set.");
@@ -776,8 +776,8 @@ public final class Pass2Verifier extends
}
if ((obj.getAccessFlags() &
- ~(Constants.ACC_PUBLIC|Constants.ACC_PRIVATE|Constants.ACC_PROTECTED|Constants.ACC_STATIC|Constants.ACC_FINAL|
- Constants.ACC_SYNCHRONIZED|Constants.ACC_NATIVE|Constants.ACC_ABSTRACT|Constants.ACC_STRICT)) > 0){
+ ~(Const.ACC_PUBLIC|Const.ACC_PRIVATE|Const.ACC_PROTECTED|Const.ACC_STATIC|Const.ACC_FINAL|
+ Const.ACC_SYNCHRONIZED|Const.ACC_NATIVE|Const.ACC_ABSTRACT|Const.ACC_STRICT)) > 0){
addMessage("Method '"+tostring(obj)+"' has access flag(s) other than"+
" ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED, ACC_STATIC, ACC_FINAL,"+
" ACC_SYNCHRONIZED, ACC_NATIVE, ACC_ABSTRACT, ACC_STRICT set (ignored).");
@@ -893,8 +893,8 @@ public final class Pass2Verifier extends
checkIndex(obj, innername_idx, CONST_Utf8);
}
int acc = ic.getInnerAccessFlags();
- acc = acc & (~ (Constants.ACC_PUBLIC | Constants.ACC_PRIVATE | Constants.ACC_PROTECTED |
- Constants.ACC_STATIC | Constants.ACC_FINAL | Constants.ACC_INTERFACE | Constants.ACC_ABSTRACT));
+ acc = acc & (~ (Const.ACC_PUBLIC | Const.ACC_PRIVATE | Const.ACC_PROTECTED |
+ Const.ACC_STATIC | Const.ACC_FINAL | Const.ACC_INTERFACE | Const.ACC_ABSTRACT));
if (acc != 0){
addMessage(
"Unknown access flag for inner class '"+tostring(ic)+"' set (InnerClasses attribute '"+tostring(obj)+"').");
@@ -1313,7 +1313,7 @@ public final class Pass2Verifier extends
@Override
public void visitConstantFieldref(ConstantFieldref obj){
- if (obj.getTag() != Constants.CONSTANT_Fieldref){
+ if (obj.getTag() != Const.CONSTANT_Fieldref){
throw new ClassConstraintException("ConstantFieldref '"+tostring(obj)+"' has wrong tag!");
}
int name_and_type_index = obj.getNameAndTypeIndex();
@@ -1342,7 +1342,7 @@ public final class Pass2Verifier extends
@Override
public void visitConstantMethodref(ConstantMethodref obj){
- if (obj.getTag() != Constants.CONSTANT_Methodref){
+ if (obj.getTag() != Const.CONSTANT_Methodref){
throw new ClassConstraintException("ConstantMethodref '"+tostring(obj)+"' has wrong tag!");
}
int name_and_type_index = obj.getNameAndTypeIndex();
@@ -1364,7 +1364,7 @@ public final class Pass2Verifier extends
try{
Type t = Type.getReturnType(sig);
- if ( name.equals(Constants.CONSTRUCTOR_NAME) && (t != Type.VOID) ){
+ if ( name.equals(Const.CONSTRUCTOR_NAME) && (t != Type.VOID) ){
throw new ClassConstraintException("Instance initialization method must have VOID return type.");
}
}
@@ -1375,7 +1375,7 @@ public final class Pass2Verifier extends
@Override
public void visitConstantInterfaceMethodref(ConstantInterfaceMethodref obj){
- if (obj.getTag() != Constants.CONSTANT_InterfaceMethodref){
+ if (obj.getTag() != Const.CONSTANT_InterfaceMethodref){
throw new ClassConstraintException("ConstantInterfaceMethodref '"+tostring(obj)+"' has wrong tag!");
}
int name_and_type_index = obj.getNameAndTypeIndex();
@@ -1396,8 +1396,8 @@ public final class Pass2Verifier extends
try{
Type t = Type.getReturnType(sig);
- if ( name.equals(Constants.STATIC_INITIALIZER_NAME) && (t != Type.VOID) ){
- addMessage("Class or interface initialization method '"+Constants.STATIC_INITIALIZER_NAME+
+ if ( name.equals(Const.STATIC_INITIALIZER_NAME) && (t != Type.VOID) ){
+ addMessage("Class or interface initialization method '"+Const.STATIC_INITIALIZER_NAME+
"' usually has VOID return type instead of '"+t+
"'. Note this is really not a requirement of The Java Virtual Machine Specification, Second Edition.");
}
@@ -1435,9 +1435,9 @@ public final class Pass2Verifier extends
}
if (allowStaticInit){
- return name.equals(Constants.CONSTRUCTOR_NAME) || name.equals(Constants.STATIC_INITIALIZER_NAME);
+ return name.equals(Const.CONSTRUCTOR_NAME) || name.equals(Const.STATIC_INITIALIZER_NAME);
}
- return name.equals(Constants.CONSTRUCTOR_NAME);
+ return name.equals(Const.CONSTRUCTOR_NAME);
}
/**
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass3aVerifier.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass3aVerifier.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass3aVerifier.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass3aVerifier.java Fri Sep 11 00:30:19 2015
@@ -18,7 +18,7 @@
package org.apache.commons.bcel6.verifier.statics;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.Repository;
import org.apache.commons.bcel6.classfile.Attribute;
import org.apache.commons.bcel6.classfile.Code;
@@ -340,9 +340,9 @@ public final class Pass3aVerifier extend
// array in vmspec2), together with pass 1 (reading code_length bytes and
// interpreting them as code[]). So this must not be checked again here.
- if (code.getCode().length >= Constants.MAX_CODE_SIZE){// length must be LESS than the max
+ if (code.getCode().length >= Const.MAX_CODE_SIZE){// length must be LESS than the max
throw new StaticCodeInstructionConstraintException(
- "Code array in code attribute '"+code+"' too big: must be smaller than "+Constants.MAX_CODE_SIZE+"65536 bytes.");
+ "Code array in code attribute '"+code+"' too big: must be smaller than "+Const.MAX_CODE_SIZE+"65536 bytes.");
}
// First opcode at offset 0: okay, that's clear. Nothing to do.
@@ -622,7 +622,7 @@ public final class Pass3aVerifier extend
Type o_type = o.getType(cpg);
if (f_type.equals(o_type)) {
f = field;
- if ((f.getAccessFlags() & (Constants.ACC_PUBLIC | Constants.ACC_PROTECTED)) == 0) {
+ if ((f.getAccessFlags() & (Const.ACC_PUBLIC | Const.ACC_PROTECTED)) == 0) {
f = null;
}
break outer;
@@ -672,10 +672,10 @@ public final class Pass3aVerifier extend
// Constants are okay due to pass2.
ConstantNameAndType cnat = (ConstantNameAndType) (cpg.getConstant(((ConstantMethodref) c).getNameAndTypeIndex()));
ConstantUtf8 cutf8 = (ConstantUtf8) (cpg.getConstant(cnat.getNameIndex()));
- if (cutf8.getBytes().equals(Constants.CONSTRUCTOR_NAME) && (!(o instanceof INVOKESPECIAL)) ){
+ if (cutf8.getBytes().equals(Const.CONSTRUCTOR_NAME) && (!(o instanceof INVOKESPECIAL)) ){
constraintViolated(o, "Only INVOKESPECIAL is allowed to invoke instance initialization methods.");
}
- if ( (! (cutf8.getBytes().equals(Constants.CONSTRUCTOR_NAME)) ) && (cutf8.getBytes().startsWith("<")) ){
+ if ( (! (cutf8.getBytes().equals(Const.CONSTRUCTOR_NAME)) ) && (cutf8.getBytes().startsWith("<")) ){
constraintViolated(o,
"No method with a name beginning with '<' other than the instance initialization methods"+
" may be called by the method invocation instructions.");
@@ -696,11 +696,11 @@ public final class Pass3aVerifier extend
ConstantNameAndType cnat =
(ConstantNameAndType) (cpg.getConstant(((ConstantInterfaceMethodref)c).getNameAndTypeIndex()));
String name = ((ConstantUtf8) (cpg.getConstant(cnat.getNameIndex()))).getBytes();
- if (name.equals(Constants.CONSTRUCTOR_NAME)){
- constraintViolated(o, "Method to invoke must not be '"+Constants.CONSTRUCTOR_NAME+"'.");
+ if (name.equals(Const.CONSTRUCTOR_NAME)){
+ constraintViolated(o, "Method to invoke must not be '"+Const.CONSTRUCTOR_NAME+"'.");
}
- if (name.equals(Constants.STATIC_INITIALIZER_NAME)){
- constraintViolated(o, "Method to invoke must not be '"+Constants.STATIC_INITIALIZER_NAME+"'.");
+ if (name.equals(Const.STATIC_INITIALIZER_NAME)){
+ constraintViolated(o, "Method to invoke must not be '"+Const.STATIC_INITIALIZER_NAME+"'.");
}
}
@@ -812,9 +812,9 @@ public final class Pass3aVerifier extend
Type t = o.getType(cpg);
if (t instanceof ArrayType){
int dimensions = ((ArrayType) t).getDimensions();
- if (dimensions > Constants.MAX_ARRAY_DIMENSIONS){
+ if (dimensions > Const.MAX_ARRAY_DIMENSIONS){
constraintViolated(o,
- "Not allowed to create an array with more than "+ Constants.MAX_ARRAY_DIMENSIONS + " dimensions;"+
+ "Not allowed to create an array with more than "+ Const.MAX_ARRAY_DIMENSIONS + " dimensions;"+
" actual: " + dimensions);
}
}
@@ -824,14 +824,14 @@ public final class Pass3aVerifier extend
@Override
public void visitNEWARRAY(NEWARRAY o){
byte t = o.getTypecode();
- if (! ( (t == Constants.T_BOOLEAN) ||
- (t == Constants.T_CHAR) ||
- (t == Constants.T_FLOAT) ||
- (t == Constants.T_DOUBLE) ||
- (t == Constants.T_BYTE) ||
- (t == Constants.T_SHORT) ||
- (t == Constants.T_INT) ||
- (t == Constants.T_LONG) ) ){
+ if (! ( (t == Const.T_BOOLEAN) ||
+ (t == Const.T_CHAR) ||
+ (t == Const.T_FLOAT) ||
+ (t == Const.T_DOUBLE) ||
+ (t == Const.T_BYTE) ||
+ (t == Const.T_SHORT) ||
+ (t == Const.T_INT) ||
+ (t == Const.T_LONG) ) ){
constraintViolated(o, "Illegal type code '+t+' for 'atype' operand.");
}
}
@@ -1078,8 +1078,8 @@ public final class Pass3aVerifier extend
String meth_name = Repository.lookupClass(myOwner.getClassName()).getMethods()[method_no].getName();
// If it's an interface, it can be set only in <clinit>.
- if ((!(jc.isClass())) && (!(meth_name.equals(Constants.STATIC_INITIALIZER_NAME)))){
- constraintViolated(o, "Interface field '"+f+"' must be set in a '"+Constants.STATIC_INITIALIZER_NAME+"' method.");
+ if ((!(jc.isClass())) && (!(meth_name.equals(Const.STATIC_INITIALIZER_NAME)))){
+ constraintViolated(o, "Interface field '"+f+"' must be set in a '"+Const.STATIC_INITIALIZER_NAME+"' method.");
}
} catch (ClassNotFoundException e) {
// FIXME: maybe not the best way to handle this
@@ -1228,7 +1228,7 @@ public final class Pass3aVerifier extend
if ((Repository.instanceOf( current, jc )) && (!current.equals(jc))){
- if (! (o.getMethodName(cpg).equals(Constants.CONSTRUCTOR_NAME) )){
+ if (! (o.getMethodName(cpg).equals(Const.CONSTRUCTOR_NAME) )){
// Special lookup procedure for ACC_SUPER classes.
int supidx = -1;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExecutionVisitor.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExecutionVisitor.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExecutionVisitor.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExecutionVisitor.java Fri Sep 11 00:30:19 2015
@@ -18,7 +18,7 @@
package org.apache.commons.bcel6.verifier.structurals;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.classfile.Constant;
import org.apache.commons.bcel6.classfile.ConstantClass;
import org.apache.commons.bcel6.classfile.ConstantDouble;
@@ -836,7 +836,7 @@ public class ExecutionVisitor extends Em
/** Symbolically executes the corresponding Java Virtual Machine instruction. */
@Override
public void visitINVOKESPECIAL(INVOKESPECIAL o){
- if (o.getMethodName(cpg).equals(Constants.CONSTRUCTOR_NAME)){
+ if (o.getMethodName(cpg).equals(Const.CONSTRUCTOR_NAME)){
UninitializedObjectType t = (UninitializedObjectType) stack().peek(o.getArgumentTypes(cpg).length);
if (t == Frame.getThis()){
Frame.setThis(null);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java Fri Sep 11 00:30:19 2015
@@ -18,7 +18,7 @@
package org.apache.commons.bcel6.verifier.structurals;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.Repository;
import org.apache.commons.bcel6.classfile.Constant;
import org.apache.commons.bcel6.classfile.ConstantClass;
@@ -1300,7 +1300,7 @@ public class InstConstraintVisitor exten
Type o_type = o.getType(cpg);
if (f_type.equals(o_type)) {
f = field;
- if ((f.getAccessFlags() & (Constants.ACC_PUBLIC | Constants.ACC_PROTECTED)) == 0) {
+ if ((f.getAccessFlags() & (Const.ACC_PUBLIC | Const.ACC_PROTECTED)) == 0) {
f = null;
}
break outer;
@@ -1905,7 +1905,7 @@ public class InstConstraintVisitor exten
public void visitINVOKESPECIAL(INVOKESPECIAL o){
try {
// Don't init an object twice.
- if ( (o.getMethodName(cpg).equals(Constants.CONSTRUCTOR_NAME)) &&
+ if ( (o.getMethodName(cpg).equals(Const.CONSTRUCTOR_NAME)) &&
(!(stack().peek(o.getArgumentTypes(cpg).length) instanceof UninitializedObjectType)) ){
constraintViolated(o, "Possibly initializing object twice."+
" A valid instruction sequence must not have an uninitialized object on the operand stack or in a local variable"+
@@ -1964,7 +1964,7 @@ public class InstConstraintVisitor exten
constraintViolated(o, "Expecting a reference type as 'objectref' on the stack, not a '"+objref+"'.");
}
String objref_classname = null;
- if ( !(o.getMethodName(cpg).equals(Constants.CONSTRUCTOR_NAME))){
+ if ( !(o.getMethodName(cpg).equals(Const.CONSTRUCTOR_NAME))){
referenceTypeIsInitialized(o, (ReferenceType) objref);
if (!(objref instanceof ObjectType)){
if (!(objref instanceof ArrayType)){ // could be a ReturnaddressType
@@ -2881,7 +2881,7 @@ public class InstConstraintVisitor exten
*/
@Override
public void visitRETURN(RETURN o){
- if (mg.getName().equals(Constants.CONSTRUCTOR_NAME)){// If we leave an <init> method
+ if (mg.getName().equals(Const.CONSTRUCTOR_NAME)){// If we leave an <init> method
if ((Frame.getThis() != null) && (!(mg.getClassName().equals(Type.OBJECT.getClassName()))) ) {
constraintViolated(o, "Leaving a constructor that itself did not call a constructor.");
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.java Fri Sep 11 00:30:19 2015
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.Random;
import java.util.Vector;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.Repository;
import org.apache.commons.bcel6.classfile.JavaClass;
import org.apache.commons.bcel6.classfile.Method;
@@ -349,7 +349,7 @@ public final class Pass3bVerifier extend
// Build the initial frame situation for this method.
Frame f = new Frame(mg.getMaxLocals(),mg.getMaxStack());
if ( !mg.isStatic() ){
- if (mg.getName().equals(Constants.CONSTRUCTOR_NAME)){
+ if (mg.getName().equals(Const.CONSTRUCTOR_NAME)){
Frame.setThis(new UninitializedObjectType(ObjectType.getInstance(jc.getClassName())));
f.getLocals().set(0, Frame.getThis());
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/UninitializedObjectType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/UninitializedObjectType.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/UninitializedObjectType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/UninitializedObjectType.java Fri Sep 11 00:30:19 2015
@@ -18,7 +18,7 @@
package org.apache.commons.bcel6.verifier.structurals;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.generic.ObjectType;
import org.apache.commons.bcel6.generic.ReferenceType;
@@ -36,7 +36,7 @@ public class UninitializedObjectType ext
/** Creates a new instance. */
public UninitializedObjectType(ObjectType t){
- super(Constants.T_UNKNOWN, "<UNINITIALIZED OBJECT OF TYPE '"+t.getClassName()+"'>");
+ super(Const.T_UNKNOWN, "<UNINITIALIZED OBJECT OF TYPE '"+t.getClassName()+"'>");
initialized = t;
}
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/ElementValueGenTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/ElementValueGenTestCase.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/ElementValueGenTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/ElementValueGenTestCase.java Fri Sep 11 00:30:19 2015
@@ -37,7 +37,7 @@ public class ElementValueGenTestCase ext
private ClassGen createClassGen(String classname)
{
return new ClassGen(classname, "java.lang.Object", "<generated>",
- Constants.ACC_PUBLIC | Constants.ACC_SUPER, null);
+ Const.ACC_PUBLIC | Const.ACC_SUPER, null);
}
/**
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/generic/AnnotationGenTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/generic/AnnotationGenTestCase.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/generic/AnnotationGenTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/generic/AnnotationGenTestCase.java Fri Sep 11 00:30:19 2015
@@ -26,7 +26,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.bcel6.AbstractTestCase;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.classfile.Annotations;
import org.apache.commons.bcel6.classfile.Attribute;
import org.apache.commons.bcel6.classfile.RuntimeInvisibleAnnotations;
@@ -37,7 +37,7 @@ public class AnnotationGenTestCase exten
private ClassGen createClassGen(String classname)
{
return new ClassGen(classname, "java.lang.Object", "<generated>",
- Constants.ACC_PUBLIC | Constants.ACC_SUPER, null);
+ Const.ACC_PUBLIC | Const.ACC_SUPER, null);
}
/**
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/generic/GeneratingAnnotatedClassesTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/generic/GeneratingAnnotatedClassesTestCase.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/generic/GeneratingAnnotatedClassesTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/generic/GeneratingAnnotatedClassesTestCase.java Fri Sep 11 00:30:19 2015
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.bcel6.AbstractTestCase;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.classfile.AnnotationEntry;
import org.apache.commons.bcel6.classfile.ArrayElementValue;
import org.apache.commons.bcel6.classfile.ElementValue;
@@ -431,12 +431,12 @@ public class GeneratingAnnotatedClassesT
il.append(factory.createNew("java.io.InputStreamReader"));
il.append(InstructionConst.DUP);
il.append(factory.createFieldAccess("java.lang.System", "in", i_stream,
- Constants.GETSTATIC));
+ Const.GETSTATIC));
il.append(factory.createInvoke("java.io.InputStreamReader", "<init>",
- Type.VOID, new Type[] { i_stream }, Constants.INVOKESPECIAL));
+ Type.VOID, new Type[] { i_stream }, Const.INVOKESPECIAL));
il.append(factory.createInvoke("java.io.BufferedReader", "<init>",
Type.VOID, new Type[] { new ObjectType("java.io.Reader") },
- Constants.INVOKESPECIAL));
+ Const.INVOKESPECIAL));
LocalVariableGen lg = mg.addLocalVariable("in", new ObjectType(
"java.io.BufferedReader"), null, null);
int in = lg.getIndex();
@@ -475,7 +475,7 @@ public class GeneratingAnnotatedClassesT
// "Normal" code continues, now we can set the branch target of the GOTO
// .
InstructionHandle ih = il.append(factory.createFieldAccess(
- "java.lang.System", "out", p_stream, Constants.GETSTATIC));
+ "java.lang.System", "out", p_stream, Const.GETSTATIC));
g.setTarget(ih);
// Printing "Hello": String concatenation compiles to StringBuffer
// operations.
@@ -485,17 +485,17 @@ public class GeneratingAnnotatedClassesT
il
.append(factory.createInvoke("java.lang.StringBuffer",
"<init>", Type.VOID, new Type[] { Type.STRING },
- Constants.INVOKESPECIAL));
+ Const.INVOKESPECIAL));
il.append(new ALOAD(name));
il.append(factory.createInvoke("java.lang.StringBuffer", "append",
Type.STRINGBUFFER, new Type[] { Type.STRING },
- Constants.INVOKEVIRTUAL));
+ Const.INVOKEVIRTUAL));
il.append(factory.createInvoke("java.lang.StringBuffer", "toString",
- Type.STRING, Type.NO_ARGS, Constants.INVOKEVIRTUAL));
+ Type.STRING, Type.NO_ARGS, Const.INVOKEVIRTUAL));
il
.append(factory.createInvoke("java.io.PrintStream", "println",
Type.VOID, new Type[] { Type.STRING },
- Constants.INVOKEVIRTUAL));
+ Const.INVOKEVIRTUAL));
il.append(InstructionConst.RETURN);
// Finalization: Finally, we have to set the stack size, which normally
// would have to be computed on the fly and add a default constructor
@@ -504,7 +504,7 @@ public class GeneratingAnnotatedClassesT
mg.setMaxLocals();
cg.addMethod(mg.getMethod());
il.dispose(); // Allow instruction handles to be reused
- cg.addEmptyConstructor(Constants.ACC_PUBLIC);
+ cg.addEmptyConstructor(Const.ACC_PUBLIC);
}
private void buildClassContents(ClassGen cg, ConstantPoolGen cp,
@@ -525,12 +525,12 @@ public class GeneratingAnnotatedClassesT
il.append(factory.createNew("java.io.InputStreamReader"));
il.append(InstructionConst.DUP);
il.append(factory.createFieldAccess("java.lang.System", "in", i_stream,
- Constants.GETSTATIC));
+ Const.GETSTATIC));
il.append(factory.createInvoke("java.io.InputStreamReader", "<init>",
- Type.VOID, new Type[] { i_stream }, Constants.INVOKESPECIAL));
+ Type.VOID, new Type[] { i_stream }, Const.INVOKESPECIAL));
il.append(factory.createInvoke("java.io.BufferedReader", "<init>",
Type.VOID, new Type[] { new ObjectType("java.io.Reader") },
- Constants.INVOKESPECIAL));
+ Const.INVOKESPECIAL));
LocalVariableGen lg = mg.addLocalVariable("in", new ObjectType(
"java.io.BufferedReader"), null, null);
int in = lg.getIndex();
@@ -569,7 +569,7 @@ public class GeneratingAnnotatedClassesT
// "Normal" code continues, now we can set the branch target of the GOTO
// .
InstructionHandle ih = il.append(factory.createFieldAccess(
- "java.lang.System", "out", p_stream, Constants.GETSTATIC));
+ "java.lang.System", "out", p_stream, Const.GETSTATIC));
g.setTarget(ih);
// Printing "Hello": String concatenation compiles to StringBuffer
// operations.
@@ -579,17 +579,17 @@ public class GeneratingAnnotatedClassesT
il
.append(factory.createInvoke("java.lang.StringBuffer",
"<init>", Type.VOID, new Type[] { Type.STRING },
- Constants.INVOKESPECIAL));
+ Const.INVOKESPECIAL));
il.append(new ALOAD(name));
il.append(factory.createInvoke("java.lang.StringBuffer", "append",
Type.STRINGBUFFER, new Type[] { Type.STRING },
- Constants.INVOKEVIRTUAL));
+ Const.INVOKEVIRTUAL));
il.append(factory.createInvoke("java.lang.StringBuffer", "toString",
- Type.STRING, Type.NO_ARGS, Constants.INVOKEVIRTUAL));
+ Type.STRING, Type.NO_ARGS, Const.INVOKEVIRTUAL));
il
.append(factory.createInvoke("java.io.PrintStream", "println",
Type.VOID, new Type[] { Type.STRING },
- Constants.INVOKEVIRTUAL));
+ Const.INVOKEVIRTUAL));
il.append(InstructionConst.RETURN);
// Finalization: Finally, we have to set the stack size, which normally
// would have to be computed on the fly and add a default constructor
@@ -598,7 +598,7 @@ public class GeneratingAnnotatedClassesT
mg.setMaxLocals();
cg.addMethod(mg.getMethod());
il.dispose(); // Allow instruction handles to be reused
- cg.addEmptyConstructor(Constants.ACC_PUBLIC);
+ cg.addEmptyConstructor(Const.ACC_PUBLIC);
}
private JavaClass getClassFrom(String where, String clazzname)
@@ -613,13 +613,13 @@ public class GeneratingAnnotatedClassesT
private ClassGen createClassGen(String classname)
{
return new ClassGen(classname, "java.lang.Object", "<generated>",
- Constants.ACC_PUBLIC | Constants.ACC_SUPER, null);
+ Const.ACC_PUBLIC | Const.ACC_SUPER, null);
}
private MethodGen createMethodGen(String methodname, InstructionList il,
ConstantPoolGen cp)
{
- return new MethodGen(Constants.ACC_STATIC | Constants.ACC_PUBLIC, // access
+ return new MethodGen(Const.ACC_STATIC | Const.ACC_PUBLIC, // access
// flags
Type.VOID, // return type
new Type[] { new ArrayType(Type.STRING, 1) }, // argument
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArrayAccess02Creator.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArrayAccess02Creator.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArrayAccess02Creator.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArrayAccess02Creator.java Fri Sep 11 00:30:19 2015
@@ -20,7 +20,7 @@ package org.apache.commons.bcel6.verifie
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.generic.ClassGen;
import org.apache.commons.bcel6.generic.ConstantPoolGen;
import org.apache.commons.bcel6.generic.InstructionConst;
@@ -40,7 +40,7 @@ public class TestArrayAccess02Creator ex
public TestArrayAccess02Creator() {
_cg = new ClassGen(TEST_PACKAGE+".TestArrayAccess02", "java.lang.Object", "TestArrayAccess02.java",
- Constants.ACC_PUBLIC | Constants.ACC_SUPER, new String[] { });
+ Const.ACC_PUBLIC | Const.ACC_SUPER, new String[] { });
_cp = _cg.getConstantPool();
_factory = new InstructionFactory(_cg, _cp);
@@ -55,12 +55,12 @@ public void create(OutputStream out) thr
private void createMethod_0() {
InstructionList il = new InstructionList();
- MethodGen method = new MethodGen(Constants.ACC_PUBLIC, Type.VOID, Type.NO_ARGS, new String[] { }, "<init>",
+ MethodGen method = new MethodGen(Const.ACC_PUBLIC, Type.VOID, Type.NO_ARGS, new String[] { }, "<init>",
TEST_PACKAGE+".TestArrayAccess02", il, _cp);
InstructionHandle ih_0 = il.append(InstructionFactory.createLoad(Type.OBJECT, 0));
Assert.assertNotNull(ih_0); // TODO why is this not used
- il.append(_factory.createInvoke("java.lang.Object", "<init>", Type.VOID, Type.NO_ARGS, Constants.INVOKESPECIAL));
+ il.append(_factory.createInvoke("java.lang.Object", "<init>", Type.VOID, Type.NO_ARGS, Const.INVOKESPECIAL));
InstructionHandle ih_4 = il.append(InstructionFactory.createReturn(Type.VOID));
Assert.assertNotNull(ih_4); // TODO why is this not used
method.setMaxStack();
@@ -71,7 +71,7 @@ public void create(OutputStream out) thr
private void createMethod_1() {
InstructionList il = new InstructionList();
- MethodGen method = new MethodGen(Constants.ACC_PUBLIC | Constants.ACC_STATIC, Type.VOID, Type.NO_ARGS, new String[] { },
+ MethodGen method = new MethodGen(Const.ACC_PUBLIC | Const.ACC_STATIC, Type.VOID, Type.NO_ARGS, new String[] { },
"test", TEST_PACKAGE+".TestArrayAccess02", il, _cp);
InstructionHandle ih_0 = il.append(new PUSH(_cp, 1));
@@ -87,7 +87,7 @@ public void create(OutputStream out) thr
il.append(new PUSH(_cp, 0));
il.append(_factory.createNew(TEST_PACKAGE+".TestArrayAccess02"));
il.append(InstructionConst.DUP);
- il.append(_factory.createInvoke(TEST_PACKAGE+".TestArrayAccess02", "<init>", Type.VOID, Type.NO_ARGS, Constants.INVOKESPECIAL));
+ il.append(_factory.createInvoke(TEST_PACKAGE+".TestArrayAccess02", "<init>", Type.VOID, Type.NO_ARGS, Const.INVOKESPECIAL));
il.append(InstructionConst.AASTORE);
InstructionHandle ih_20 = il.append(InstructionFactory.createReturn(Type.VOID));
Assert.assertNotNull(ih_20); // TODO why is this not used
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArrayAccess03Creator.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArrayAccess03Creator.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArrayAccess03Creator.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArrayAccess03Creator.java Fri Sep 11 00:30:19 2015
@@ -20,7 +20,7 @@ package org.apache.commons.bcel6.verifie
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.generic.ClassGen;
import org.apache.commons.bcel6.generic.ConstantPoolGen;
import org.apache.commons.bcel6.generic.InstructionConst;
@@ -40,7 +40,7 @@ public class TestArrayAccess03Creator ex
public TestArrayAccess03Creator() {
_cg = new ClassGen(TEST_PACKAGE+".TestArrayAccess03", "java.lang.Object", "TestArrayAccess03.java",
- Constants.ACC_PUBLIC | Constants.ACC_SUPER, new String[] { });
+ Const.ACC_PUBLIC | Const.ACC_SUPER, new String[] { });
_cp = _cg.getConstantPool();
_factory = new InstructionFactory(_cg, _cp);
@@ -55,12 +55,12 @@ public void create(OutputStream out) thr
private void createMethod_0() {
InstructionList il = new InstructionList();
- MethodGen method = new MethodGen(Constants.ACC_PUBLIC, Type.VOID, Type.NO_ARGS, new String[] { }, "<init>",
+ MethodGen method = new MethodGen(Const.ACC_PUBLIC, Type.VOID, Type.NO_ARGS, new String[] { }, "<init>",
TEST_PACKAGE+".TestArrayAccess03", il, _cp);
InstructionHandle ih_0 = il.append(InstructionFactory.createLoad(Type.OBJECT, 0));
Assert.assertNotNull(ih_0); // TODO why is this not used
- il.append(_factory.createInvoke("java.lang.Object", "<init>", Type.VOID, Type.NO_ARGS, Constants.INVOKESPECIAL));
+ il.append(_factory.createInvoke("java.lang.Object", "<init>", Type.VOID, Type.NO_ARGS, Const.INVOKESPECIAL));
InstructionHandle ih_4 = il.append(InstructionFactory.createReturn(Type.VOID));
Assert.assertNotNull(ih_4); // TODO why is this not used
method.setMaxStack();
@@ -71,7 +71,7 @@ public void create(OutputStream out) thr
private void createMethod_1() {
InstructionList il = new InstructionList();
- MethodGen method = new MethodGen(Constants.ACC_PUBLIC | Constants.ACC_STATIC, Type.VOID, new Type[] { Type.OBJECT },
+ MethodGen method = new MethodGen(Const.ACC_PUBLIC | Const.ACC_STATIC, Type.VOID, new Type[] { Type.OBJECT },
new String[] { "arg0" }, "test", TEST_PACKAGE+".TestArrayAccess03", il, _cp);
InstructionHandle ih_0 = il.append(new PUSH(_cp, 1));
@@ -83,7 +83,7 @@ public void create(OutputStream out) thr
il.append(new PUSH(_cp, 0));
il.append(_factory.createNew(TEST_PACKAGE+".TestArrayAccess03"));
il.append(InstructionConst.DUP);
- il.append(_factory.createInvoke(TEST_PACKAGE+".TestArrayAccess03", "<init>", Type.VOID, Type.NO_ARGS, Constants.INVOKESPECIAL));
+ il.append(_factory.createInvoke(TEST_PACKAGE+".TestArrayAccess03", "<init>", Type.VOID, Type.NO_ARGS, Const.INVOKESPECIAL));
il.append(InstructionConst.AASTORE);
InstructionHandle ih_15 = il.append(InstructionFactory.createReturn(Type.VOID));
Assert.assertNotNull(ih_15); // TODO why is this not used
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArrayAccess04Creator.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArrayAccess04Creator.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArrayAccess04Creator.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArrayAccess04Creator.java Fri Sep 11 00:30:19 2015
@@ -21,7 +21,7 @@ package org.apache.commons.bcel6.verifie
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.generic.ClassGen;
import org.apache.commons.bcel6.generic.ConstantPoolGen;
import org.apache.commons.bcel6.generic.InstructionConst;
@@ -40,7 +40,7 @@ public class TestArrayAccess04Creator ex
public TestArrayAccess04Creator() {
_cg = new ClassGen(TEST_PACKAGE+".TestArrayAccess04", "java.lang.Object", "TestArrayAccess04.java",
- Constants.ACC_PUBLIC | Constants.ACC_SUPER, new String[] { });
+ Const.ACC_PUBLIC | Const.ACC_SUPER, new String[] { });
_cp = _cg.getConstantPool();
_factory = new InstructionFactory(_cg, _cp);
@@ -55,12 +55,12 @@ public void create(OutputStream out) thr
private void createMethod_0() {
InstructionList il = new InstructionList();
- MethodGen method = new MethodGen(Constants.ACC_PUBLIC, Type.VOID, Type.NO_ARGS, new String[] { }, "<init>",
+ MethodGen method = new MethodGen(Const.ACC_PUBLIC, Type.VOID, Type.NO_ARGS, new String[] { }, "<init>",
TEST_PACKAGE+".TestArrayAccess04", il, _cp);
InstructionHandle ih_0 = il.append(InstructionFactory.createLoad(Type.OBJECT, 0));
Assert.assertNotNull(ih_0); // TODO why is this not used
- il.append(_factory.createInvoke("java.lang.Object", "<init>", Type.VOID, Type.NO_ARGS, Constants.INVOKESPECIAL));
+ il.append(_factory.createInvoke("java.lang.Object", "<init>", Type.VOID, Type.NO_ARGS, Const.INVOKESPECIAL));
InstructionHandle ih_4 = il.append(InstructionFactory.createReturn(Type.VOID));
Assert.assertNotNull(ih_4); // TODO why is this not used
method.setMaxStack();
@@ -71,7 +71,7 @@ public void create(OutputStream out) thr
private void createMethod_1() {
InstructionList il = new InstructionList();
- MethodGen method = new MethodGen(Constants.ACC_PUBLIC | Constants.ACC_STATIC, Type.VOID, new Type[] { Type.OBJECT },
+ MethodGen method = new MethodGen(Const.ACC_PUBLIC | Const.ACC_STATIC, Type.VOID, new Type[] { Type.OBJECT },
new String[] { "arg0" }, "test", TEST_PACKAGE+".TestArrayAccess04", il, _cp);
InstructionHandle ih_0 = il.append(new PUSH(_cp, 1));
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestReturn01Creator.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestReturn01Creator.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestReturn01Creator.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestReturn01Creator.java Fri Sep 11 00:30:19 2015
@@ -20,7 +20,7 @@ package org.apache.commons.bcel6.verifie
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.generic.ClassGen;
import org.apache.commons.bcel6.generic.ConstantPoolGen;
import org.apache.commons.bcel6.generic.InstructionConst;
@@ -38,7 +38,7 @@ public class TestReturn01Creator extends
public TestReturn01Creator() {
_cg = new ClassGen(TEST_PACKAGE+".TestReturn01", "java.lang.Object", "TestReturn01.java",
- Constants.ACC_PUBLIC | Constants.ACC_SUPER, new String[] { });
+ Const.ACC_PUBLIC | Const.ACC_SUPER, new String[] { });
_cp = _cg.getConstantPool();
_factory = new InstructionFactory(_cg, _cp);
@@ -53,12 +53,12 @@ public void create(OutputStream out) thr
private void createMethod_0() {
InstructionList il = new InstructionList();
- MethodGen method = new MethodGen(Constants.ACC_PUBLIC, Type.VOID, Type.NO_ARGS, new String[] { },
+ MethodGen method = new MethodGen(Const.ACC_PUBLIC, Type.VOID, Type.NO_ARGS, new String[] { },
"<init>", TEST_PACKAGE+".TestReturn01", il, _cp);
InstructionHandle ih_0 = il.append(InstructionFactory.createLoad(Type.OBJECT, 0));
Assert.assertNotNull(ih_0); // TODO why is this not used
- il.append(_factory.createInvoke("java.lang.Object", "<init>", Type.VOID, Type.NO_ARGS, Constants.INVOKESPECIAL));
+ il.append(_factory.createInvoke("java.lang.Object", "<init>", Type.VOID, Type.NO_ARGS, Const.INVOKESPECIAL));
InstructionHandle ih_4 = il.append(InstructionFactory.createReturn(Type.VOID));
Assert.assertNotNull(ih_4); // TODO why is this not used
method.setMaxStack();
@@ -69,13 +69,13 @@ public void create(OutputStream out) thr
private void createMethod_1() {
InstructionList il = new InstructionList();
- MethodGen method = new MethodGen(Constants.ACC_PUBLIC | Constants.ACC_STATIC, Type.VOID, Type.NO_ARGS,
+ MethodGen method = new MethodGen(Const.ACC_PUBLIC | Const.ACC_STATIC, Type.VOID, Type.NO_ARGS,
new String[] { }, "foo", TEST_PACKAGE+".TestReturn01", il, _cp);
InstructionHandle ih_0 = il.append(_factory.createNew("java.lang.Object"));
Assert.assertNotNull(ih_0); // TODO why is this not used
il.append(InstructionConst.DUP);
- il.append(_factory.createInvoke("java.lang.Object", "<init>", Type.VOID, Type.NO_ARGS, Constants.INVOKESPECIAL));
+ il.append(_factory.createInvoke("java.lang.Object", "<init>", Type.VOID, Type.NO_ARGS, Const.INVOKESPECIAL));
il.append(InstructionConst.NOP);
InstructionHandle ih_8 = il.append(InstructionFactory.createReturn(Type.OBJECT));
Assert.assertNotNull(ih_8); // TODO why is this not used
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestReturn03Creator.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestReturn03Creator.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestReturn03Creator.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestReturn03Creator.java Fri Sep 11 00:30:19 2015
@@ -20,7 +20,7 @@ package org.apache.commons.bcel6.verifie
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.generic.ClassGen;
import org.apache.commons.bcel6.generic.ConstantPoolGen;
import org.apache.commons.bcel6.generic.InstructionConst;
@@ -38,7 +38,7 @@ public class TestReturn03Creator extends
public TestReturn03Creator() {
_cg = new ClassGen(TEST_PACKAGE+".TestReturn03", "java.lang.Object", "TestReturn03.java",
- Constants.ACC_PUBLIC | Constants.ACC_SUPER, new String[] { });
+ Const.ACC_PUBLIC | Const.ACC_SUPER, new String[] { });
_cp = _cg.getConstantPool();
_factory = new InstructionFactory(_cg, _cp);
@@ -53,12 +53,12 @@ public void create(OutputStream out) thr
private void createMethod_0() {
InstructionList il = new InstructionList();
- MethodGen method = new MethodGen(Constants.ACC_PUBLIC, Type.VOID, Type.NO_ARGS, new String[] { },
+ MethodGen method = new MethodGen(Const.ACC_PUBLIC, Type.VOID, Type.NO_ARGS, new String[] { },
"<init>", TEST_PACKAGE+".TestReturn03", il, _cp);
InstructionHandle ih_0 = il.append(InstructionFactory.createLoad(Type.OBJECT, 0));
Assert.assertNotNull(ih_0); // TODO why is this not used
- il.append(_factory.createInvoke("java.lang.Object", "<init>", Type.VOID, Type.NO_ARGS, Constants.INVOKESPECIAL));
+ il.append(_factory.createInvoke("java.lang.Object", "<init>", Type.VOID, Type.NO_ARGS, Const.INVOKESPECIAL));
InstructionHandle ih_4 = il.append(InstructionFactory.createReturn(Type.VOID));
Assert.assertNotNull(ih_4); // TODO why is this not used
method.setMaxStack();
@@ -69,7 +69,7 @@ public void create(OutputStream out) thr
private void createMethod_1() {
InstructionList il = new InstructionList();
- MethodGen method = new MethodGen(Constants.ACC_PUBLIC | Constants.ACC_STATIC, Type.INT, Type.NO_ARGS,
+ MethodGen method = new MethodGen(Const.ACC_PUBLIC | Const.ACC_STATIC, Type.INT, Type.NO_ARGS,
new String[] { }, "test3", TEST_PACKAGE+".TestReturn03", il, _cp);
InstructionHandle ih_0 = il.append(InstructionConst.ACONST_NULL);