diff options
author | cparsons <cparsons@google.com> | 2018-06-22 15:12:00 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-06-22 15:13:51 -0700 |
commit | 88d1caeef07533429468515f63b3d4e2cb9a7a80 (patch) | |
tree | ae554a10e8f4ba4b88b36216fca01b11bea740ab /src/main/java/com/google/devtools/build/lib/syntax | |
parent | c8bd74f76c3e02657571432d2fe4d923803410be (diff) |
Make @SkylarkCallable.name mandatory.
RELNOTES: None.
PiperOrigin-RevId: 201748802
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/syntax')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java | 9 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/syntax/SkylarkSignatureProcessor.java | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java b/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java index bf43266b21..877b087ea6 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java @@ -36,7 +36,6 @@ import com.google.devtools.build.lib.syntax.EvalException.EvalExceptionWithJavaC import com.google.devtools.build.lib.syntax.Runtime.NoneType; import com.google.devtools.build.lib.syntax.SkylarkList.Tuple; import com.google.devtools.build.lib.util.Pair; -import com.google.devtools.build.lib.util.StringUtilities; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -132,9 +131,6 @@ public final class FuncallExpression extends Expression { continue; } String name = callable.name(); - if (name.isEmpty()) { - name = StringUtilities.toPythonStyleFunctionName(method.getName()); - } if (methodMap.containsKey(name)) { methodMap.get(name).add(new MethodDescriptor(method, callable)); } else { @@ -168,11 +164,6 @@ public final class FuncallExpression extends Expression { for (MethodDescriptor fieldMethod : fieldMethods) { SkylarkCallable callable = fieldMethod.getAnnotation(); String name = callable.name(); - if (name.isEmpty()) { - name = - StringUtilities.toPythonStyleFunctionName( - fieldMethod.getMethod().getName()); - } // TODO(b/72113542): Validate with annotation processor instead of at runtime. if (!fieldNamesForCollisions.add(name)) { throw new IllegalArgumentException( diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSignatureProcessor.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSignatureProcessor.java index 5d5094117d..f5311328f4 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSignatureProcessor.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSignatureProcessor.java @@ -51,7 +51,7 @@ public class SkylarkSignatureProcessor { SkylarkCallable annotation = descriptor.getAnnotation(); // TODO(cparsons): Validate these properties with the annotation processor instead. - Preconditions.checkArgument(annotation.name().isEmpty() || name.equals(annotation.name()), + Preconditions.checkArgument(name.equals(annotation.name()), "%s != %s", name, annotation.name()); boolean documented = annotation.documented(); if (annotation.doc().isEmpty() && documented) { |