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
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/EvalUtilsTest.java b/src/test/java/com/google/devtools/build/lib/syntax/EvalUtilsTest.java
index 9445ace..bf9672e 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/EvalUtilsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/EvalUtilsTest.java
@@ -68,7 +68,7 @@
assertEquals("List", EvalUtils.getDataTypeName(makeList(1, 2, 3)));
assertEquals("dict", EvalUtils.getDataTypeName(makeDict()));
assertEquals("FilesetEntry", EvalUtils.getDataTypeName(makeFilesetEntry()));
- assertEquals("NoneType", EvalUtils.getDataTypeName(Environment.NONE));
+ assertEquals("NoneType", EvalUtils.getDataTypeName(Runtime.NONE));
}
@Test
@@ -91,7 +91,7 @@
map.put(-1, 2);
map.put("4", 6);
map.put(2.0, 1);
- map.put(Environment.NONE, 0);
+ map.put(Runtime.NONE, 0);
int expected = 0;
// Expected order of keys is NoneType -> Double -> Integers -> Strings
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java
index 6b107a1..cf23858 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java
@@ -48,15 +48,14 @@
*/
protected ModalTestCase newTest() {
return new BuildTest();
-
}
@Test
public void testExprs() throws Exception {
newTest()
- .testStatement("'%sx' % 'foo' + 'bar'", "fooxbar")
- .testStatement("('%sx' % 'foo') + 'bar'", "fooxbar")
- .testStatement("'%sx' % ('foo' + 'bar')", "foobarx")
+ .testStatement("'%sx' % 'foo' + 'bar1'", "fooxbar1")
+ .testStatement("('%sx' % 'foo') + 'bar2'", "fooxbar2")
+ .testStatement("'%sx' % ('foo' + 'bar3')", "foobar3x")
.testStatement("123 + 456", 579)
.testStatement("456 - 123", 333)
.testStatement("8 % 3", 2)
@@ -90,10 +89,10 @@
.testStatement("0 or 0 and 3", 0)
.testStatement("1 or 0 and 3", 1)
- .testStatement("None and 1", Environment.NONE)
+ .testStatement("None and 1", Runtime.NONE)
.testStatement("\"\" or 9", 9)
.testStatement("\"abc\" or 9", "abc")
-
+
// check that 'foo' is not evaluated
.testStatement("8 or foo", 8)
.testStatement("0 and foo", 0);
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/FunctionTest.java b/src/test/java/com/google/devtools/build/lib/syntax/FunctionTest.java
index 2b8547c..ade0bbf 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/FunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/FunctionTest.java
@@ -71,7 +71,7 @@
public Object call(List<Object> args, Map<String, Object> kwargs, FuncallExpression ast,
Environment env) throws EvalException, InterruptedException {
params.addAll(args);
- return Environment.NONE;
+ return Runtime.NONE;
}
};
update("outer_func", outerFunc);
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/MethodLibraryTest.java b/src/test/java/com/google/devtools/build/lib/syntax/MethodLibraryTest.java
index 36db735..309b97b 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/MethodLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/MethodLibraryTest.java
@@ -744,10 +744,10 @@
public void testDictionaryGet() throws Exception {
new BuildTest()
.testStatement("{1: 'foo'}.get(1)", "foo")
- .testStatement("{1: 'foo'}.get(2)", Environment.NONE)
+ .testStatement("{1: 'foo'}.get(2)", Runtime.NONE)
.testStatement("{1: 'foo'}.get(2, 'a')", "a")
.testStatement("{1: 'foo'}.get(2, default='a')", "a")
- .testStatement("{1: 'foo'}.get(2, default=None)", Environment.NONE);
+ .testStatement("{1: 'foo'}.get(2, default=None)", Runtime.NONE);
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/PrinterTest.java b/src/test/java/com/google/devtools/build/lib/syntax/PrinterTest.java
index 97bae06..21c1de1 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/PrinterTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/PrinterTest.java
@@ -69,7 +69,7 @@
assertEquals("\"\\\"\"", Printer.repr("\""));
assertEquals("3", Printer.str(3));
assertEquals("3", Printer.repr(3));
- assertEquals("None", Printer.repr(Environment.NONE));
+ assertEquals("None", Printer.repr(Runtime.NONE));
assertEquals("//x:x", Printer.str(Label.parseAbsolute("//x")));
assertEquals("\"//x:x\"", Printer.repr(Label.parseAbsolute("//x")));
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
index c9e9a65..504ec65 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
@@ -638,7 +638,7 @@
new SkylarkTest()
.update("mock", new Mock())
.setUp("v = mock.nullfunc_working()")
- .testLookup("v", Environment.NONE);
+ .testLookup("v", Runtime.NONE);
}
@Test
@@ -646,7 +646,7 @@
new SkylarkTest()
.update("mock", new Mock())
.setUp("v = mock.voidfunc()")
- .testLookup("v", Environment.NONE);
+ .testLookup("v", Runtime.NONE);
}
@Test
@@ -848,7 +848,7 @@
new SkylarkTest().setUp("a = None",
"b = True",
"c = False")
- .testLookup("a", Environment.NONE)
+ .testLookup("a", Runtime.NONE)
.testLookup("b", Boolean.TRUE)
.testLookup("c", Boolean.FALSE);
}
