commit 981f65bf0a53239c8d5d55a1469c17721a12b2f4
author cparsons <cparsons@google.com> Mon Apr 23 12:04:09 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Mon Apr 23 12:05:19 2018 -0700
tree 097d8c6faea51729bac0e9aee95b2d38eacbcd07
parent a4852b5fbf09c40bfebfec6ed231ebeb11950194

Start refactoring elements of the Skylark Build API into their own package.

RELNOTES: None.
PiperOrigin-RevId: 193962460

src/main/java/com/google/devtools/build/lib/syntax/Runtime.java

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Runtime.java b/src/main/java/com/google/devtools/build/lib/syntax/Runtime.java
index c037db2..86f95b3 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Runtime.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Runtime.java
@@ -19,6 +19,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkGlobalLibrary;
+import com.google.devtools.build.lib.skylarkinterface.SkylarkInterfaceUtils;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkPrinter;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkSignature;
@@ -337,14 +338,19 @@
    *       callables.</li>
    * </ul>
    *
+   * <p>On collisions, this method throws an {@link AssertionError}. Collisions may occur if
+   * multiple global libraries have functions of the same name, two modules of the same name
+   * are given, or if two subclasses of the same module are given.
+   *
    * @param env the Environment into which to register fields.
    * @param moduleClass the Class object containing globals.
    */
   public static void setupModuleGlobals(Environment env, Class<?> moduleClass) {
     try {
-      if (moduleClass.isAnnotationPresent(SkylarkModule.class)) {
+      SkylarkModule skylarkModule = SkylarkInterfaceUtils.getSkylarkModule(moduleClass);
+      if (skylarkModule != null) {
         env.setup(
-            moduleClass.getAnnotation(SkylarkModule.class).name(),
+            skylarkModule.name(),
             moduleClass.getConstructor().newInstance());
       }
       for (Field field : moduleClass.getDeclaredFields()) {
@@ -362,7 +368,7 @@
           }
         }
       }
-      if (moduleClass.isAnnotationPresent(SkylarkGlobalLibrary.class)) {
+      if (SkylarkInterfaceUtils.hasSkylarkGlobalLibrary(moduleClass)) {
         Object moduleInstance = moduleClass.getConstructor().newInstance();
         for (String methodName : FuncallExpression.getMethodNames(moduleClass)) {
           env.setup(methodName, FuncallExpression.getBuiltinCallable(moduleInstance, methodName));