Add unary plus operator, +int

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

@@ -670,6 +670,13 @@ private Expression parsePrimary() {
           UnaryOperatorExpression minus = new UnaryOperatorExpression(TokenKind.MINUS, expr);
           return setLocation(minus, start, expr);
         }
+      case PLUS:
+        {
+          nextToken();
+          Expression expr = parsePrimaryWithSuffix();
+          UnaryOperatorExpression plus = new UnaryOperatorExpression(TokenKind.PLUS, expr);
+          return setLocation(plus, start, expr);
+        }
       default:
         {
           syntaxError("expected expression");

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

@@ -19,7 +19,7 @@
 /** A UnaryOperatorExpression represents a unary operator expression, 'op x'. */
 public final class UnaryOperatorExpression extends Expression {
 
-  private final TokenKind op; // NOT or MINUS
+  private final TokenKind op; // NOT, MINUS or PLUS
   private final Expression x;
 
   public UnaryOperatorExpression(TokenKind op, Expression x) {
@@ -75,6 +75,14 @@ private static Object evaluate(TokenKind op, Object value, Location loc)
           // Fails for -MIN_INT.
           throw new EvalException(loc, e.getMessage());
         }
+      case PLUS:
+        if (!(value instanceof Integer)) {
+          throw new EvalException(
+                  loc,
+                  String.format(
+                          "unsupported operand type for +: '%s'", EvalUtils.getDataTypeName(value)));
+        }
+        return value;
 
       default:
         throw new AssertionError("Unsupported unary operator: " + op);

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

@@ -137,7 +137,7 @@ public void testWithSyntaxErrorsDoesNotPrintDollarError() throws Exception {
         "           srcs = libs,",
         "           includes = [ abi + opt_level + '/include' ])");
     assertThat(buildFile.containsErrors()).isTrue();
-    assertContainsError("syntax error at '+': expected expression");
+    assertContainsError("syntax error at '*': expected expression");
     assertThat(buildFile.exec(env, getEventHandler())).isFalse();
     MoreAsserts.assertDoesNotContainEvent(getEventCollector(), "$error$");
     // This message should not be printed anymore.

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

@@ -847,13 +847,13 @@ public void testParserRecovery() throws Exception {
         "",
         "def bar():",
         "  a = [3, 4]",
-        "  b = 2 + + 5",  // parse error
+        "  b = 2 * * 5",  // parse error
         "");
 
     assertThat(getEventCollector()).hasSize(3);
     assertContainsError("syntax error at 'for': expected newline");
     assertContainsError("syntax error at 'ada': expected newline");
-    assertContainsError("syntax error at '+': expected expression");
+    assertContainsError("syntax error at '*': expected expression");
     assertThat(statements).hasSize(3);
   }
 
@@ -872,8 +872,8 @@ public void testParserDoesNotContainErrorsIfSuccess() throws Exception {
   @Test
   public void testParserContainsErrors() throws Exception {
     setFailFast(false);
-    parseFile("+");
-    assertContainsError("syntax error at '+'");
+    parseFile("*");
+    assertContainsError("syntax error at '*'");
   }
 
   @Test

src/test/starlark/testdata/int.sky

@@ -60,6 +60,15 @@ def compound():
 
 compound()
 
+
+# unary operators
+
+assert_eq(+4, 4)
+assert_eq(-4, -4)
+assert_eq(++4, 4)
+assert_eq(+-4, -4)
+assert_eq(-+-4, 4)
+
 ---
 1 // 0  ### integer division by zero
 ---