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/08/13 14:01:01 UTC
svn commit: r1695689 - in
/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6: generic/
verifier/structurals/
Author: sebb
Date: Thu Aug 13 12:01:00 2015
New Revision: 1695689
URL: http://svn.apache.org/r1695689
Log:
TODO
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CPInstruction.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CodeExceptionGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGenOrMethodGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LineNumberGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableInstruction.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ControlFlowGraph.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExecutionVisitor.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/LocalVariables.java
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CPInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CPInstruction.java?rev=1695689&r1=1695688&r2=1695689&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CPInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CPInstruction.java Thu Aug 13 12:01:00 2015
@@ -124,7 +124,7 @@ public abstract class CPInstruction exte
* Set the index to constant pool.
* @param index in constant pool.
*/
- public void setIndex( int index ) {
+ public void setIndex( int index ) { // TODO could be package-protected?
if (index < 0) {
throw new ClassGenException("Negative index value: " + index);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CodeExceptionGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CodeExceptionGen.java?rev=1695689&r1=1695688&r2=1695689&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CodeExceptionGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CodeExceptionGen.java Thu Aug 13 12:01:00 2015
@@ -79,7 +79,7 @@ public final class CodeExceptionGen impl
/* Set start of handler
* @param start_pc Start of handled region (inclusive)
*/
- public void setStartPC( InstructionHandle start_pc ) {
+ public void setStartPC( InstructionHandle start_pc ) { // TODO could be package-protected?
BranchInstruction.notifyTarget(this.start_pc, start_pc, this);
this.start_pc = start_pc;
}
@@ -88,7 +88,7 @@ public final class CodeExceptionGen impl
/* Set end of handler
* @param end_pc End of handled region (inclusive)
*/
- public void setEndPC( InstructionHandle end_pc ) {
+ public void setEndPC( InstructionHandle end_pc ) { // TODO could be package-protected?
BranchInstruction.notifyTarget(this.end_pc, end_pc, this);
this.end_pc = end_pc;
}
@@ -97,7 +97,7 @@ public final class CodeExceptionGen impl
/* Set handler code
* @param handler_pc Start of handler
*/
- public void setHandlerPC( InstructionHandle handler_pc ) {
+ public void setHandlerPC( InstructionHandle handler_pc ) { // TODO could be package-protected?
BranchInstruction.notifyTarget(this.handler_pc, handler_pc, this);
this.handler_pc = handler_pc;
}
@@ -137,7 +137,7 @@ public final class CodeExceptionGen impl
/** Sets the type of the Exception to catch. Set 'null' for ANY. */
- public void setCatchType( ObjectType catch_type ) {
+ public void setCatchType( ObjectType catch_type ) { // TODO unused
this.catch_type = catch_type;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGen.java?rev=1695689&r1=1695688&r2=1695689&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGen.java Thu Aug 13 12:01:00 2015
@@ -123,7 +123,7 @@ public class FieldGen extends FieldGenOr
}
- public void setInitValue( long l ) {
+ public void setInitValue( long l ) { // TODO unused
checkType(Type.LONG);
if (l != 0L) {
value = new Long(l);
@@ -131,7 +131,7 @@ public class FieldGen extends FieldGenOr
}
- public void setInitValue( int i ) {
+ public void setInitValue( int i ) { // TODO unused
checkType(Type.INT);
if (i != 0) {
value = Integer.valueOf(i);
@@ -139,7 +139,7 @@ public class FieldGen extends FieldGenOr
}
- public void setInitValue( short s ) {
+ public void setInitValue( short s ) { // TODO unused
checkType(Type.SHORT);
if (s != 0) {
value = Integer.valueOf(s);
@@ -147,7 +147,7 @@ public class FieldGen extends FieldGenOr
}
- public void setInitValue( char c ) {
+ public void setInitValue( char c ) { // TODO unused
checkType(Type.CHAR);
if (c != 0) {
value = Integer.valueOf(c);
@@ -155,7 +155,7 @@ public class FieldGen extends FieldGenOr
}
- public void setInitValue( byte b ) {
+ public void setInitValue( byte b ) { // TODO unused
checkType(Type.BYTE);
if (b != 0) {
value = Integer.valueOf(b);
@@ -163,7 +163,7 @@ public class FieldGen extends FieldGenOr
}
- public void setInitValue( boolean b ) {
+ public void setInitValue( boolean b ) { // TODO unused
checkType(Type.BOOLEAN);
if (b) {
value = Integer.valueOf(1);
@@ -171,7 +171,7 @@ public class FieldGen extends FieldGenOr
}
- public void setInitValue( float f ) {
+ public void setInitValue( float f ) { // TODO unused
checkType(Type.FLOAT);
if (f != 0.0) {
value = new Float(f);
@@ -179,7 +179,7 @@ public class FieldGen extends FieldGenOr
}
- public void setInitValue( double d ) {
+ public void setInitValue( double d ) { // TODO unused
checkType(Type.DOUBLE);
if (d != 0.0) {
value = new Double(d);
@@ -189,7 +189,7 @@ public class FieldGen extends FieldGenOr
/** Remove any initial value.
*/
- public void cancelInitValue() {
+ public void cancelInitValue() { // TODO unused
value = null;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGenOrMethodGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGenOrMethodGen.java?rev=1695689&r1=1695688&r2=1695689&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGenOrMethodGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGenOrMethodGen.java Thu Aug 13 12:01:00 2015
@@ -48,7 +48,7 @@ public abstract class FieldGenOrMethodGe
super(access_flags);
}
- public void setType( Type type ) {
+ public void setType( Type type ) { // TODO could be package-protected?
if (type.getType() == Constants.T_ADDRESS) {
throw new IllegalArgumentException("Type can not be " + type);
}
@@ -68,7 +68,7 @@ public abstract class FieldGenOrMethodGe
}
- public void setName( String name ) {
+ public void setName( String name ) { // TODO could be package-protected?
this.name = name;
}
@@ -78,7 +78,7 @@ public abstract class FieldGenOrMethodGe
}
- public void setConstantPool( ConstantPoolGen cp ) {
+ public void setConstantPool( ConstantPoolGen cp ) { // TODO could be package-protected?
this.cp = cp;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java?rev=1695689&r1=1695688&r2=1695689&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java Thu Aug 13 12:01:00 2015
@@ -749,7 +749,7 @@ public class InstructionFactory implemen
}
- public void setClassGen( ClassGen c ) {
+ public void setClassGen( ClassGen c ) { // TODO unused
cg = c;
}
@@ -759,7 +759,7 @@ public class InstructionFactory implemen
}
- public void setConstantPool( ConstantPoolGen c ) {
+ public void setConstantPool( ConstantPoolGen c ) { // TODO unused
cp = c;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java?rev=1695689&r1=1695688&r2=1695689&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java Thu Aug 13 12:01:00 2015
@@ -841,7 +841,7 @@ public class InstructionList implements
}
- public void setPositions() {
+ public void setPositions() { // TODO could be package-protected? (some test code would need to be repackaged)
setPositions(false);
}
@@ -853,7 +853,7 @@ public class InstructionList implements
* @param check Perform sanity checks, e.g. if all targeted instructions really belong
* to this list
*/
- public void setPositions( boolean check ) {
+ public void setPositions( boolean check ) { // called by code in other packages
int max_additional_bytes = 0, additional_bytes = 0;
int index = 0, count = 0;
int[] pos = new int[length];
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LineNumberGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LineNumberGen.java?rev=1695689&r1=1695688&r2=1695689&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LineNumberGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LineNumberGen.java Thu Aug 13 12:01:00 2015
@@ -77,7 +77,7 @@ public class LineNumberGen implements In
}
- public void setInstruction( InstructionHandle ih ) {
+ public void setInstruction( InstructionHandle ih ) { // TODO could be package-protected?
if (ih == null) {
throw new NullPointerException("InstructionHandle may not be null");
}
@@ -101,7 +101,7 @@ public class LineNumberGen implements In
}
- public void setSourceLine( int src_line ) {
+ public void setSourceLine( int src_line ) { // TODO could be package-protected?
this.src_line = src_line;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java?rev=1695689&r1=1695688&r2=1695689&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java Thu Aug 13 12:01:00 2015
@@ -90,7 +90,7 @@ public class LocalVariableGen implements
}
- public void setIndex( int index ) {
+ public void setIndex( int index ) { // TODO unused
this.index = index;
}
@@ -100,7 +100,7 @@ public class LocalVariableGen implements
}
- public void setName( String name ) {
+ public void setName( String name ) { // TODO unused
this.name = name;
}
@@ -110,7 +110,7 @@ public class LocalVariableGen implements
}
- public void setType( Type type ) {
+ public void setType( Type type ) { // TODO unused
this.type = type;
}
@@ -130,13 +130,13 @@ public class LocalVariableGen implements
}
- public void setStart( InstructionHandle start ) {
+ public void setStart( InstructionHandle start ) { // TODO could be package-protected?
BranchInstruction.notifyTarget(this.start, start, this);
this.start = start;
}
- public void setEnd( InstructionHandle end ) {
+ public void setEnd( InstructionHandle end ) { // TODO could be package-protected?
BranchInstruction.notifyTarget(this.end, end, this);
this.end = end;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableInstruction.java?rev=1695689&r1=1695688&r2=1695689&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableInstruction.java Thu Aug 13 12:01:00 2015
@@ -151,7 +151,7 @@ public abstract class LocalVariableInstr
/**
* Set the local variable index
*/
- public void setIndex( int n ) {
+ public void setIndex( int n ) { // TODO could be package-protected?
if ((n < 0) || (n > Constants.MAX_SHORT)) {
throw new ClassGenException("Illegal value: " + n);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java?rev=1695689&r1=1695688&r2=1695689&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java Thu Aug 13 12:01:00 2015
@@ -746,7 +746,7 @@ public class MethodGen extends FieldGenO
/**
* Set maximum stack size for this method.
*/
- public void setMaxStack( int m ) {
+ public void setMaxStack( int m ) { // TODO could be package-protected?
max_stack = m;
}
@@ -763,12 +763,12 @@ public class MethodGen extends FieldGenO
}
- public void setClassName( String class_name ) {
+ public void setClassName( String class_name ) { // TODO could be package-protected?
this.class_name = class_name;
}
- public void setReturnType( Type return_type ) {
+ public void setReturnType( Type return_type ) { // TODO unused
setType(return_type);
}
@@ -778,7 +778,7 @@ public class MethodGen extends FieldGenO
}
- public void setArgumentTypes( Type[] arg_types ) {
+ public void setArgumentTypes( Type[] arg_types ) { // TODO could be package-protected?
this.arg_types = arg_types;
}
@@ -788,7 +788,7 @@ public class MethodGen extends FieldGenO
}
- public void setArgumentType( int i, Type type ) {
+ public void setArgumentType( int i, Type type ) { // TODO unused
arg_types[i] = type;
}
@@ -798,7 +798,7 @@ public class MethodGen extends FieldGenO
}
- public void setArgumentNames( String[] arg_names ) {
+ public void setArgumentNames( String[] arg_names ) { // TODO could be package-protected?
this.arg_names = arg_names;
}
@@ -808,7 +808,7 @@ public class MethodGen extends FieldGenO
}
- public void setArgumentName( int i, String name ) {
+ public void setArgumentName( int i, String name ) { // TODO unused
arg_names[i] = name;
}
@@ -823,7 +823,7 @@ public class MethodGen extends FieldGenO
}
- public void setInstructionList( InstructionList il ) {
+ public void setInstructionList( InstructionList il ) { // TODO could be package-protected?
this.il = il;
}
@@ -837,7 +837,7 @@ public class MethodGen extends FieldGenO
/**
* Computes max. stack size by performing control flow analysis.
*/
- public void setMaxStack() {
+ public void setMaxStack() { // TODO could be package-protected? (some tests would need repackaging)
if (il != null) {
max_stack = getMaxStack(cp, il, getExceptionHandlers());
} else {
@@ -849,7 +849,7 @@ public class MethodGen extends FieldGenO
/**
* Compute maximum number of local variables.
*/
- public void setMaxLocals() {
+ public void setMaxLocals() { // TODO could be package-protected? (some tests would need repackaging)
if (il != null) {
int max = isStatic() ? 0 : 1;
if (arg_types != null) {
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java?rev=1695689&r1=1695688&r2=1695689&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java Thu Aug 13 12:01:00 2015
@@ -153,7 +153,7 @@ public abstract class Select extends Bra
/**
* Set branch target for `i'th case
*/
- public void setTarget( int i, InstructionHandle target ) {
+ public void setTarget( int i, InstructionHandle target ) { // TODO could be package-protected?
notifyTarget(targets[i], target, this);
targets[i] = target;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ControlFlowGraph.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ControlFlowGraph.java?rev=1695689&r1=1695688&r2=1695689&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ControlFlowGraph.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ControlFlowGraph.java Thu Aug 13 12:01:00 2015
@@ -99,7 +99,7 @@ public class ControlFlowGraph{
}
/* Satisfies InstructionContext.setTag(int). */
- public void setTag(int tag){
+ public void setTag(int tag){ // part of InstructionContext interface
TAG = tag;
}
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=1695689&r1=1695688&r2=1695689&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 Thu Aug 13 12:01:00 2015
@@ -94,7 +94,7 @@ public class ExecutionVisitor extends Em
/**
* Sets the ConstantPoolGen needed for symbolic execution.
*/
- public void setConstantPoolGen(ConstantPoolGen cpg){
+ public void setConstantPoolGen(ConstantPoolGen cpg){ // TODO could be package-protected?
this.cpg = cpg;
}
@@ -104,7 +104,7 @@ public class ExecutionVisitor extends Em
* instance, <B>SET THE ConstantPoolGen FIRST</B>.
* @see #setConstantPoolGen(ConstantPoolGen)
*/
- public void setFrame(Frame f){
+ public void setFrame(Frame f){ // TODO could be package-protected?
this.frame = f;
}
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=1695689&r1=1695688&r2=1695689&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 Thu Aug 13 12:01:00 2015
@@ -120,7 +120,7 @@ public class InstConstraintVisitor exten
* @see #setConstantPoolGen(ConstantPoolGen cpg)
* @see #setMethodGen(MethodGen mg)
*/
- public void setFrame(Frame f){
+ public void setFrame(Frame f){ // TODO could be package-protected?
this.frame = f;
//if (singleInstance.mg == null || singleInstance.cpg == null) throw new AssertionViolatedException("Forgot to set important values first.");
}
@@ -129,7 +129,7 @@ public class InstConstraintVisitor exten
* Sets the ConstantPoolGen instance needed for constraint
* checking prior to execution.
*/
- public void setConstantPoolGen(ConstantPoolGen cpg){
+ public void setConstantPoolGen(ConstantPoolGen cpg){ // TODO could be package-protected?
this.cpg = cpg;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/LocalVariables.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/LocalVariables.java?rev=1695689&r1=1695688&r2=1695689&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/LocalVariables.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/LocalVariables.java Thu Aug 13 12:01:00 2015
@@ -83,7 +83,7 @@ public class LocalVariables{
/**
* Sets a new Type for the given local variable slot.
*/
- public void set(int i, Type type){
+ public void set(int i, Type type){ // TODO could be package-protected?
if (type == Type.BYTE || type == Type.SHORT || type == Type.BOOLEAN || type == Type.CHAR){
throw new AssertionViolatedException("LocalVariables do not know about '"+type+"'. Use Type.INT instead.");
}