commit 5e00ec6f285d0445fc2fad6aede4509cf7d63263
author Francois-Rene Rideau <tunes@google.com> Tue Oct 20 17:02:19 2015 +0000
committer Han-Wen Nienhuys <hanwen@google.com> Wed Oct 21 14:34:52 2015 +0000
tree ab56a2c1f045a2e98df71ff32f29d55f6fa4eae5
parent a58db9b6ecdfdb32abd3a7e90c290d6269cfb543

Check invalid empty dict attributes

In checkAttrValNonEmpty, also check dict values for emptiness
when the attribute was declared non-empty.

--
MOS_MIGRATED_REVID=105871620

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

diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
index 6551730..797aeb9 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
@@ -1351,20 +1351,24 @@
 
   private void checkAttrValNonEmpty(
       Rule rule, EventHandler eventHandler, Object attributeValue, Integer attrIndex) {
-    List<?> list;
 
-    if (attributeValue instanceof SkylarkList) {
-      list = ((SkylarkList) attributeValue).getList();
-    } else if (attributeValue instanceof List<?>) {
-      list = (List<?>) attributeValue;
-    } else {
-      // TODO(bazel-team): Test maps, not just lists, as being non-empty.
+    Attribute attr = getAttribute(attrIndex);
+    if (!attr.isNonEmpty()) {
       return;
     }
 
-    Attribute attr = getAttribute(attrIndex);
-    if (attr.isNonEmpty() && list.isEmpty()) {
-      rule.reportError(rule.getLabel() + ": non empty " + "attribute '" + attr.getName()
+    boolean isEmpty = false;
+
+    if (attributeValue instanceof SkylarkList) {
+      isEmpty = ((SkylarkList) attributeValue).isEmpty();
+    } else if (attributeValue instanceof List<?>) {
+      isEmpty = ((List<?>) attributeValue).isEmpty();
+    } else if (attributeValue instanceof Map<?, ?>) {
+      isEmpty = ((Map<?, ?>) attributeValue).isEmpty();
+    }
+
+    if (isEmpty) {
+      rule.reportError(rule.getLabel() + ": non empty attribute '" + attr.getName()
           + "' in '" + name + "' rule '" + rule.getLabel() + "' has to have at least one value",
           eventHandler);
     }