commit 6f23b13fb27b5eecaaf624cb82dd85f9c1cd8f3b
author Laurent Le Brun <laurentlb@google.com> Fri Oct 07 12:31:59 2016 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Fri Oct 07 13:51:14 2016 +0000
tree 5ae3c82d79c435f3e252b115731798c54f1516cb
parent 0436ce0b1b21e8d44851008bd939a8a45e3aa985

Create directory for Standalone Skylark

Move the REPL Skylark there.

--
MOS_MIGRATED_REVID=135467316

src/main/java/com/google/devtools/skylark/Skylark.java

diff --git a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkShell.java b/src/main/java/com/google/devtools/skylark/Skylark.java
similarity index 72%
rename from src/test/java/com/google/devtools/build/lib/syntax/SkylarkShell.java
rename to src/main/java/com/google/devtools/skylark/Skylark.java
index 364db10..51053fb 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkShell.java
+++ b/src/main/java/com/google/devtools/skylark/Skylark.java
@@ -1,4 +1,4 @@
-// Copyright 2015 The Bazel Authors. All rights reserved.
+// Copyright 2016 The Bazel Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -11,10 +11,13 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.google.devtools.build.lib.syntax;
+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.Environment;
+import com.google.devtools.build.lib.syntax.Mutability;
+import com.google.devtools.build.lib.syntax.Printer;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -22,13 +25,11 @@
 import java.nio.charset.Charset;
 
 /**
- * SkylarkShell is a standalone shell executing Skylark. This is intended for
- * testing purposes and not for end-users. This is very limited (environment is
- * almost empty), but it can be used to play with the language and reproduce
- * bugs. Imports and includes are not supported.
+ * Skylark is a standalone skylark intepreter. The environment doesn't
+ * contain Bazel-specific functions and variables. Load statements are
+ * forbidden for the moment.
  */
-class SkylarkShell {
-
+class Skylark {
   private static final String START_PROMPT = ">> ";
   private static final String CONTINUATION_PROMPT = ".. ";
 
@@ -41,11 +42,11 @@
 
   private final BufferedReader reader = new BufferedReader(
       new InputStreamReader(System.in, Charset.defaultCharset()));
-  private final Mutability mutability = Mutability.create("shell");
+  private final Mutability mutability = Mutability.create("interpreter");
   private final Environment env = Environment.builder(mutability)
       .setSkylark().setGlobals(Environment.SKYLARK).setEventHandler(PRINT_HANDLER).build();
 
-  public String read() {
+  public String prompt() {
     StringBuilder input = new StringBuilder();
     System.out.print(START_PROMPT);
     try {
@@ -68,7 +69,7 @@
 
   public void readEvalPrintLoop() {
     String input;
-    while ((input = read()) != null) {
+    while ((input = prompt()) != null) {
       try {
         Object result = env.eval(input);
         if (result != null) {
@@ -81,11 +82,11 @@
   }
 
   public static void main(String[] args) {
-    if (args.length > 0 && args[0].equals("--compiler-debug")) {
-      UserDefinedFunction.enableCompiler = true;
-      UserDefinedFunction.debugCompiler = true;
-      UserDefinedFunction.debugCompilerPrintByteCode = true;
+    if (args.length == 0) {
+       new Skylark().readEvalPrintLoop();
+    } else {
+      System.err.println("no argument expected");
+      System.exit(1);
     }
-    new SkylarkShell().readEvalPrintLoop();
   }
 }