commit c381cf17f797f485d7a2df4d085ecbec217c79a9
author laurentlb <laurentlb@google.com> Wed Apr 11 04:12:14 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Wed Apr 11 04:13:26 2018 -0700
tree d082debc4915d9cacb84ca0ac5b7440832109df6
parent 8a2cd73e1dc6284ba2580f0d1f4c7276e8c1de1b

Introduce `--incompatible_disallow_slash_operator` to disable `/` operator.

RELNOTES:
  The `/` operator is deprecated in favor of `//` (floor integer division).
  Try the `--incompatible_disallow_slash_operator` flag to ensure your code
  is forward-compatible.
PiperOrigin-RevId: 192430310

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

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/BinaryOperatorExpression.java b/src/main/java/com/google/devtools/build/lib/syntax/BinaryOperatorExpression.java
index b1f835c..283fd57 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/BinaryOperatorExpression.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/BinaryOperatorExpression.java
@@ -205,6 +205,15 @@
           return mult(lhs, rhs, env, location);
 
         case DIVIDE:
+          if (env.getSemantics().incompatibleDisallowSlashOperator()) {
+            throw new EvalException(
+                location,
+                "The `/` operator has been removed. Please use the `//` operator for integer "
+                    + "division. You can temporarily enable the `/` operator by passing "
+                    + "the flag --incompatible_disallow_slash_operator=false");
+          }
+          return divide(lhs, rhs, location);
+
         case FLOOR_DIVIDE:
           return divide(lhs, rhs, location);
 

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

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java
index e0ef87f..b6665c4 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java
@@ -53,6 +53,8 @@
 
   public abstract boolean incompatibleDisallowOldStyleArgsAdd();
 
+  public abstract boolean incompatibleDisallowSlashOperator();
+
   public abstract boolean incompatibleDisallowToplevelIfStatement();
 
   public abstract boolean incompatibleNewActionsApi();
@@ -89,6 +91,7 @@
           .incompatibleDisableObjcProviderResources(false)
           .incompatibleDisallowDictPlus(false)
           .incompatibleDisallowOldStyleArgsAdd(false)
+          .incompatibleDisallowSlashOperator(false)
           .incompatibleDisallowToplevelIfStatement(true)
           .incompatibleNewActionsApi(false)
           .incompatiblePackageNameIsAFunction(false)
@@ -117,6 +120,8 @@
 
     public abstract Builder incompatibleDisallowOldStyleArgsAdd(boolean value);
 
+    public abstract Builder incompatibleDisallowSlashOperator(boolean value);
+
     public abstract Builder incompatibleDisallowToplevelIfStatement(boolean value);
 
     public abstract Builder incompatibleNewActionsApi(boolean value);