commit 003bb88ce18867b78649c137cd00b8ae21fc29af
author Laurent Le Brun <laurentlb@google.com> Tue May 19 11:32:17 2015 +0000
committer Han-Wen Nienhuys <hanwen@google.com> Thu May 21 09:44:43 2015 +0000
tree 977a13eef61462d1bac5ed03e635bd96c2ff13ec
parent 7ef174056ea975d700283487bc8f39136315926c

BUILD language: Improve error message when using operator [].

--
MOS_MIGRATED_REVID=93977184

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

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java b/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java
index 5a04ba1..7bdc0c0 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java
@@ -247,6 +247,17 @@
     return numPositionalArgs;
   }
 
+  private String functionName() {
+    String name = func.getName();
+    if (name.equals("$slice")) {
+      return "operator [:]";
+    } else if (name.equals("$index")) {
+      return "operator []";
+    } else {
+      return "function '" + name + "'";
+    }
+  }
+
   @Override
   public String toString() {
     if (func.getName().equals("$slice")) {
@@ -516,8 +527,8 @@
         }
       } else {
         throw new EvalException(getLocation(), String.format(
-            "function '%s' is not defined on '%s'", func.getName(),
-            EvalUtils.getDataTypeName(objValue)));
+            "%s is not defined on object of type '%s'",
+            functionName(), EvalUtils.getDataTypeName(objValue)));
       }
     } else { // func(...)
       Object funcValue = func.eval(env);