From 5979a2ba1caed58c30b91dfbe2ef634973ab5064 Mon Sep 17 00:00:00 2001 From: Christoffer Sawicki Date: Thu, 16 Aug 2012 23:18:23 +0200 Subject: [PATCH] Make Keyword extend AFn (just like Symbol) Fixes error message inconsistencies in Symbol and Keyword. Signed-off-by: Christoffer Sawicki --- src/jvm/clojure/lang/Keyword.java | 122 +------------------------------------ 1 files changed, 1 insertions(+), 121 deletions(-) diff --git a/src/jvm/clojure/lang/Keyword.java b/src/jvm/clojure/lang/Keyword.java index 15693c8..537db81 100644 --- a/src/jvm/clojure/lang/Keyword.java +++ b/src/jvm/clojure/lang/Keyword.java @@ -21,7 +21,7 @@ import java.lang.ref.ReferenceQueue; import java.lang.ref.SoftReference; -public class Keyword implements IFn, Comparable, Named, Serializable { +public class Keyword extends AFn implements Comparable, Named, Serializable { private static ConcurrentHashMap> table = new ConcurrentHashMap(); static final ReferenceQueue rq = new ReferenceQueue(); @@ -84,23 +84,6 @@ public String toString(){ return _str; } -public Object throwArity(){ - throw new IllegalArgumentException("Wrong number of args passed to keyword: " - + toString()); -} - -public Object call() { - return throwArity(); -} - -public void run(){ - throw new UnsupportedOperationException(); -} - -public Object invoke() { - return throwArity(); -} - public int compareTo(Object o){ return sym.compareTo(((Keyword) o).sym); } @@ -137,109 +120,6 @@ final public Object invoke(Object obj, Object notFound) { return RT.get(obj, this, notFound); } -public Object invoke(Object arg1, Object arg2, Object arg3) { - return throwArity(); -} - -public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4) { - return throwArity(); -} - -public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) { - return throwArity(); -} - -public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6) { - return throwArity(); -} - -public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7) - { - return throwArity(); -} - -public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, - Object arg8) { - return throwArity(); -} - -public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, - Object arg8, Object arg9) { - return throwArity(); -} - -public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, - Object arg8, Object arg9, Object arg10) { - return throwArity(); -} - -public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, - Object arg8, Object arg9, Object arg10, Object arg11) { - return throwArity(); -} - -public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, - Object arg8, Object arg9, Object arg10, Object arg11, Object arg12) { - return throwArity(); -} - -public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, - Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13) - { - return throwArity(); -} - -public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, - Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14) - { - return throwArity(); -} - -public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, - Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14, - Object arg15) { - return throwArity(); -} - -public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, - Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14, - Object arg15, Object arg16) { - return throwArity(); -} - -public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, - Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14, - Object arg15, Object arg16, Object arg17) { - return throwArity(); -} - -public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, - Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14, - Object arg15, Object arg16, Object arg17, Object arg18) { - return throwArity(); -} - -public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, - Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14, - Object arg15, Object arg16, Object arg17, Object arg18, Object arg19) { - return throwArity(); -} - -public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, - Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14, - Object arg15, Object arg16, Object arg17, Object arg18, Object arg19, Object arg20) - { - return throwArity(); -} - -public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, - Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14, - Object arg15, Object arg16, Object arg17, Object arg18, Object arg19, Object arg20, - Object... args) - { - return throwArity(); -} - public Object applyTo(ISeq arglist) { return AFn.applyToHelper(this, arglist); -- 1.7.4.4