commit 0f7ba34748579faea70e42dfdf60a9625a88f425
author Francois-Rene Rideau <tunes@google.com> Mon Aug 31 16:16:21 2015 +0000
committer Kristina Chodorow <kchodorow@google.com> Mon Aug 31 19:21:24 2015 +0000
tree 3f67a3c68e08f0a2dcfcf13b5d31b411dc97a70f
parent 6c29d57b6ddef8a6e7ac39b09e9338f616e78e4d

Move global objects to Runtime

Move away global constants and global namespaces out of Environment
and into a new file Runtime.

--
MOS_MIGRATED_REVID=101940218

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

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java b/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java
index 73e8d10..e09dc2a 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java
@@ -317,11 +317,11 @@
       method.setAccessible(true);
       Object result = method.invoke(obj, args);
       if (method.getReturnType().equals(Void.TYPE)) {
-        return Environment.NONE;
+        return Runtime.NONE;
       }
       if (result == null) {
         if (methodDescriptor.getAnnotation().allowReturnNones()) {
-          return Environment.NONE;
+          return Runtime.NONE;
         } else {
           throw new EvalException(loc,
               "Method invocation returned None, please contact Skylark developers: " + methodName
@@ -507,7 +507,7 @@
     // MethodLibrary.
     // For other classes, we can call the Java methods.
     BaseFunction function =
-        env.getFunction(EvalUtils.getSkylarkType(objValue.getClass()), func.getName());
+        Runtime.getFunction(EvalUtils.getSkylarkType(objValue.getClass()), func.getName());
     if (function != null) {
       if (!isNamespace(objValue.getClass())) {
         // Add self as an implicit parameter in front.