You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2018/07/13 06:18:57 UTC
groovy git commit: Trivial refactoring: remove unnecessary code
Repository: groovy
Updated Branches:
refs/heads/master 2c0ece2c9 -> 7353dc503
Trivial refactoring: remove unnecessary code
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/7353dc50
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/7353dc50
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/7353dc50
Branch: refs/heads/master
Commit: 7353dc503c5e2490ae24c69a984ec349d7e3ccd1
Parents: 2c0ece2
Author: sunlan <su...@apache.org>
Authored: Fri Jul 13 14:16:11 2018 +0800
Committer: sunlan <su...@apache.org>
Committed: Fri Jul 13 14:16:11 2018 +0800
----------------------------------------------------------------------
.../org/codehaus/groovy/control/ResolveVisitor.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/7353dc50/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java b/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
index 6087cd4..7853492 100644
--- a/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
+++ b/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
@@ -118,17 +118,20 @@ public class ResolveVisitor extends ClassCodeExpressionTransformer {
*/
private static class ConstructedNestedClass extends ClassNode {
final ClassNode knownEnclosingType;
+
public ConstructedNestedClass(ClassNode outer, String inner) {
- super(outer.getName()+"$"+(inner=replacePoints(inner)), Opcodes.ACC_PUBLIC,ClassHelper.OBJECT_TYPE);
+ super(outer.getName() + "$" + replacePoints(inner), Opcodes.ACC_PUBLIC, ClassHelper.OBJECT_TYPE);
this.knownEnclosingType = outer;
this.isPrimaryNode = false;
}
+
public boolean hasPackageName() {
- if (redirect()!=this) return super.hasPackageName();
+ if (redirect() != this) return super.hasPackageName();
return knownEnclosingType.hasPackageName();
}
+
public String setName(String name) {
- if (redirect()!=this) {
+ if (redirect() != this) {
return super.setName(name);
} else {
throw new GroovyBugError("ConstructedNestedClass#setName should not be called");
@@ -280,8 +283,7 @@ public class ResolveVisitor extends ClassCodeExpressionTransformer {
if (type instanceof ConstructedNestedClass) return false;
String name = type.getName();
String saved = name;
- while (true) {
- if (-1 == name.lastIndexOf('.')) break;
+ while (-1 != name.lastIndexOf('.')) {
name = replaceLastPointWithDollar(name);
type.setName(name);
if (resolve(type)) return true;
@@ -1142,8 +1144,7 @@ public class ResolveVisitor extends ClassCodeExpressionTransformer {
addError("You cannot create an instance from the abstract " + getDescription(type) + ".", cce);
}
- Expression ret = cce.transformExpression(this);
- return ret;
+ return cce.transformExpression(this);
}
private static String getDescription(ClassNode node) {
@@ -1407,7 +1408,6 @@ public class ResolveVisitor extends ClassCodeExpressionTransformer {
for(ClassNode intf : interfacesToCompare) {
checkCyclicInheritance(originalNode, null, intf.getInterfaces());
}
- } else {
}
}
}