aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/skylark
diff options
context:
space:
mode:
authorGravatar Laurent Le Brun <laurentlb@google.com>2016-11-28 18:14:54 +0000
committerGravatar Irina Iancu <elenairina@google.com>2016-11-29 08:06:51 +0000
commita6d8fe494f4736ab2359e6ccbda3e26a8507c99b (patch)
tree1afefde0afbe65f760905d3b459bba7b85b0fa07 /src/main/java/com/google/devtools/skylark
parentdf12c925be1f9cb2469a8731f53dd369394be443 (diff)
Remove isSkylark and eval from Environment.
-- MOS_MIGRATED_REVID=140371603
Diffstat (limited to 'src/main/java/com/google/devtools/skylark')
-rw-r--r--src/main/java/com/google/devtools/skylark/Skylark.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/skylark/Skylark.java b/src/main/java/com/google/devtools/skylark/Skylark.java
index 12f9a16cc5..c0c0e69824 100644
--- a/src/main/java/com/google/devtools/skylark/Skylark.java
+++ b/src/main/java/com/google/devtools/skylark/Skylark.java
@@ -15,6 +15,7 @@ package com.google.devtools.skylark;
import com.google.devtools.build.lib.events.Event;
import com.google.devtools.build.lib.events.EventHandler;
+import com.google.devtools.build.lib.syntax.BuildFileAST;
import com.google.devtools.build.lib.syntax.Environment;
import com.google.devtools.build.lib.syntax.Mutability;
import com.google.devtools.build.lib.syntax.Printer;
@@ -44,7 +45,6 @@ class Skylark {
private final Mutability mutability = Mutability.create("interpreter");
private final Environment env =
Environment.builder(mutability)
- .setSkylark()
.setGlobals(Environment.DEFAULT_GLOBALS)
.setEventHandler(PRINT_HANDLER)
.build();
@@ -74,7 +74,7 @@ class Skylark {
String input;
while ((input = prompt()) != null) {
try {
- Object result = env.eval(input);
+ Object result = BuildFileAST.eval(env, input);
if (result != null) {
System.out.println(Printer.repr(result));
}
@@ -86,7 +86,7 @@ class Skylark {
public static void main(String[] args) {
if (args.length == 0) {
- new Skylark().readEvalPrintLoop();
+ new Skylark().readEvalPrintLoop();
} else {
System.err.println("no argument expected");
System.exit(1);