commit 34f705832500efa7669942d26beb30d879dc064e
author Googler <noreply@google.com> Mon Nov 25 12:27:34 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Nov 25 12:29:47 2019 -0800
tree 0aa4afdf8f391caaebadd862a3849c36f726f52e
parent 565c199f51cf8b9898342c47c07666c1a8159375

bazel: rename SkylarkValue

This change moves skylarkinterface.SkylarkValue to syntax.StarlarkValue,
and also skylarkinterface.SkylarkPrinter to syntax.Printer, where its
functionality is merged into the existing class of that name.

This change is entirely mechanical, except for syntax.Printer (naturally),
and MethodLibrary and SkylarkEvaluationTest, which needed a tweak
due the removal of the Printer.debugPrint static method.

All classes related to the representation of values are now in the evaluator package;
skylarkinterface now contains only the annotations.

This is a breaking change for copybara.

BEGIN_PUBLIC
bazel: rename SkylarkValue
END_PUBLIC
PiperOrigin-RevId: 282410278

src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java

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 0ecc3cf..7e938ef 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
@@ -34,7 +34,6 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkGlobalLibrary;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
-import com.google.devtools.build.lib.skylarkinterface.SkylarkValue;
 import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
 import com.google.devtools.build.lib.testutil.TestMode;
 import java.util.List;
@@ -118,7 +117,7 @@
   }
 
   @SkylarkModule(name = "Mock", doc = "")
-  class Mock implements SkylarkValue {
+  class Mock implements StarlarkValue {
     @SkylarkCallable(
         name = "MockFn",
         selfCall = true,
@@ -178,18 +177,22 @@
     public String function() {
       return "a";
     }
+
     @SuppressWarnings("unused")
-    @SkylarkCallable(name = "nullfunc_failing",
+    @SkylarkCallable(
+        name = "nullfunc_failing",
         parameters = {
           @Param(name = "p1", type = String.class),
           @Param(name = "p2", type = Integer.class),
         },
-        documented = false, allowReturnNones = false)
-    public SkylarkValue nullfuncFailing(String p1, Integer p2) {
+        documented = false,
+        allowReturnNones = false)
+    public StarlarkValue nullfuncFailing(String p1, Integer p2) {
       return null;
     }
+
     @SkylarkCallable(name = "nullfunc_working", documented = false, allowReturnNones = true)
-    public SkylarkValue nullfuncWorking() {
+    public StarlarkValue nullfuncWorking() {
       return null;
     }
     @SkylarkCallable(name = "voidfunc", documented = false)
@@ -423,8 +426,7 @@
         useStarlarkThread = true)
     public String withArgsAndThread(
         Integer pos1, boolean pos2, boolean named, Sequence<?> args, StarlarkThread thread) {
-      String argsString =
-          "args(" + args.stream().map(Printer::debugPrint).collect(joining(", ")) + ")";
+      String argsString = debugPrintArgs(args);
       return "with_args_and_thread("
           + pos1
           + ", "
@@ -469,8 +471,7 @@
         extraKeywords = @Param(name = "kwargs"))
     public String withArgsAndKwargs(String foo, Sequence<?> args, Dict<?, ?> kwargs)
         throws EvalException {
-      String argsString =
-          "args(" + args.stream().map(Printer::debugPrint).collect(joining(", ")) + ")";
+      String argsString = debugPrintArgs(args);
       String kwargsString =
           "kwargs("
               + kwargs
@@ -494,8 +495,19 @@
     }
   }
 
+  private static String debugPrintArgs(Iterable<?> args) {
+    Printer p = Printer.getPrinter();
+    p.append("args(");
+    String sep = "";
+    for (Object arg : args) {
+      p.append(sep).debugPrint(arg);
+      sep = ", ";
+    }
+    return p.append(")").toString();
+  }
+
   @SkylarkModule(name = "MockInterface", doc = "")
-  static interface MockInterface extends SkylarkValue {
+  static interface MockInterface extends StarlarkValue {
     @SkylarkCallable(name = "is_empty_interface",
         parameters = { @Param(name = "str", type = String.class) },
         documented = false)
@@ -515,7 +527,7 @@
   }
 
   @SkylarkModule(name = "MockClassObject", documented = false, doc = "")
-  static final class MockClassObject implements ClassObject, SkylarkValue {
+  static final class MockClassObject implements ClassObject, StarlarkValue {
     @Override
     public Object getValue(String name) {
       switch (name) {
@@ -538,7 +550,7 @@
   }
 
   @SkylarkModule(name = "ParamterizedMock", doc = "")
-  static interface ParameterizedApi<ObjectT> extends SkylarkValue {
+  static interface ParameterizedApi<ObjectT> extends StarlarkValue {
     @SkylarkCallable(
         name = "method",
         documented = false,