This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-bcel.git
commit 9691130993098215edf9a353ddc1a483a9ccc3b8
Author: Gary David Gregory (Code signing key) <ggreg...@apache.org>
AuthorDate: Fri Oct 7 13:40:14 2022 -0400
Replace use of deprecated code in examples
---
src/examples/Mini/ASTExpr.java | 20 ++++++++++----------
src/examples/Mini/ASTFunAppl.java | 2 +-
src/examples/Mini/ASTFunDecl.java | 10 +++++-----
src/examples/Mini/ASTIdent.java | 2 +-
src/examples/Mini/ASTIfExpr.java | 6 +++---
src/examples/Mini/ASTLetExpr.java | 2 +-
src/examples/Mini/ASTProgram.java | 14 +++++++-------
src/examples/ProxyCreator.java | 16 ++++++++--------
8 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/src/examples/Mini/ASTExpr.java b/src/examples/Mini/ASTExpr.java
index 748d8658..85370311 100644
--- a/src/examples/Mini/ASTExpr.java
+++ b/src/examples/Mini/ASTExpr.java
@@ -29,7 +29,7 @@ import org.apache.bcel.generic.IF_ICMPGT;
import org.apache.bcel.generic.IF_ICMPLE;
import org.apache.bcel.generic.IF_ICMPLT;
import org.apache.bcel.generic.IF_ICMPNE;
-import org.apache.bcel.generic.InstructionConstants;
+import org.apache.bcel.generic.InstructionConst;
import org.apache.bcel.generic.InstructionList;
import org.apache.bcel.generic.MethodGen;
import org.apache.bcel.generic.PUSH;
@@ -110,11 +110,11 @@ public class ASTExpr extends SimpleNode implements
MiniParserConstants, MiniPars
if (unop != -1) { // Apply unary operand
if (unop == MINUS) {
- il.append(InstructionConstants.INEG);
+ il.append(InstructionConst.INEG);
} else { // == NOT
il.append(new PUSH(cp, 1));
ASTFunDecl.push(); // Push TRUE
- il.append(InstructionConstants.IXOR);
+ il.append(InstructionConst.IXOR);
ASTFunDecl.pop();
}
} else { // Apply binary operand
@@ -124,27 +124,27 @@ public class ASTExpr extends SimpleNode implements
MiniParserConstants, MiniPars
switch (kind) {
case PLUS:
- il.append(InstructionConstants.IADD);
+ il.append(InstructionConst.IADD);
ASTFunDecl.pop();
break;
case MINUS:
- il.append(InstructionConstants.ISUB);
+ il.append(InstructionConst.ISUB);
ASTFunDecl.pop();
break;
case MULT:
- il.append(InstructionConstants.IMUL);
+ il.append(InstructionConst.IMUL);
ASTFunDecl.pop();
break;
case DIV:
- il.append(InstructionConstants.IDIV);
+ il.append(InstructionConst.IDIV);
ASTFunDecl.pop();
break;
case AND:
- il.append(InstructionConstants.IAND);
+ il.append(InstructionConst.IAND);
ASTFunDecl.pop();
break;
case OR:
- il.append(InstructionConstants.IOR);
+ il.append(InstructionConst.IOR);
ASTFunDecl.pop();
break;
@@ -189,7 +189,7 @@ public class ASTExpr extends SimpleNode implements
MiniParserConstants, MiniPars
il.append(new PUSH(cp, 1));
g = il.append(new GOTO(null));
bh.setTarget(il.append(new PUSH(cp, 0)));
- g.setTarget(il.append(InstructionConstants.NOP)); // May be
optimized away later
+ g.setTarget(il.append(InstructionConst.NOP)); // May be
optimized away later
ASTFunDecl.push();
break;
diff --git a/src/examples/Mini/ASTFunAppl.java
b/src/examples/Mini/ASTFunAppl.java
index 772594f9..fd429f48 100644
--- a/src/examples/Mini/ASTFunAppl.java
+++ b/src/examples/Mini/ASTFunAppl.java
@@ -29,7 +29,7 @@ import org.apache.bcel.generic.Type;
/**
*
*/
-public class ASTFunAppl extends ASTExpr implements MiniParserTreeConstants {
+public class ASTFunAppl extends ASTExpr {
public static Node jjtCreate(final MiniParser p, final int id) {
return new ASTFunAppl(p, id);
}
diff --git a/src/examples/Mini/ASTFunDecl.java
b/src/examples/Mini/ASTFunDecl.java
index 7e6f7c8d..8b713abb 100644
--- a/src/examples/Mini/ASTFunDecl.java
+++ b/src/examples/Mini/ASTFunDecl.java
@@ -33,7 +33,7 @@ import org.apache.bcel.generic.ConstantPoolGen;
import org.apache.bcel.generic.GETSTATIC;
import org.apache.bcel.generic.GOTO;
import org.apache.bcel.generic.INVOKEVIRTUAL;
-import org.apache.bcel.generic.InstructionConstants;
+import org.apache.bcel.generic.InstructionConst;
import org.apache.bcel.generic.InstructionHandle;
import org.apache.bcel.generic.InstructionList;
import org.apache.bcel.generic.InstructionTargeter;
@@ -242,9 +242,9 @@ public class ASTFunDecl extends SimpleNode implements
MiniParserTreeConstants, o
final LocalVariableGen exc = method.addLocalVariable("$e",
eType, null, null);
final int slot = exc.getIndex();
- il.append(InstructionConstants.POP);
+ il.append(InstructionConst.POP);
pop(); // Remove last element on stack
- end = il.append(InstructionConstants.RETURN); // Use
instruction constants, if possible
+ end = il.append(InstructionConst.RETURN); // Use instruction
constants, if possible
// catch
handler = il.append(new ASTORE(slot)); // save exception object
@@ -253,12 +253,12 @@ public class ASTFunDecl extends SimpleNode implements
MiniParserTreeConstants, o
push(2);
il.append(new
INVOKEVIRTUAL(cp.addMethodref("java.io.PrintStream", "println",
"(Ljava/lang/Object;)V")));
pop(2);
- end_handler = il.append(InstructionConstants.RETURN);
+ end_handler = il.append(InstructionConst.RETURN);
method.addExceptionHandler(start, end, handler, eType);
exc.setStart(handler);
exc.setEnd(end_handler);
} else {
- il.append(InstructionConstants.IRETURN); // Reuse object to
save memory
+ il.append(InstructionConst.IRETURN); // Reuse object to save
memory
}
method.removeNOPs(); // First optimization pass, provided by
MethodGen
diff --git a/src/examples/Mini/ASTIdent.java b/src/examples/Mini/ASTIdent.java
index 6646ece2..b3392736 100644
--- a/src/examples/Mini/ASTIdent.java
+++ b/src/examples/Mini/ASTIdent.java
@@ -30,7 +30,7 @@ import org.apache.bcel.generic.PUSH;
/**
*
*/
-public class ASTIdent extends ASTExpr implements org.apache.bcel.Constants {
+public class ASTIdent extends ASTExpr {
public static Node jjtCreate(final MiniParser p, final int id) {
return new ASTIdent(p, id);
}
diff --git a/src/examples/Mini/ASTIfExpr.java b/src/examples/Mini/ASTIfExpr.java
index f5674f34..58d12c55 100644
--- a/src/examples/Mini/ASTIfExpr.java
+++ b/src/examples/Mini/ASTIfExpr.java
@@ -24,14 +24,14 @@ import org.apache.bcel.generic.BranchHandle;
import org.apache.bcel.generic.ConstantPoolGen;
import org.apache.bcel.generic.GOTO;
import org.apache.bcel.generic.IFEQ;
-import org.apache.bcel.generic.InstructionConstants;
+import org.apache.bcel.generic.InstructionConst;
import org.apache.bcel.generic.InstructionList;
import org.apache.bcel.generic.MethodGen;
/**
*
*/
-public class ASTIfExpr extends ASTExpr implements org.apache.bcel.Constants {
+public class ASTIfExpr extends ASTExpr {
public static Node jjtCreate(final MiniParser p, final int id) {
return new ASTIfExpr(p, id);
}
@@ -67,7 +67,7 @@ public class ASTIfExpr extends ASTExpr implements
org.apache.bcel.Constants {
il.append(then_code);
g = il.append(new GOTO(null));
i.setTarget(il.append(else_code));
- g.setTarget(il.append(InstructionConstants.NOP)); // May be optimized
away later
+ g.setTarget(il.append(InstructionConst.NOP)); // May be optimized away
later
}
/**
diff --git a/src/examples/Mini/ASTLetExpr.java
b/src/examples/Mini/ASTLetExpr.java
index d2db6796..f148e1b8 100644
--- a/src/examples/Mini/ASTLetExpr.java
+++ b/src/examples/Mini/ASTLetExpr.java
@@ -32,7 +32,7 @@ import org.apache.bcel.generic.Type;
/**
*
*/
-public class ASTLetExpr extends ASTExpr implements org.apache.bcel.Constants {
+public class ASTLetExpr extends ASTExpr {
public static Node jjtCreate(final MiniParser p, final int id) {
return new ASTLetExpr(p, id);
}
diff --git a/src/examples/Mini/ASTProgram.java
b/src/examples/Mini/ASTProgram.java
index 652dc32c..a1fdd770 100644
--- a/src/examples/Mini/ASTProgram.java
+++ b/src/examples/Mini/ASTProgram.java
@@ -31,7 +31,7 @@ import org.apache.bcel.generic.ILOAD;
import org.apache.bcel.generic.INVOKESPECIAL;
import org.apache.bcel.generic.INVOKESTATIC;
import org.apache.bcel.generic.INVOKEVIRTUAL;
-import org.apache.bcel.generic.InstructionConstants;
+import org.apache.bcel.generic.InstructionConst;
import org.apache.bcel.generic.InstructionList;
import org.apache.bcel.generic.MethodGen;
import org.apache.bcel.generic.NEW;
@@ -113,7 +113,7 @@ public class ASTProgram extends SimpleNode implements
MiniParserConstants, MiniP
il.append(new GETSTATIC(_in));
il.append(new INVOKEVIRTUAL(cp.addMethodref("java.io.BufferedReader",
"readLine", "()Ljava/lang/String;")));
il.append(new INVOKESTATIC(cp.addMethodref("java.lang.Integer",
"parseInt", "(Ljava/lang/String;)I")));
- il.append(InstructionConstants.IRETURN);
+ il.append(InstructionConst.IRETURN);
/*
* private static int _readInt() throws IOException
@@ -133,7 +133,7 @@ public class ASTProgram extends SimpleNode implements
MiniParserConstants, MiniP
il = new InstructionList();
il.append(new GETSTATIC(out));
il.append(new NEW(cp.addClass("java.lang.StringBuffer")));
- il.append(InstructionConstants.DUP);
+ il.append(InstructionConst.DUP);
il.append(new PUSH(cp, "Result: "));
il.append(new INVOKESPECIAL(cp.addMethodref("java.lang.StringBuffer",
"<init>", "(Ljava/lang/String;)V")));
@@ -144,7 +144,7 @@ public class ASTProgram extends SimpleNode implements
MiniParserConstants, MiniP
il.append(new INVOKEVIRTUAL(cp.addMethodref("java.io.PrintStream",
"println", "(Ljava/lang/String;)V")));
il.append(new PUSH(cp, 0));
- il.append(InstructionConstants.IRETURN); // Reuse objects, if possible
+ il.append(InstructionConst.IRETURN); // Reuse objects, if possible
method = new MethodGen(ACC_STATIC | ACC_PRIVATE | ACC_FINAL, Type.INT,
args, argv, "_writeInt", className, il, cp);
@@ -172,14 +172,14 @@ public class ASTProgram extends SimpleNode implements
MiniParserConstants, MiniP
il.dispose(); // Dispose instruction handles for better memory
utilization
il = new InstructionList();
il.append(new NEW(cp.addClass("java.io.BufferedReader")));
- il.append(InstructionConstants.DUP);
+ il.append(InstructionConst.DUP);
il.append(new NEW(cp.addClass("java.io.InputStreamReader")));
- il.append(InstructionConstants.DUP);
+ il.append(InstructionConst.DUP);
il.append(new GETSTATIC(cp.addFieldref("java.lang.System", "in",
"Ljava/io/InputStream;")));
il.append(new
INVOKESPECIAL(cp.addMethodref("java.io.InputStreamReader", "<init>",
"(Ljava/io/InputStream;)V")));
il.append(new INVOKESPECIAL(cp.addMethodref("java.io.BufferedReader",
"<init>", "(Ljava/io/Reader;)V")));
il.append(new PUTSTATIC(_in));
- il.append(InstructionConstants.RETURN); // Reuse instruction constants
+ il.append(InstructionConst.RETURN); // Reuse instruction constants
method = new MethodGen(ACC_STATIC, Type.VOID, Type.NO_ARGS, null,
"<clinit>", className, il, cp);
diff --git a/src/examples/ProxyCreator.java b/src/examples/ProxyCreator.java
index d6705784..73fdc7a8 100644
--- a/src/examples/ProxyCreator.java
+++ b/src/examples/ProxyCreator.java
@@ -19,14 +19,14 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import org.apache.bcel.Constants;
+import org.apache.bcel.Const;
import org.apache.bcel.classfile.Utility;
import org.apache.bcel.generic.ALOAD;
import org.apache.bcel.generic.ClassGen;
import org.apache.bcel.generic.ConstantPoolGen;
import org.apache.bcel.generic.GETSTATIC;
import org.apache.bcel.generic.INVOKEVIRTUAL;
-import org.apache.bcel.generic.InstructionConstants;
+import org.apache.bcel.generic.InstructionConst;
import org.apache.bcel.generic.InstructionFactory;
import org.apache.bcel.generic.InstructionList;
import org.apache.bcel.generic.MethodGen;
@@ -79,10 +79,10 @@ public class ProxyCreator {
// TODO this is broken; cannot ever be true now that ClassLoader has
been dropped
if (loader.getClass().toString().equals("class
org.apache.bcel.util.ClassLoader")) {
// Real class name will be set by the class loader
- final ClassGen cg = new ClassGen("foo", "java.lang.Object", "",
Constants.ACC_PUBLIC, new String[] {"java.awt.event.ActionListener"});
+ final ClassGen cg = new ClassGen("foo", "java.lang.Object", "",
Const.ACC_PUBLIC, new String[] {"java.awt.event.ActionListener"});
// That's important, otherwise newInstance() won't work
- cg.addEmptyConstructor(Constants.ACC_PUBLIC);
+ cg.addEmptyConstructor(Const.ACC_PUBLIC);
final InstructionList il = new InstructionList();
final ConstantPoolGen cp = cg.getConstantPool();
@@ -90,20 +90,20 @@ public class ProxyCreator {
final int out = cp.addFieldref("java.lang.System", "out",
"Ljava/io/PrintStream;");
final int println = cp.addMethodref("java.io.PrintStream",
"println", "(Ljava/lang/Object;)V");
- final MethodGen mg = new MethodGen(Constants.ACC_PUBLIC,
Type.VOID, new Type[] {new ObjectType("java.awt.event.ActionEvent")}, null,
+ final MethodGen mg = new MethodGen(Const.ACC_PUBLIC, Type.VOID,
new Type[] {new ObjectType("java.awt.event.ActionEvent")}, null,
"actionPerformed", "foo", il, cp);
// System.out.println("actionPerformed:" + event);
il.append(new GETSTATIC(out));
il.append(factory.createNew("java.lang.StringBuffer"));
- il.append(InstructionConstants.DUP);
+ il.append(InstructionConst.DUP);
il.append(new PUSH(cp, "actionPerformed:"));
- il.append(factory.createInvoke("java.lang.StringBuffer", "<init>",
Type.VOID, new Type[] {Type.STRING}, Constants.INVOKESPECIAL));
+ il.append(factory.createInvoke("java.lang.StringBuffer", "<init>",
Type.VOID, new Type[] {Type.STRING}, Const.INVOKESPECIAL));
il.append(new ALOAD(1));
il.append(factory.createAppend(Type.OBJECT));
il.append(new INVOKEVIRTUAL(println));
- il.append(InstructionConstants.RETURN);
+ il.append(InstructionConst.RETURN);
mg.stripAttributes(true);
mg.setMaxStack();
