Author: tcurdt
Date: Sat Feb 2 11:04:13 2008
New Revision: 617860
URL: http://svn.apache.org/viewvc?rev=617860&view=rev
Log:
cleanup
Removed:
jakarta/bcel/trunk/src/test/java/org/apache/bcel/data/package-info.java
Modified:
jakarta/bcel/trunk/src/examples/Mini/ASTFunAppl.java
jakarta/bcel/trunk/src/examples/Mini/ASTFunDecl.java
jakarta/bcel/trunk/src/examples/Mini/ASTProgram.java
jakarta/bcel/trunk/src/examples/Mini/Function.java
jakarta/bcel/trunk/src/examples/Mini/MiniParser.java
jakarta/bcel/trunk/src/examples/Mini/MiniParserTokenManager.java
jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValue.java
jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGen.java
jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValueGen.java
jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/Class2HTML.java
jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/CodeHTML.java
jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/SyntheticRepository.java
jakarta/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java
jakarta/bcel/trunk/src/test/java/org/apache/bcel/AbstractTestCase.java
Modified: jakarta/bcel/trunk/src/examples/Mini/ASTFunAppl.java
URL:
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/examples/Mini/ASTFunAppl.java?rev=617860&r1=617859&r2=617860&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/examples/Mini/ASTFunAppl.java (original)
+++ jakarta/bcel/trunk/src/examples/Mini/ASTFunAppl.java Sat Feb 2 11:04:13
2008
@@ -159,8 +159,8 @@
*/
public void code(StringBuffer buf) {
String fname = name.getName();
- Function f = function;
- ASTIdent[] args = f.getArgs();
+// Function f = function;
+// ASTIdent[] args = f.getArgs();
if(fname.equals("READ")) {
ASTFunDecl.push(buf, "_readInt()");
@@ -197,9 +197,9 @@
*/
public void byte_code(InstructionList il, MethodGen method, ConstantPoolGen
cp) {
String fname = name.getName();
- Function f = function;
+// Function f = function;
//ASTIdent fun = f.getName();
- ASTIdent[] args = f.getArgs();
+// ASTIdent[] args = f.getArgs();
String class_name = method.getClassName();
if(fname.equals("READ")) {
Modified: jakarta/bcel/trunk/src/examples/Mini/ASTFunDecl.java
URL:
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/examples/Mini/ASTFunDecl.java?rev=617860&r1=617859&r2=617860&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/examples/Mini/ASTFunDecl.java (original)
+++ jakarta/bcel/trunk/src/examples/Mini/ASTFunDecl.java Sat Feb 2 11:04:13
2008
@@ -55,7 +55,7 @@
private int line, column;
private boolean is_simple; // true, if simple expression like `12 +
f(a)'
private boolean is_recursive; // Not used yet, TODO
- private int max_depth; // max. expression tree depth
+// private int max_depth; // max. expression tree depth
private Environment env;
// Generated methods
Modified: jakarta/bcel/trunk/src/examples/Mini/ASTProgram.java
URL:
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/examples/Mini/ASTProgram.java?rev=617860&r1=617859&r2=617860&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/examples/Mini/ASTProgram.java (original)
+++ jakarta/bcel/trunk/src/examples/Mini/ASTProgram.java Sat Feb 2 11:04:13
2008
@@ -19,8 +19,8 @@
package Mini;
import java.io.PrintWriter;
+
import org.apache.bcel.classfile.Field;
-import org.apache.bcel.classfile.Method;
import org.apache.bcel.generic.ALOAD;
import org.apache.bcel.generic.ClassGen;
import org.apache.bcel.generic.ConstantPoolGen;
Modified: jakarta/bcel/trunk/src/examples/Mini/Function.java
URL:
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/examples/Mini/Function.java?rev=617860&r1=617859&r2=617860&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/examples/Mini/Function.java (original)
+++ jakarta/bcel/trunk/src/examples/Mini/Function.java Sat Feb 2 11:04:13 2008
@@ -26,7 +26,7 @@
public class Function implements org.apache.bcel.Constants, EnvEntry {
private ASTIdent name; // Reference to the original declaration
private ASTIdent[] args; // Reference to argument identifiers
- private ASTExpr body; // Reference to function expression body
+// private ASTExpr body; // Reference to function expression body
private boolean reserved; // Is a key word?
private int line, column; // Short for name.getToken()
private String fun_name; // Short for name.getName()
Modified: jakarta/bcel/trunk/src/examples/Mini/MiniParser.java
URL:
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/examples/Mini/MiniParser.java?rev=617860&r1=617859&r2=617860&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/examples/Mini/MiniParser.java (original)
+++ jakarta/bcel/trunk/src/examples/Mini/MiniParser.java Sat Feb 2 11:04:13
2008
@@ -837,7 +837,7 @@
static private Token jj_scanpos, jj_lastpos;
static private int jj_la;
static public boolean lookingAhead = false;
- static private boolean jj_semLA;
+// static private boolean jj_semLA;
static private int jj_gen;
static final private int[] jj_la1 = new int[17];
static final private int[] jj_la1_0 =
{0x200,0x0,0x1800000,0x1c000000,0x11c04400,0x1000,0x1800000,0x0,0x11c04400,0xe2000000,0x3f0000,0x1800000,0x1800000,0x1c000000,0xe2000000,0x3f0000,0x10400000,};
Modified: jakarta/bcel/trunk/src/examples/Mini/MiniParserTokenManager.java
URL:
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/examples/Mini/MiniParserTokenManager.java?rev=617860&r1=617859&r2=617860&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/examples/Mini/MiniParserTokenManager.java (original)
+++ jakarta/bcel/trunk/src/examples/Mini/MiniParserTokenManager.java Sat Feb 2
11:04:13 2008
@@ -42,17 +42,17 @@
jjCheckNAdd(state1);
jjCheckNAdd(state2);
}
-static private final void jjCheckNAddStates(int start, int end)
-{
- do {
- jjCheckNAdd(jjnextStates[start]);
- } while (start++ != end);
-}
-static private final void jjCheckNAddStates(int start)
-{
- jjCheckNAdd(jjnextStates[start]);
- jjCheckNAdd(jjnextStates[start + 1]);
-}
+//static private final void jjCheckNAddStates(int start, int end)
+//{
+// do {
+// jjCheckNAdd(jjnextStates[start]);
+// } while (start++ != end);
+//}
+//static private final void jjCheckNAddStates(int start)
+//{
+// jjCheckNAdd(jjnextStates[start]);
+// jjCheckNAdd(jjnextStates[start + 1]);
+//}
static private final int jjMoveNfa_1(int startState, int curPos)
{
int startsAt = 0;
Modified:
jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValue.java
URL:
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValue.java?rev=617860&r1=617859&r2=617860&view=diff
==============================================================================
---
jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValue.java
(original)
+++
jakarta/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValue.java
Sat Feb 2 11:04:13 2008
@@ -19,8 +19,6 @@
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
/**
* @version $Id: ElementValue
Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGen.java
URL:
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGen.java?rev=617860&r1=617859&r2=617860&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGen.java
(original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGen.java Sat
Feb 2 11:04:13 2008
@@ -19,10 +19,10 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+
import org.apache.bcel.Constants;
import org.apache.bcel.classfile.AccessFlags;
import org.apache.bcel.classfile.AnnotationEntry;
-import org.apache.bcel.classfile.Annotations;
import org.apache.bcel.classfile.Attribute;
import org.apache.bcel.classfile.ConstantPool;
import org.apache.bcel.classfile.Field;
Modified:
jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValueGen.java
URL:
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValueGen.java?rev=617860&r1=617859&r2=617860&view=diff
==============================================================================
---
jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValueGen.java
(original)
+++
jakarta/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValueGen.java
Sat Feb 2 11:04:13 2008
@@ -3,8 +3,7 @@
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
+
import org.apache.bcel.classfile.AnnotationElementValue;
import org.apache.bcel.classfile.AnnotationEntry;
import org.apache.bcel.classfile.ArrayElementValue;
Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/Class2HTML.java
URL:
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/Class2HTML.java?rev=617860&r1=617859&r2=617860&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/Class2HTML.java
(original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/Class2HTML.java Sat
Feb 2 11:04:13 2008
@@ -85,8 +85,8 @@
*/
AttributeHTML attribute_html = new AttributeHTML(dir, class_name,
constant_pool,
constant_html);
- MethodHTML method_html = new MethodHTML(dir, class_name, methods,
java_class.getFields(),
- constant_html, attribute_html);
+// MethodHTML method_html = new MethodHTML(dir, class_name, methods,
java_class.getFields(),
+// constant_html, attribute_html);
// Write main file (with frames, yuk)
writeMainHTML(attribute_html);
new CodeHTML(dir, class_name, methods, constant_pool, constant_html);
Modified: jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/CodeHTML.java
URL:
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/CodeHTML.java?rev=617860&r1=617859&r2=617860&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/CodeHTML.java
(original)
+++ jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/CodeHTML.java Sat Feb
2 11:04:13 2008
@@ -43,7 +43,7 @@
final class CodeHTML implements org.apache.bcel.Constants {
private String class_name; // name of current class
- private Method[] methods; // Methods to print
+// private Method[] methods; // Methods to print
private PrintWriter file; // file to write to
private BitSet goto_set;
private ConstantPool constant_pool;
@@ -54,7 +54,7 @@
CodeHTML(String dir, String class_name, Method[] methods, ConstantPool
constant_pool,
ConstantHTML constant_html) throws IOException {
this.class_name = class_name;
- this.methods = methods;
+// this.methods = methods;
this.constant_pool = constant_pool;
this.constant_html = constant_html;
file = new PrintWriter(new FileOutputStream(dir + class_name +
"_code.html"));
@@ -252,8 +252,10 @@
int m_index = bytes.readShort();
String str;
if (opcode == INVOKEINTERFACE) { // Special treatment needed
- int nargs = bytes.readUnsignedByte(); // Redundant
- int reserved = bytes.readUnsignedByte(); // Reserved
+ bytes.readUnsignedByte(); // Redundant
+ bytes.readUnsignedByte(); // Reserved
+// int nargs = bytes.readUnsignedByte(); // Redundant
+// int reserved = bytes.readUnsignedByte(); // Reserved
ConstantInterfaceMethodref c =
(ConstantInterfaceMethodref) constant_pool
.getConstant(m_index, CONSTANT_InterfaceMethodref);
class_index = c.getClassIndex();
@@ -426,7 +428,8 @@
default_offset += offset;
goto_set.set(default_offset);
for (int j = 0; j < npairs; j++) {
- int match = bytes.readInt();
+// int match = bytes.readInt();
+ bytes.readInt();
index = offset + bytes.readInt();
goto_set.set(index);
}
Modified:
jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/SyntheticRepository.java
URL:
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/SyntheticRepository.java?rev=617860&r1=617859&r2=617860&view=diff
==============================================================================
---
jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/SyntheticRepository.java
(original)
+++
jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/SyntheticRepository.java
Sat Feb 2 11:04:13 2008
@@ -47,7 +47,7 @@
*/
public class SyntheticRepository implements Repository {
- private static final String DEFAULT_PATH = ClassPath.getClassPath();
+ //private static final String DEFAULT_PATH = ClassPath.getClassPath();
private static Map _instances = new HashMap(); // CLASSPATH X REPOSITORY
private ClassPath _path = null;
private Map _loadedClasses = new HashMap(); // CLASSNAME X JAVACLASS
Modified:
jakarta/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java
URL:
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java?rev=617860&r1=617859&r2=617860&view=diff
==============================================================================
---
jakarta/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java
(original)
+++
jakarta/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java
Sat Feb 2 11:04:13 2008
@@ -590,8 +590,10 @@
else{
/* TODO: Check if assignment compatibility is
sufficient.
What does Sun do? */
- Type f_type = Type.getType(f.getSignature());
- Type o_type = o.getType(cpg);
+ Type.getType(f.getSignature());
+ o.getType(cpg);
+// Type f_type = Type.getType(f.getSignature());
+// Type o_type = o.getType(cpg);
// Argh. Sun's implementation allows us to have
multiple fields of
// the same name but with a different signature.
Modified: jakarta/bcel/trunk/src/test/java/org/apache/bcel/AbstractTestCase.java
URL:
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/test/java/org/apache/bcel/AbstractTestCase.java?rev=617860&r1=617859&r2=617860&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/test/java/org/apache/bcel/AbstractTestCase.java
(original)
+++ jakarta/bcel/trunk/src/test/java/org/apache/bcel/AbstractTestCase.java Sat
Feb 2 11:04:13 2008
@@ -1,10 +1,11 @@
package org.apache.bcel;
import java.io.File;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+
import junit.framework.TestCase;
+
import org.apache.bcel.classfile.AnnotationEntry;
import org.apache.bcel.classfile.Attribute;
import org.apache.bcel.classfile.JavaClass;
@@ -18,7 +19,7 @@
import org.apache.bcel.util.ClassPath;
import org.apache.bcel.util.SyntheticRepository;
-public class AbstractTestCase extends TestCase
+public abstract class AbstractTestCase extends TestCase
{
private boolean verbose = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
