commit ba40525a033d4170534abb47d200fce7fe637527
author Florian Weikert <fwe@google.com> Mon Jan 30 14:42:50 2017 +0000
committer Yun Peng <pcloudy@google.com> Mon Jan 30 15:35:42 2017 +0000
tree 56341b92423cfeec3ce0d403de243fb5a4bdaf95
parent 855fbe9ee447b7b37fd8c73dbc047d69b7ceffcf

Fix the translation of names of implicit or latebound attributes to their Skylark equivalent (from '$attr' and ':attr' to '_attr').

This CL eliminates duplicate code and makes sure that attribute names in SkylarkClassObjects are properly translated.

--
PiperOrigin-RevId: 145986380
MOS_MIGRATED_REVID=145986380

src/main/java/com/google/devtools/build/lib/packages/Attribute.java

diff --git a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
index 420e6b8..389c2d0 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
@@ -1084,7 +1084,7 @@
       // do not modify this.allowedFileTypesForLabels, instead create a copy.
       FileTypeSet allowedFileTypesForLabels = this.allowedFileTypesForLabels;
       if ((type == BuildType.LABEL) || (type == BuildType.LABEL_LIST)) {
-        if ((name.startsWith("$") || name.startsWith(":")) && allowedFileTypesForLabels == null) {
+        if (isPrivateAttribute(name) && allowedFileTypesForLabels == null) {
           allowedFileTypesForLabels = FileTypeSet.ANY_FILE;
         }
         Preconditions.checkNotNull(
@@ -1391,7 +1391,7 @@
       final String msg =
           String.format(
               "Cannot compute default value of attribute '%s' in rule '%s': ",
-              attr.getName().replace('$', '_'), rule.getLabel());
+              attr.getPublicName(), rule.getLabel());
       final AtomicReference<EvalException> caughtEvalExceptionIfAny = new AtomicReference<>();
       ComputationStrategy<InterruptedException> strategy =
           new ComputationStrategy<InterruptedException>() {
@@ -1813,12 +1813,7 @@
    * Implicit and late-bound attributes start with '_' (instead of '$' or ':').
    */
   public String getPublicName() {
-    String name = getName();
-    // latebound and implicit attributes have a one-character prefix we want to drop
-    if (isLateBound() || isImplicit()) {
-      return "_" + name.substring(1);
-    }
-    return name;
+    return getSkylarkName(getName());
   }
 
   /**
@@ -2130,6 +2125,23 @@
     return name.startsWith(":");
   }
 
+  /** Returns whether this attribute is considered private in Skylark. */
+  private static boolean isPrivateAttribute(String nativeAttrName) {
+    return isLateBound(nativeAttrName) || isImplicit(nativeAttrName);
+  }
+
+  /**
+   * Returns the Skylark-usable name of this attribute.
+   *
+   * Implicit and late-bound attributes start with '_' (instead of '$' or ':').
+   */
+  public static String getSkylarkName(String nativeAttrName) {
+    if (isPrivateAttribute(nativeAttrName)) {
+      return "_" + nativeAttrName.substring(1);
+    }
+    return nativeAttrName;
+  }
+
   @Override
   public String toString() {
     return "Attribute(" + name + ", " + type + ")";