You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2019/04/27 07:16:10 UTC
[groovy] 01/05: minor refactor: remove javadoc warnings and tidy up
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 0306bc518b854ee26e145cf3b913be7ec34c8e90
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Apr 27 11:06:28 2019 +1000
minor refactor: remove javadoc warnings and tidy up
---
.../groovy/classgen/asm/BytecodeHelper.java | 59 ++++++++++------------
1 file changed, 28 insertions(+), 31 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/BytecodeHelper.java b/src/main/java/org/codehaus/groovy/classgen/asm/BytecodeHelper.java
index fb35cd9..c50f4bc 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/BytecodeHelper.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/BytecodeHelper.java
@@ -220,7 +220,7 @@ public class BytecodeHelper implements Opcodes {
}
/**
- * negate a boolean on stack. true->false, false->true
+ * Negate a boolean on stack.
*/
public static void negateBoolean(MethodVisitor mv) {
// code to negate the primitive boolean
@@ -234,7 +234,7 @@ public class BytecodeHelper implements Opcodes {
mv.visitLabel(endLabel);
}
- /**
+ /* *
* load a message on the stack and remove it right away. Good for put a mark in the generated bytecode for debugging purpose.
*
* @param msg
@@ -248,8 +248,6 @@ public class BytecodeHelper implements Opcodes {
* returns a name that Class.forName() can take. Notably for arrays:
* [I, [Ljava.lang.String; etc
* Regular object type: java.lang.String
- *
- * @param name
*/
public static String formatNameForClassLoading(String name) {
if (name == null) {
@@ -289,8 +287,8 @@ public class BytecodeHelper implements Opcodes {
private static boolean hasGenerics(Parameter[] param) {
if (param.length == 0) return false;
- for (int i = 0; i < param.length; i++) {
- ClassNode type = param[i].getType();
+ for (Parameter parameter : param) {
+ ClassNode type = parameter.getType();
if (hasGenerics(type)) return true;
}
return false;
@@ -331,8 +329,8 @@ public class BytecodeHelper implements Opcodes {
if (sclass.isUsingGenerics()) return true;
ClassNode[] interfaces = node.getInterfaces();
if (interfaces != null) {
- for (int i = 0; i < interfaces.length; i++) {
- if (interfaces[i].isUsingGenerics()) return true;
+ for (ClassNode anInterface : interfaces) {
+ if (anInterface.isUsingGenerics()) return true;
}
}
@@ -347,8 +345,8 @@ public class BytecodeHelper implements Opcodes {
GenericsType extendsPart = new GenericsType(node.getUnresolvedSuperClass(false));
writeGenericsBounds(ret, extendsPart, true);
ClassNode[] interfaces = node.getInterfaces();
- for (int i = 0; i < interfaces.length; i++) {
- GenericsType interfacePart = new GenericsType(interfaces[i]);
+ for (ClassNode anInterface : interfaces) {
+ GenericsType interfacePart = new GenericsType(anInterface);
writeGenericsBounds(ret, interfacePart, false);
}
return ret.toString();
@@ -357,11 +355,11 @@ public class BytecodeHelper implements Opcodes {
private static void getGenericsTypeSpec(StringBuilder ret, GenericsType[] genericsTypes) {
if (genericsTypes == null) return;
ret.append('<');
- for (int i = 0; i < genericsTypes.length; i++) {
- String name = genericsTypes[i].getName();
+ for (GenericsType genericsType : genericsTypes) {
+ String name = genericsType.getName();
ret.append(name);
ret.append(':');
- writeGenericsBounds(ret, genericsTypes[i], true);
+ writeGenericsBounds(ret, genericsType, true);
}
ret.append('>');
}
@@ -397,8 +395,8 @@ public class BytecodeHelper implements Opcodes {
private static void writeGenericsBounds(StringBuilder ret, GenericsType type, boolean writeInterfaceMarker) {
if (type.getUpperBounds() != null) {
ClassNode[] bounds = type.getUpperBounds();
- for (int i = 0; i < bounds.length; i++) {
- writeGenericsBoundType(ret, bounds[i], writeInterfaceMarker);
+ for (ClassNode bound : bounds) {
+ writeGenericsBoundType(ret, bound, writeInterfaceMarker);
}
} else if (type.getLowerBound() != null) {
writeGenericsBoundType(ret, type.getLowerBound(), writeInterfaceMarker);
@@ -410,29 +408,28 @@ public class BytecodeHelper implements Opcodes {
private static void addSubTypes(StringBuilder ret, GenericsType[] types, String start, String end) {
if (types == null) return;
ret.append(start);
- for (int i = 0; i < types.length; i++) {
- if (types[i].getType().isArray()) {
+ for (GenericsType type : types) {
+ if (type.getType().isArray()) {
ret.append("[");
- addSubTypes(ret, new GenericsType[]{new GenericsType(types[i].getType().getComponentType())}, "", "");
- }
- else {
- if (types[i].isPlaceholder()) {
+ addSubTypes(ret, new GenericsType[]{new GenericsType(type.getType().getComponentType())}, "", "");
+ } else {
+ if (type.isPlaceholder()) {
ret.append('T');
- String name = types[i].getName();
+ String name = type.getName();
ret.append(name);
ret.append(';');
- } else if (types[i].isWildcard()) {
- if (types[i].getUpperBounds() != null) {
+ } else if (type.isWildcard()) {
+ if (type.getUpperBounds() != null) {
ret.append('+');
- writeGenericsBounds(ret, types[i], false);
- } else if (types[i].getLowerBound() != null) {
+ writeGenericsBounds(ret, type, false);
+ } else if (type.getLowerBound() != null) {
ret.append('-');
- writeGenericsBounds(ret, types[i], false);
+ writeGenericsBounds(ret, type, false);
} else {
ret.append('*');
}
} else {
- writeGenericsBounds(ret, types[i], false);
+ writeGenericsBounds(ret, type, false);
}
}
}
@@ -568,7 +565,7 @@ public class BytecodeHelper implements Opcodes {
public static boolean isSameCompilationUnit(ClassNode a, ClassNode b) {
CompileUnit cu1 = a.getCompileUnit();
CompileUnit cu2 = b.getCompileUnit();
- return cu1 !=null && cu2 !=null && cu1==cu2;
+ return cu1 != null && cu1 == cu2;
}
/**
@@ -580,8 +577,8 @@ public class BytecodeHelper implements Opcodes {
public static int hashCode(String str) {
final char[] chars = str.toCharArray();
int h = 0;
- for (int i = 0; i < chars.length; i++) {
- h = 31 * h + chars[i];
+ for (char aChar : chars) {
+ h = 31 * h + aChar;
}
return h;
}