From 2a601f994ead64e78d5e101011f3f08f57cae49e Mon Sep 17 00:00:00 2001 From: Greg Estren Date: Wed, 27 May 2015 19:15:53 +0000 Subject: Even more select concatenation: this time when a glob is *in* the select. -- MOS_MIGRATED_REVID=94596318 --- .../java/com/google/devtools/build/lib/syntax/SelectorList.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/main/java/com') 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) { -- cgit v1.2.3