[KeepAnno] Rename KeepMembersPattern to KeepMemberPattern.
Bug: b/248408342
Change-Id: I0f6000a9c20e6e3a03e3c39adcc11c89b3b0b4fc
diff --git a/src/keepanno/java/com/android/tools/r8/keepanno/asm/KeepEdgeReader.java b/src/keepanno/java/com/android/tools/r8/keepanno/asm/KeepEdgeReader.java
index 37c4087..029ec75 100644
--- a/src/keepanno/java/com/android/tools/r8/keepanno/asm/KeepEdgeReader.java
+++ b/src/keepanno/java/com/android/tools/r8/keepanno/asm/KeepEdgeReader.java
@@ -168,7 +168,7 @@
itemBuilder.setClassPattern(classNamePattern);
}
if (methodName != null) {
- itemBuilder.setMembersPattern(
+ itemBuilder.setMemberPattern(
KeepMethodPattern.builder().setNamePattern(methodName).build());
}
KeepTarget target = KeepTarget.builder().setItem(itemBuilder.build()).build();
diff --git a/src/keepanno/java/com/android/tools/r8/keepanno/asm/KeepEdgeWriter.java b/src/keepanno/java/com/android/tools/r8/keepanno/asm/KeepEdgeWriter.java
index 0e96364..15af2fa 100644
--- a/src/keepanno/java/com/android/tools/r8/keepanno/asm/KeepEdgeWriter.java
+++ b/src/keepanno/java/com/android/tools/r8/keepanno/asm/KeepEdgeWriter.java
@@ -8,7 +8,7 @@
import com.android.tools.r8.keepanno.ast.KeepConsequences;
import com.android.tools.r8.keepanno.ast.KeepEdge;
import com.android.tools.r8.keepanno.ast.KeepItemPattern;
-import com.android.tools.r8.keepanno.ast.KeepMembersPattern;
+import com.android.tools.r8.keepanno.ast.KeepMemberPattern;
import com.android.tools.r8.keepanno.ast.KeepMethodNamePattern.KeepMethodNameExactPattern;
import com.android.tools.r8.keepanno.ast.KeepMethodPattern;
import com.android.tools.r8.keepanno.ast.KeepPreconditions;
@@ -70,21 +70,21 @@
if (!item.getExtendsPattern().isAny()) {
throw new Unimplemented();
}
- writeMembers(item.getMembersPattern(), targetVisitor);
+ writeMember(item.getMemberPattern(), targetVisitor);
targetVisitor.visitEnd();
});
arrayVisitor.visitEnd();
}
- private void writeMembers(KeepMembersPattern membersPattern, AnnotationVisitor targetVisitor) {
- if (membersPattern.isNone()) {
+ private void writeMember(KeepMemberPattern memberPattern, AnnotationVisitor targetVisitor) {
+ if (memberPattern.isNone()) {
// Default is "no methods".
return;
}
- if (membersPattern.isAll()) {
+ if (memberPattern.isAll()) {
throw new Unimplemented();
}
- KeepMethodPattern method = membersPattern.asMethod();
+ KeepMethodPattern method = memberPattern.asMethod();
KeepMethodNameExactPattern exactMethodName = method.getNamePattern().asExact();
if (exactMethodName != null) {
targetVisitor.visit(Target.methodName, exactMethodName.getName());
diff --git a/src/keepanno/java/com/android/tools/r8/keepanno/ast/KeepEdge.java b/src/keepanno/java/com/android/tools/r8/keepanno/ast/KeepEdge.java
index 01d2ada..89be76b 100644
--- a/src/keepanno/java/com/android/tools/r8/keepanno/ast/KeepEdge.java
+++ b/src/keepanno/java/com/android/tools/r8/keepanno/ast/KeepEdge.java
@@ -31,7 +31,7 @@
*
* ITEM_PATTERN
* ::= any
- * | class QUALIFIED_CLASS_NAME_PATTERN extends EXTENDS_PATTERN { MEMBERS_PATTERN }
+ * | class QUALIFIED_CLASS_NAME_PATTERN extends EXTENDS_PATTERN { MEMBER_PATTERN }
*
* TYPE_PATTERN ::= any
* PACKAGE_PATTERN ::= any | exact package-name
@@ -39,7 +39,7 @@
* UNQUALIFIED_CLASS_NAME_PATTERN ::= any | exact simple-class-name
* EXTENDS_PATTERN ::= any | QUALIFIED_CLASS_NAME_PATTERN
*
- * MEMBERS_PATTERN ::= none | all | METHOD_PATTERN
+ * MEMBER_PATTERN ::= none | all | METHOD_PATTERN
*
* METHOD_PATTERN
* ::= METHOD_ACCESS_PATTERN
diff --git a/src/keepanno/java/com/android/tools/r8/keepanno/ast/KeepItemPattern.java b/src/keepanno/java/com/android/tools/r8/keepanno/ast/KeepItemPattern.java
index 68c5c17..50d3921 100644
--- a/src/keepanno/java/com/android/tools/r8/keepanno/ast/KeepItemPattern.java
+++ b/src/keepanno/java/com/android/tools/r8/keepanno/ast/KeepItemPattern.java
@@ -31,14 +31,14 @@
private KeepQualifiedClassNamePattern classNamePattern;
private KeepExtendsPattern extendsPattern = KeepExtendsPattern.any();
- private KeepMembersPattern membersPattern = KeepMembersPattern.none();
+ private KeepMemberPattern memberPattern = KeepMemberPattern.none();
private Builder() {}
public Builder any() {
classNamePattern = KeepQualifiedClassNamePattern.any();
extendsPattern = KeepExtendsPattern.any();
- membersPattern = KeepMembersPattern.all();
+ memberPattern = KeepMemberPattern.all();
return this;
}
@@ -52,8 +52,8 @@
return this;
}
- public Builder setMembersPattern(KeepMembersPattern membersPattern) {
- this.membersPattern = membersPattern;
+ public Builder setMemberPattern(KeepMemberPattern memberPattern) {
+ this.memberPattern = memberPattern;
return this;
}
@@ -61,29 +61,29 @@
if (classNamePattern == null) {
throw new KeepEdgeException("Class pattern must define a class name pattern.");
}
- return new KeepItemPattern(classNamePattern, extendsPattern, membersPattern);
+ return new KeepItemPattern(classNamePattern, extendsPattern, memberPattern);
}
}
private final KeepQualifiedClassNamePattern qualifiedClassPattern;
private final KeepExtendsPattern extendsPattern;
- private final KeepMembersPattern membersPattern;
+ private final KeepMemberPattern memberPattern;
// TODO: class annotations
private KeepItemPattern(
KeepQualifiedClassNamePattern qualifiedClassPattern,
KeepExtendsPattern extendsPattern,
- KeepMembersPattern membersPattern) {
+ KeepMemberPattern memberPattern) {
assert qualifiedClassPattern != null;
assert extendsPattern != null;
- assert membersPattern != null;
+ assert memberPattern != null;
this.qualifiedClassPattern = qualifiedClassPattern;
this.extendsPattern = extendsPattern;
- this.membersPattern = membersPattern;
+ this.memberPattern = memberPattern;
}
public boolean isAny() {
- return qualifiedClassPattern.isAny() && extendsPattern.isAny() && membersPattern.isAll();
+ return qualifiedClassPattern.isAny() && extendsPattern.isAny() && memberPattern.isAll();
}
public KeepQualifiedClassNamePattern getClassNamePattern() {
@@ -94,8 +94,8 @@
return extendsPattern;
}
- public KeepMembersPattern getMembersPattern() {
- return membersPattern;
+ public KeepMemberPattern getMemberPattern() {
+ return memberPattern;
}
@Override
@@ -109,12 +109,12 @@
KeepItemPattern that = (KeepItemPattern) obj;
return qualifiedClassPattern.equals(that.qualifiedClassPattern)
&& extendsPattern.equals(that.extendsPattern)
- && membersPattern.equals(that.membersPattern);
+ && memberPattern.equals(that.memberPattern);
}
@Override
public int hashCode() {
- return Objects.hash(qualifiedClassPattern, extendsPattern, membersPattern);
+ return Objects.hash(qualifiedClassPattern, extendsPattern, memberPattern);
}
@Override
@@ -124,8 +124,8 @@
+ qualifiedClassPattern
+ ", extendsPattern="
+ extendsPattern
- + ", membersPattern="
- + membersPattern
+ + ", memberPattern="
+ + memberPattern
+ '}';
}
}
diff --git a/src/keepanno/java/com/android/tools/r8/keepanno/ast/KeepMembersPattern.java b/src/keepanno/java/com/android/tools/r8/keepanno/ast/KeepMemberPattern.java
similarity index 84%
rename from src/keepanno/java/com/android/tools/r8/keepanno/ast/KeepMembersPattern.java
rename to src/keepanno/java/com/android/tools/r8/keepanno/ast/KeepMemberPattern.java
index 64e1b25..25a57ab 100644
--- a/src/keepanno/java/com/android/tools/r8/keepanno/ast/KeepMembersPattern.java
+++ b/src/keepanno/java/com/android/tools/r8/keepanno/ast/KeepMemberPattern.java
@@ -3,18 +3,17 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.keepanno.ast;
+public abstract class KeepMemberPattern {
-public abstract class KeepMembersPattern {
-
- public static KeepMembersPattern none() {
+ public static KeepMemberPattern none() {
return None.getInstance();
}
- public static KeepMembersPattern all() {
+ public static KeepMemberPattern all() {
return All.getInstance();
}
- private static class All extends KeepMembersPattern {
+ private static class All extends KeepMemberPattern {
private static final All INSTANCE = new All();
@@ -43,7 +42,7 @@
}
}
- private static class None extends KeepMembersPattern {
+ private static class None extends KeepMemberPattern {
private static final None INSTANCE = new None();
@@ -72,7 +71,7 @@
}
}
- KeepMembersPattern() {}
+ KeepMemberPattern() {}
public boolean isAll() {
return false;
diff --git a/src/keepanno/java/com/android/tools/r8/keepanno/ast/KeepMethodPattern.java b/src/keepanno/java/com/android/tools/r8/keepanno/ast/KeepMethodPattern.java
index bec8102..ffcf3bd 100644
--- a/src/keepanno/java/com/android/tools/r8/keepanno/ast/KeepMethodPattern.java
+++ b/src/keepanno/java/com/android/tools/r8/keepanno/ast/KeepMethodPattern.java
@@ -5,7 +5,7 @@
import java.util.Objects;
-public final class KeepMethodPattern extends KeepMembersPattern {
+public final class KeepMethodPattern extends KeepMemberPattern {
public static Builder builder() {
return new Builder();
diff --git a/src/keepanno/java/com/android/tools/r8/keepanno/keeprules/KeepRuleExtractor.java b/src/keepanno/java/com/android/tools/r8/keepanno/keeprules/KeepRuleExtractor.java
index 3ab882f..1a9fc52 100644
--- a/src/keepanno/java/com/android/tools/r8/keepanno/keeprules/KeepRuleExtractor.java
+++ b/src/keepanno/java/com/android/tools/r8/keepanno/keeprules/KeepRuleExtractor.java
@@ -6,7 +6,7 @@
import com.android.tools.r8.keepanno.ast.KeepConsequences;
import com.android.tools.r8.keepanno.ast.KeepEdge;
import com.android.tools.r8.keepanno.ast.KeepItemPattern;
-import com.android.tools.r8.keepanno.ast.KeepMembersPattern;
+import com.android.tools.r8.keepanno.ast.KeepMemberPattern;
import com.android.tools.r8.keepanno.ast.KeepMethodAccessPattern;
import com.android.tools.r8.keepanno.ast.KeepMethodNamePattern;
import com.android.tools.r8.keepanno.ast.KeepMethodParametersPattern;
@@ -102,16 +102,16 @@
if (!clazzPattern.getExtendsPattern().isAny()) {
throw new Unimplemented();
}
- KeepMembersPattern members = clazzPattern.getMembersPattern();
- if (members.isNone()) {
+ KeepMemberPattern member = clazzPattern.getMemberPattern();
+ if (member.isNone()) {
return builder;
}
- if (members.isAll()) {
+ if (member.isAll()) {
return builder.append(" { *; }");
}
- if (members.isMethod()) {
+ if (member.isMethod()) {
builder.append(" {");
- printMethod(builder.append(' '), members.asMethod());
+ printMethod(builder.append(' '), member.asMethod());
return builder.append(" }");
}
throw new Unimplemented();
@@ -232,7 +232,7 @@
public boolean isMemberOnlyConsequent() {
KeepItemPattern item = target.getItem();
- return !item.isAny() && !item.getMembersPattern().isNone();
+ return !item.isAny() && !item.getMemberPattern().isNone();
}
public KeepQualifiedClassNamePattern getHolderPattern() {
diff --git a/src/keepanno/java/com/android/tools/r8/keepanno/processor/KeepEdgeProcessor.java b/src/keepanno/java/com/android/tools/r8/keepanno/processor/KeepEdgeProcessor.java
index 58601a6..3455ac8 100644
--- a/src/keepanno/java/com/android/tools/r8/keepanno/processor/KeepEdgeProcessor.java
+++ b/src/keepanno/java/com/android/tools/r8/keepanno/processor/KeepEdgeProcessor.java
@@ -135,7 +135,7 @@
AnnotationValue methodNameValue = getAnnotationValue(mirror, Target.methodName);
if (methodNameValue != null) {
String methodName = AnnotationStringValueVisitor.getString(methodNameValue);
- itemBuilder.setMembersPattern(
+ itemBuilder.setMemberPattern(
KeepMethodPattern.builder()
.setNamePattern(KeepMethodNamePattern.exact(methodName))
.build());
diff --git a/src/test/java/com/android/tools/r8/keepanno/ast/KeepEdgeAstTest.java b/src/test/java/com/android/tools/r8/keepanno/ast/KeepEdgeAstTest.java
index 0f07d76..d9a6eaf 100644
--- a/src/test/java/com/android/tools/r8/keepanno/ast/KeepEdgeAstTest.java
+++ b/src/test/java/com/android/tools/r8/keepanno/ast/KeepEdgeAstTest.java
@@ -109,7 +109,7 @@
.addTarget(
target(
buildClassItem(CLASS)
- .setMembersPattern(defaultInitializerPattern())
+ .setMemberPattern(defaultInitializerPattern())
.build()))
.build())
.build();
@@ -146,7 +146,7 @@
.addTarget(
target(
buildClassItem(CLASS)
- .setMembersPattern(defaultInitializerPattern())
+ .setMemberPattern(defaultInitializerPattern())
.build()))
.build())
.build();
@@ -169,7 +169,7 @@
return KeepItemPattern.builder().setClassPattern(KeepQualifiedClassNamePattern.exact(typeName));
}
- private KeepMembersPattern defaultInitializerPattern() {
+ private KeepMemberPattern defaultInitializerPattern() {
return KeepMethodPattern.builder()
.setNamePattern(KeepMethodNamePattern.initializer())
.setParametersPattern(KeepMethodParametersPattern.none())
diff --git a/src/test/java/com/android/tools/r8/keepanno/testsource/KeepSourceEdges.java b/src/test/java/com/android/tools/r8/keepanno/testsource/KeepSourceEdges.java
index b6369de..03b63c6 100644
--- a/src/test/java/com/android/tools/r8/keepanno/testsource/KeepSourceEdges.java
+++ b/src/test/java/com/android/tools/r8/keepanno/testsource/KeepSourceEdges.java
@@ -37,10 +37,7 @@
KeepMethodPattern constructorMethod =
KeepMethodPattern.builder().setNamePattern(KeepMethodNamePattern.exact("<init>")).build();
KeepItemPattern constructorItem =
- KeepItemPattern.builder()
- .setClassPattern(name)
- .setMembersPattern(constructorMethod)
- .build();
+ KeepItemPattern.builder().setClassPattern(name).setMemberPattern(constructorMethod).build();
KeepTarget constructorTarget = KeepTarget.builder().setItem(constructorItem).build();
// The consequet set is the class an its constructor.
KeepConsequences consequences =
