commit 76023b9180d7a18defc526126a943fab684971dc
author Francois-Rene Rideau <tunes@google.com> Fri Apr 17 15:31:59 2015 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Fri Apr 17 15:43:19 2015 +0000
tree 0b65fe1803ebfb3eeff439a2d354987889044bd7
parent a8628bfffa72994759e4ac8bb45f317c4f33c05d

More skylark function cleanups

--
MOS_MIGRATED_REVID=91407816

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 dce075a..fb9e2fd 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
@@ -246,11 +246,11 @@
           String msg = String.format(
               "fun %s(%s), param %s, enforcedType: %s (%s); parameterType: %s",
               getName(), signature, signature.getSignature().getNames().get(i),
-              enforcedType, enforcedType.getClass(), parameterType);
+              enforcedType, enforcedType.getType(), parameterType);
           if (enforcedType instanceof SkylarkType.Simple
               || enforcedType instanceof SkylarkFunctionType) {
             Preconditions.checkArgument(
-                enforcedType == SkylarkType.of(parameterType), msg);
+                enforcedType.getType() == parameterType, msg);
             // No need to enforce Simple types on the Skylark side, the JVM will do it for us.
             enforcedArgumentTypes.set(i, null);
           } else if (enforcedType instanceof SkylarkType.Combination) {