commit 648f8f3007a3e5c21f2c2e397ec94b1aca598caa
author Laurent Le Brun <laurentlb@google.com> Wed Sep 09 19:46:29 2015 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Fri Sep 11 08:45:49 2015 +0000
tree fcb609e6ea5177857f8a30226da7c4857c32d370
parent 1d619c2d0c46a9b8962707736f096d37e59bc10a

Fix error message when accessing unsupported operator [].

Old message was e.g.
   "No matching method found for $index(int) in set"

--
MOS_MIGRATED_REVID=102685114

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 8d1eb56..2ef5d83 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
@@ -253,7 +253,7 @@
     } else if (name.equals("$index")) {
       return "operator []";
     } else {
-      return "function '" + name + "'";
+      return "function " + name;
     }
   }
 
@@ -383,9 +383,12 @@
           if (matchingMethod == null) {
             matchingMethod = method;
           } else {
-            throw new EvalException(func.getLocation(),
-                "Multiple matching methods for " + formatMethod(methodName, args)
-                + " in " + EvalUtils.getDataTypeNameFromClass(objClass));
+            throw new EvalException(
+                func.getLocation(),
+                String.format(
+                    "Type %s has multiple matches for %s",
+                    EvalUtils.getDataTypeNameFromClass(objClass),
+                    formatMethod(args)));
           }
         }
       }
@@ -393,15 +396,18 @@
     if (matchingMethod != null && !matchingMethod.getAnnotation().structField()) {
       return callMethod(matchingMethod, methodName, obj, args.toArray(), getLocation());
     } else {
-      throw new EvalException(getLocation(), "No matching method found for "
-          + formatMethod(methodName, args) + " in "
-          + EvalUtils.getDataTypeNameFromClass(objClass));
+      throw new EvalException(
+          getLocation(),
+          String.format(
+              "Type %s has no %s",
+              EvalUtils.getDataTypeNameFromClass(objClass),
+              formatMethod(args)));
     }
   }
 
-  private String formatMethod(String methodName, List<Object> args) {
+  private String formatMethod(List<Object> args) {
     StringBuilder sb = new StringBuilder();
-    sb.append(methodName).append("(");
+    sb.append(functionName()).append("(");
     boolean first = true;
     for (Object obj : args) {
       if (!first) {