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 2a590a533a0b5c27c5afd6d9abd2fe93bd9ec098
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Jun 1 19:09:48 2020 -0400
Use enhanced for loop.
---
src/examples/Mini/ASTExpr.java | 12 ++++++------
src/examples/Mini/ASTFunDecl.java | 20 ++++++++++----------
src/examples/Mini/ASTLetExpr.java | 3 +--
src/examples/Mini/ASTProgram.java | 22 +++++++++++-----------
src/examples/Mini/MiniC.java | 12 ++++++------
src/examples/Mini/MiniParser.java | 8 ++++----
src/examples/Mini/ParseException.java | 12 ++++++------
src/examples/Mini/SimpleNode.java | 4 ++--
src/examples/Package.java | 3 +--
src/examples/listclass.java | 8 ++++----
src/main/java/org/apache/bcel/util/ClassPath.java | 20 ++++++++++----------
11 files changed, 61 insertions(+), 63 deletions(-)
diff --git a/src/examples/Mini/ASTExpr.java b/src/examples/Mini/ASTExpr.java
index 1b01173..47c094f 100644
--- a/src/examples/Mini/ASTExpr.java
+++ b/src/examples/Mini/ASTExpr.java
@@ -177,16 +177,16 @@ implements MiniParserConstants, MiniParserTreeConstants,
org.apache.bcel.Constan
}
// Get type of subexpressions
- for(int i=0; i < exprs.length; i++) {
- t = exprs[i].eval(child_type);
+ for (ASTExpr expr : exprs) {
+ t = expr.eval(child_type);
if(t != child_type) {
- MiniC.addError(exprs[i].getLine(), exprs[i].getColumn(),
+ MiniC.addError(expr.getLine(), expr.getColumn(),
"Expression has not expected type " +
TYPE_NAMES[child_type] +
" but " + TYPE_NAMES[t] + ".");
}
- is_simple = is_simple && exprs[i].isSimple();
+ is_simple = is_simple && expr.isSimple();
}
return type;
@@ -322,8 +322,8 @@ implements MiniParserConstants, MiniParserTreeConstants,
org.apache.bcel.Constan
System.out.println(toString(prefix));
if(exprs != null) {
- for(int i=0; i < exprs.length; ++i) {
- exprs[i].dump(prefix + " ");
+ for (ASTExpr expr : exprs) {
+ expr.dump(prefix + " ");
}
}
}
diff --git a/src/examples/Mini/ASTFunDecl.java
b/src/examples/Mini/ASTFunDecl.java
index d89fda2..fe509da 100644
--- a/src/examples/Mini/ASTFunDecl.java
+++ b/src/examples/Mini/ASTFunDecl.java
@@ -103,13 +103,13 @@ public class ASTFunDecl extends SimpleNode implements
MiniParserTreeConstants, o
this.env = env;
// Put arguments into hash table aka environment
- for (int i = 0; i < argv.length; i++) {
- final EnvEntry entry = env.get(argv[i].getName());
+ for (ASTIdent element : argv) {
+ final EnvEntry entry = env.get(element.getName());
if (entry != null) {
- MiniC.addError(argv[i].getLine(), argv[i].getColumn(),
"Redeclaration of " + entry + ".");
+ MiniC.addError(element.getLine(), element.getColumn(),
"Redeclaration of " + entry + ".");
} else {
- env.put(new Variable(argv[i]));
+ env.put(new Variable(element));
}
}
@@ -328,11 +328,11 @@ public class ASTFunDecl extends SimpleNode implements
MiniParserTreeConstants, o
System.err.println(targets[0]);
- for (int i = 0; i < targets.length; i++) {
- final InstructionTargeter[] targeters =
targets[i].getTargeters();
+ for (InstructionHandle target : targets) {
+ final InstructionTargeter[] targeters =
target.getTargeters();
- for (int j = 0; j < targeters.length; j++) {
- if ((targets[i] != match[4]) || (targeters[j] !=
match[2])) {
+ for (InstructionTargeter targeter : targeters) {
+ if ((target != match[4]) || (targeter != match[2])) {
System.err.println("Unexpected: " + e);
}
}
@@ -416,8 +416,8 @@ public class ASTFunDecl extends SimpleNode implements
MiniParserTreeConstants, o
public void dump(final String prefix) {
System.out.println(toString(prefix));
- for (int i = 0; i < argv.length; i++) {
- argv[i].dump(prefix + " ");
+ for (ASTIdent element : argv) {
+ element.dump(prefix + " ");
}
body.dump(prefix + " ");
diff --git a/src/examples/Mini/ASTLetExpr.java
b/src/examples/Mini/ASTLetExpr.java
index b3a1dbb..387229e 100644
--- a/src/examples/Mini/ASTLetExpr.java
+++ b/src/examples/Mini/ASTLetExpr.java
@@ -85,8 +85,7 @@ public class ASTLetExpr extends ASTExpr implements
org.apache.bcel.Constants {
}
// Put argument names into hash table aka. environment
- for(int i=0; i < idents.length; i++) {
- final ASTIdent id = idents[i];
+ for (final ASTIdent id : idents) {
final String name = id.getName();
final EnvEntry entry = env.get(name);
diff --git a/src/examples/Mini/ASTProgram.java
b/src/examples/Mini/ASTProgram.java
index 7d52785..498ef4a 100644
--- a/src/examples/Mini/ASTProgram.java
+++ b/src/examples/Mini/ASTProgram.java
@@ -116,8 +116,8 @@ implements MiniParserConstants, MiniParserTreeConstants,
org.apache.bcel.Constan
if(fun_decls != null) {
// Put function names into hash table aka. environment
- for(int i=0; i < fun_decls.length; i++) {
- f = fun_decls[i];
+ for (ASTFunDecl fun_decl : fun_decls) {
+ f = fun_decl;
name = f.getName();
fname = name.getName();
fun = env.get(fname); // Lookup in env
@@ -159,11 +159,11 @@ implements MiniParserConstants, MiniParserTreeConstants,
org.apache.bcel.Constan
*/
public void eval(final int pass) {
- for(int i=0; i < fun_decls.length; i++) {
- fun_decls[i].eval(pass);
+ for (ASTFunDecl fun_decl : fun_decls) {
+ fun_decl.eval(pass);
if(pass == 3) { // Final check for unresolved types
- final ASTIdent name = fun_decls[i].getName();
+ final ASTIdent name = fun_decl.getName();
if(name.getType() == T_UNKNOWN) {
MiniC.addError(name.getColumn(), name.getLine(),
@@ -193,8 +193,8 @@ implements MiniParserConstants, MiniParserTreeConstants,
org.apache.bcel.Constan
out.println(" private static int _writeInt(int n) {\n" +
" System.out.println(\"Result: \" + n);\n return 0;\n
}\n");
- for(int i=0; i < fun_decls.length; i++) {
- fun_decls[i].code(out);
+ for (ASTFunDecl fun_decl : fun_decls) {
+ fun_decl.code(out);
}
out.println("}");
@@ -321,8 +321,8 @@ implements MiniParserConstants, MiniParserTreeConstants,
org.apache.bcel.Constan
method.setMaxStack(5);
class_gen.addMethod(method.getMethod());
- for(int i=0; i < fun_decls.length; i++) {
- fun_decls[i].byte_code(class_gen, cp);
+ for (ASTFunDecl fun_decl : fun_decls) {
+ fun_decl.byte_code(class_gen, cp);
}
}
@@ -330,8 +330,8 @@ implements MiniParserConstants, MiniParserTreeConstants,
org.apache.bcel.Constan
public void dump(final String prefix) {
System.out.println(toString(prefix));
- for(int i = 0; i < fun_decls.length; ++i) {
- fun_decls[i].dump(prefix + " ");
+ for (ASTFunDecl fun_decl : fun_decls) {
+ fun_decl.dump(prefix + " ");
}
}
}
diff --git a/src/examples/Mini/MiniC.java b/src/examples/Mini/MiniC.java
index 34a7b3e..57b18ca 100644
--- a/src/examples/Mini/MiniC.java
+++ b/src/examples/Mini/MiniC.java
@@ -41,18 +41,18 @@ public class MiniC implements org.apache.bcel.Constants {
try {
/* Parse command line arguments.
*/
- for(int i=0; i < argv.length; i++) {
- if(argv[i].charAt(0) == '-') { // command line switch
- if(argv[i].equals("-java")) {
+ for (String element : argv) {
+ if(element.charAt(0) == '-') { // command line switch
+ if(element.equals("-java")) {
byte_code=false;
- } else if(argv[i].equals("-bytecode")) {
+ } else if(element.equals("-bytecode")) {
byte_code=true;
} else {
- throw new Exception("Unknown option: " + argv[i]);
+ throw new Exception("Unknown option: " + element);
}
}
else { // add file name to list
- file_name[files++] = argv[i];
+ file_name[files++] = element;
}
}
diff --git a/src/examples/Mini/MiniParser.java
b/src/examples/Mini/MiniParser.java
index c737013..5342f4e 100644
--- a/src/examples/Mini/MiniParser.java
+++ b/src/examples/Mini/MiniParser.java
@@ -956,8 +956,8 @@ public class MiniParser/*@bgen(jjtree)*/implements
MiniParserTreeConstants, Mini
jj_gen++;
if (++jj_gc > 100) {
jj_gc = 0;
- for (int i = 0; i < jj_2_rtns.length; i++) {
- JJCalls c = jj_2_rtns[i];
+ for (JJCalls jj_2_rtn : jj_2_rtns) {
+ JJCalls c = jj_2_rtn;
while (c != null) {
if (c.gen < jj_gen) {
c.first = null;
@@ -1043,8 +1043,8 @@ public class MiniParser/*@bgen(jjtree)*/implements
MiniParserTreeConstants, Mini
jj_expentry[i] = jj_lasttokens[i];
}
boolean exists = false;
- for (final java.util.Enumeration<int[]> e = jj_expentries.elements();
e.hasMoreElements();) {
- final int[] oldentry = (e.nextElement());
+ for (int[] j : jj_expentries) {
+ final int[] oldentry = (j);
if (oldentry.length == jj_expentry.length) {
exists = true;
for (int i = 0; i < jj_expentry.length; i++) {
diff --git a/src/examples/Mini/ParseException.java
b/src/examples/Mini/ParseException.java
index 99aee2b..31e1552 100644
--- a/src/examples/Mini/ParseException.java
+++ b/src/examples/Mini/ParseException.java
@@ -118,14 +118,14 @@ public class ParseException extends Exception {
}
String expected = "";
int maxSize = 0;
- for (int i = 0; i < expectedTokenSequences.length; i++) {
- if (maxSize < expectedTokenSequences[i].length) {
- maxSize = expectedTokenSequences[i].length;
+ for (int[] expectedTokenSequence : expectedTokenSequences) {
+ if (maxSize < expectedTokenSequence.length) {
+ maxSize = expectedTokenSequence.length;
}
- for (int j = 0; j < expectedTokenSequences[i].length; j++) {
- expected += tokenImage[expectedTokenSequences[i][j]] + " ";
+ for (int j = 0; j < expectedTokenSequence.length; j++) {
+ expected += tokenImage[expectedTokenSequence[j]] + " ";
}
- if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] !=
0) {
+ if (expectedTokenSequence[expectedTokenSequence.length - 1] != 0) {
expected += "...";
}
expected += eol + " ";
diff --git a/src/examples/Mini/SimpleNode.java
b/src/examples/Mini/SimpleNode.java
index 0f91b76..81e9374 100644
--- a/src/examples/Mini/SimpleNode.java
+++ b/src/examples/Mini/SimpleNode.java
@@ -85,8 +85,8 @@ public abstract class SimpleNode implements Node {
public void dump(final String prefix) {
System.out.println(toString(prefix));
if (children != null) {
- for (int i = 0; i < children.length; ++i) {
- final SimpleNode n = (SimpleNode)children[i];
+ for (Node element : children) {
+ final SimpleNode n = (SimpleNode)element;
if (n != null) {
n.dump(prefix + " ");
}
diff --git a/src/examples/Package.java b/src/examples/Package.java
index 35c24a7..6cb9d64 100644
--- a/src/examples/Package.java
+++ b/src/examples/Package.java
@@ -218,8 +218,7 @@ public class Package {
void printAllClasses() {
final List<String> names = new ArrayList<>(allClasses.keySet());
Collections.sort(names);
- for (int i = 0; i < names.size(); i++) {
- final String cl = names.get(i);
+ for (final String cl : names) {
System.err.println(cl);
}
}
diff --git a/src/examples/listclass.java b/src/examples/listclass.java
index 1b2fd5f..eb41d4f 100644
--- a/src/examples/listclass.java
+++ b/src/examples/listclass.java
@@ -151,8 +151,8 @@ public class listclass {
final listclass listClass = new listclass(code, constants,
verbose, classdep,
nocontents, recurse, exclude_name);
- for (int i = 0; i < file_name.size(); i++) {
- name = file_name.get(i);
+ for (String element : file_name) {
+ name = element;
listClass.list(name);
}
@@ -182,8 +182,8 @@ public class listclass {
return;
}
- for (int idx = 0; idx < exclude_name.size(); idx++) {
- if (name.startsWith(exclude_name.get(idx))) {
+ for (String element : exclude_name) {
+ if (name.startsWith(element)) {
return;
}
}
diff --git a/src/main/java/org/apache/bcel/util/ClassPath.java
b/src/main/java/org/apache/bcel/util/ClassPath.java
index a9954c1..74f2705 100644
--- a/src/main/java/org/apache/bcel/util/ClassPath.java
+++ b/src/main/java/org/apache/bcel/util/ClassPath.java
@@ -365,8 +365,8 @@ public class ClassPath implements Closeable {
public void close() throws IOException {
if (modules != null) {
// don't use a for each loop to avoid creating an iterator for
the GC to collect.
- for (int i = 0; i < modules.length; i++) {
- modules[i].close();
+ for (JrtModule module : modules) {
+ module.close();
}
}
if (modularRuntimeImage != null) {
@@ -377,8 +377,8 @@ public class ClassPath implements Closeable {
@Override
ClassFile getClassFile(final String name, final String suffix) throws
IOException {
// don't use a for each loop to avoid creating an iterator for the
GC to collect.
- for (int i = 0; i < modules.length; i++) {
- final ClassFile classFile = modules[i].getClassFile(name,
suffix);
+ for (JrtModule module : modules) {
+ final ClassFile classFile = module.getClassFile(name, suffix);
if (classFile != null) {
return classFile;
}
@@ -389,8 +389,8 @@ public class ClassPath implements Closeable {
@Override
URL getResource(final String name) {
// don't use a for each loop to avoid creating an iterator for the
GC to collect.
- for (int i = 0; i < modules.length; i++) {
- final URL url = modules[i].getResource(name);
+ for (JrtModule module : modules) {
+ final URL url = module.getResource(name);
if (url != null) {
return url;
}
@@ -401,8 +401,8 @@ public class ClassPath implements Closeable {
@Override
InputStream getResourceAsStream(final String name) {
// don't use a for each loop to avoid creating an iterator for the
GC to collect.
- for (int i = 0; i < modules.length; i++) {
- final InputStream inputStream =
modules[i].getResourceAsStream(name);
+ for (JrtModule module : modules) {
+ final InputStream inputStream =
module.getResourceAsStream(name);
if (inputStream != null) {
return inputStream;
}
@@ -451,8 +451,8 @@ public class ClassPath implements Closeable {
final File modulesDir = new File(modulesPath);
if (modulesDir.exists()) {
final String[] modules = modulesDir.list(MODULES_FILTER);
- for (int i = 0; i < modules.length; i++) {
- list.add(modulesDir.getPath() + File.separatorChar +
modules[i]);
+ for (String module : modules) {
+ list.add(modulesDir.getPath() + File.separatorChar + module);
}
}
}
