commit 537a90b5b90856788412c962de61ece14e83274b
author Francois-Rene Rideau <tunes@google.com> Wed Apr 22 06:47:31 2015 +0000
committer Laurent Le Brun <laurentlb@google.com> Wed Apr 22 12:42:37 2015 +0000
tree 08b489df7f200b6fa59fee0adc857245f78f88e2
parent 443aaae842aaf5009c2972277a1089c504873877

Use BuiltinFunction for all builtins

Replace the uses of AbstractFunction, MixedModeFunction,
SkylarkFunction and SimpleSkylarkFunction by BuiltinFunction.

--
MOS_MIGRATED_REVID=91763158

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

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/BuiltinFunction.java b/src/main/java/com/google/devtools/build/lib/syntax/BuiltinFunction.java
index 08ea8ee..af33276 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/BuiltinFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/BuiltinFunction.java
@@ -205,8 +205,8 @@
     Preconditions.checkState(!isConfigured()); // must not be configured yet
     enforcedArgumentTypes = new ArrayList<>();
     this.extraArgs = SkylarkSignatureProcessor.getExtraArgs(annotation);
-    super.configure(annotation);
     this.returnType = annotation.returnType();
+    super.configure(annotation);
   }
 
   // finds the method and makes it accessible (which is needed to find it, and later to use it)
@@ -273,7 +273,10 @@
       if (type == HackHackEitherList.class) {
         type = Object.class;
       }
-      Preconditions.checkArgument(type == invokeMethod.getReturnType());
+      Class<?> methodReturnType = invokeMethod.getReturnType();
+      Preconditions.checkArgument(type == methodReturnType,
+          "signature for function %s says it returns %s but its invoke method returns %s",
+          getName(), returnType, methodReturnType);
     }
   }