commit ffa73addaf80ab7a9cf9f98e5d4414b152ae6cb6
author Lukacs Berki <lberki@google.com> Fri Sep 18 11:40:12 2015 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Mon Sep 21 08:56:51 2015 +0000
tree f498621bb8634d934815dbaddf90400eda0ce28d
parent 29ad862a5bd45d2fdbb921f36bbb95816cf47acc

Separate build-specific types and types inherent to Skylark.

--
MOS_MIGRATED_REVID=103374106

src/main/java/com/google/devtools/build/lib/rules/SkylarkAttr.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/SkylarkAttr.java b/src/main/java/com/google/devtools/build/lib/rules/SkylarkAttr.java
index e6d8f3c..c01bd34 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/SkylarkAttr.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/SkylarkAttr.java
@@ -21,8 +21,7 @@
 import com.google.devtools.build.lib.packages.Attribute.AllowedValueSet;
 import com.google.devtools.build.lib.packages.Attribute.ConfigurationTransition;
 import com.google.devtools.build.lib.packages.Attribute.SkylarkLateBound;
-import com.google.devtools.build.lib.packages.Type;
-import com.google.devtools.build.lib.packages.Type.ConversionException;
+import com.google.devtools.build.lib.packages.BuildType;
 import com.google.devtools.build.lib.syntax.BuiltinFunction;
 import com.google.devtools.build.lib.syntax.Environment;
 import com.google.devtools.build.lib.syntax.EvalException;
@@ -36,6 +35,8 @@
 import com.google.devtools.build.lib.syntax.SkylarkSignature;
 import com.google.devtools.build.lib.syntax.SkylarkSignature.Param;
 import com.google.devtools.build.lib.syntax.SkylarkSignatureProcessor;
+import com.google.devtools.build.lib.syntax.Type;
+import com.google.devtools.build.lib.syntax.Type.ConversionException;
 import com.google.devtools.build.lib.syntax.UserDefinedFunction;
 import com.google.devtools.build.lib.util.FileTypeSet;
 
@@ -155,7 +156,7 @@
         throw new EvalException(
             ast.getLocation(), "allow_files should be a boolean or a filetype object.");
       }
-    } else if (type.equals(Type.LABEL) || type.equals(Type.LABEL_LIST)) {
+    } else if (type.equals(BuildType.LABEL) || type.equals(BuildType.LABEL_LIST)) {
       builder.allowedFileTypes(FileTypeSet.NO_FILE);
     }
 
@@ -376,7 +377,7 @@
                   singleFile,
                   CONFIGURATION_ARG,
                   cfg),
-              Type.LABEL,
+              BuildType.LABEL,
               ast,
               env);
         }
@@ -556,7 +557,7 @@
                   nonEmpty,
                   CONFIGURATION_ARG,
                   cfg),
-              Type.LABEL_LIST,
+              BuildType.LABEL_LIST,
               ast,
               env);
         }
@@ -619,7 +620,7 @@
           env.checkLoadingPhase("attr.output", ast.getLocation());
           return createAttribute(
               EvalUtils.optionMap(DEFAULT_ARG, defaultO, MANDATORY_ARG, mandatory),
-              Type.OUTPUT,
+              BuildType.OUTPUT,
               ast,
               env);
         }
@@ -661,7 +662,7 @@
           return createAttribute(
               EvalUtils.optionMap(
                   DEFAULT_ARG, defaultList, MANDATORY_ARG, mandatory, NON_EMPTY_ARG, nonEmpty),
-              Type.OUTPUT_LIST,
+              BuildType.OUTPUT_LIST,
               ast,
               env);
         }
@@ -726,7 +727,7 @@
           env.checkLoadingPhase("attr.license", ast.getLocation());
           return createAttribute(
               EvalUtils.optionMap(DEFAULT_ARG, defaultO, MANDATORY_ARG, mandatory),
-              Type.LICENSE,
+              BuildType.LICENSE,
               ast,
               env);
         }