diff options
author | 2015-05-27 19:15:53 +0000 | |
---|---|---|
committer | 2015-05-28 06:29:46 +0000 | |
commit | 2a601f994ead64e78d5e101011f3f08f57cae49e (patch) | |
tree | 6869152c52fe7abc099ec45cac5540ee392c05dc /src/main/java/com | |
parent | b6afdbd4d967150be8ac93f2774111ce080ba724 (diff) |
Even more select concatenation: this time when a glob is *in*
the select.
--
MOS_MIGRATED_REVID=94596318
Diffstat (limited to 'src/main/java/com')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/syntax/SelectorList.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SelectorList.java b/src/main/java/com/google/devtools/build/lib/syntax/SelectorList.java index 21b4a3514e..f77f8d7fe9 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/SelectorList.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/SelectorList.java @@ -97,9 +97,6 @@ public final class SelectorList { } else if (value instanceof SelectorValue) { builder.add(value); return ((SelectorValue) value).getType(); - } else if (value instanceof GlobList) { - builder.add(((GlobList<?>) value).delegate()); - return NATIVE_LIST_TYPE; } else { builder.add(value); return value.getClass(); @@ -107,7 +104,9 @@ public final class SelectorList { } private static boolean isListType(Class<?> type) { - return type == NATIVE_LIST_TYPE || type.getSuperclass() == SkylarkList.class; + return type == NATIVE_LIST_TYPE + || type.getSuperclass() == SkylarkList.class + || type == GlobList.class; } private static boolean canConcatenate(Class<?> type1, Class<?> type2) { |