commit 95b0467e3eb42a8ce8d1179c0c7e1aab040e8120
author brandjon <brandjon@google.com> Fri Sep 22 23:33:38 2017 -0400
committer John Cater <jcater@google.com> Mon Sep 25 09:38:59 2017 -0400
tree 1311aaa083bdd2c9b67fade108fdbe524607f708
parent fefccdbfa28d8460c74b33dfc29a8aabc4d6a488

Cleanups for Skylark tracebacks

In Skylark.java, fix line numbers to start at 1 instead of 2.

In Eval.java, go through maybeTransformException for consistency with expressions, even though no statement nodes use this feature.

In EvalExceptionWithStackTrace, fix style violation (non-consecutive overloads) and add TODO explaining an open issue.

RELNOTES: None
PiperOrigin-RevId: 169769928

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 b7b91d4..6fd1f28 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
@@ -174,6 +174,14 @@
    * @throws InterruptedException may be thrown in a sub class.
    */
   public void exec(Statement st) throws EvalException, InterruptedException {
+    try {
+      execDispatch(st);
+    } catch (EvalException ex) {
+      throw st.maybeTransformException(ex);
+    }
+  }
+
+  void execDispatch(Statement st) throws EvalException, InterruptedException {
     switch (st.kind()) {
       case ASSIGNMENT:
         execAssignment((AssignmentStatement) st);