commit 6748ccb7d24363ccf42dfba26bd694dfecd7f179
author Googler <noreply@google.com> Mon Jul 01 10:22:59 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Jul 01 10:27:59 2019 -0700
tree 73e1ca9b65ccdeddf07c45f073e4ba3261c9c1b5
parent 47e88549998b3220e56dbce6e5ccb54ee8f1f77c

bazel syntax: eliminate Operator; use TokenKind

Also:
- rename TokenKind.getPrettyName -> toString.
  No-one wants to see internal enum names in error messages.
- use shorter names (op, x, y) throughout {Bi,U}naryOperatorExpression.
PiperOrigin-RevId: 255981802

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

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Eval.java b/src/main/java/com/google/devtools/build/lib/syntax/Eval.java
index 036210d..3199952 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Eval.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Eval.java
@@ -325,12 +325,11 @@
    * value).
    */
   private static void assignAugmented(
-      Expression expr, Operator operator, Expression rhs, Environment env, Location loc)
+      Expression expr, TokenKind op, Expression rhs, Environment env, Location loc)
       throws EvalException, InterruptedException {
     if (expr instanceof Identifier) {
       Object result =
-          BinaryOperatorExpression.evaluateAugmented(
-              operator, expr.eval(env), rhs.eval(env), env, loc);
+          BinaryOperatorExpression.evaluateAugmented(op, expr.eval(env), rhs.eval(env), env, loc);
       assignIdentifier((Identifier) expr, result, env);
     } else if (expr instanceof IndexExpression) {
       IndexExpression indexExpression = (IndexExpression) expr;
@@ -340,8 +339,7 @@
       Object oldValue = IndexExpression.evaluate(object, key, env, loc);
       // Evaluate rhs after lhs.
       Object rhsValue = rhs.eval(env);
-      Object result =
-          BinaryOperatorExpression.evaluateAugmented(operator, oldValue, rhsValue, env, loc);
+      Object result = BinaryOperatorExpression.evaluateAugmented(op, oldValue, rhsValue, env, loc);
       assignItem(object, key, result, env, loc);
     } else if (expr instanceof ListLiteral) {
       throw new EvalException(loc, "cannot perform augmented assignment on a list literal");