IFns can be passed to higher order functions, e.g. the
- * example below passes plus to read:
inc to map:
*
*
* IFn map = Clojure.var("clojure.core", "map");
diff --git a/src/jvm/clojure/java/api/package.html b/src/jvm/clojure/java/api/package.html
index 6536c33ab5..a24d3c9b79 100644
--- a/src/jvm/clojure/java/api/package.html
+++ b/src/jvm/clojure/java/api/package.html
@@ -57,7 +57,7 @@
IFns can be passed to higher order functions, e.g. the
- example below passes plus to read:
+ example below passes inc to map:
IFn map = Clojure.var("clojure.core", "map");
IFn inc = Clojure.var("clojure.core", "inc");
diff --git a/src/jvm/clojure/lang/APersistentVector.java b/src/jvm/clojure/lang/APersistentVector.java
index c9f15cdd3f..3e88d14dbf 100644
--- a/src/jvm/clojure/lang/APersistentVector.java
+++ b/src/jvm/clojure/lang/APersistentVector.java
@@ -98,15 +98,18 @@ static boolean doEquiv(IPersistentVector v, Object obj){
else if(obj instanceof List)
{
Collection ma = (Collection) obj;
- if(ma.size() != v.count())
+
+ if((!(ma instanceof IPersistentCollection) || (ma instanceof Counted)) && (ma.size() != v.count()))
return false;
- for(Iterator i1 = ((List) v).iterator(), i2 = ma.iterator();
- i1.hasNext();)
+
+ Iterator i2 = ma.iterator();
+
+ for(Iterator i1 = ((List) v).iterator(); i1.hasNext();)
{
- if(!Util.equiv(i1.next(), i2.next()))
+ if(!i2.hasNext() || !Util.equiv(i1.next(), i2.next()))
return false;
}
- return true;
+ return !i2.hasNext();
}
else
{
@@ -544,7 +547,7 @@ public APersistentVector.RSeq withMeta(IPersistentMap meta){
}
}
-public static class SubVector extends APersistentVector implements IObj{
+public static class SubVector extends APersistentVector implements IObj, IKVReduce{
public final IPersistentVector v;
public final int start;
public final int end;
@@ -574,6 +577,16 @@ public Iterator iterator(){
return super.iterator();
}
+ public Object kvreduce(IFn f, Object init){
+ int cnt = count();
+ for (int i=0; i= end) || (i < 0))
throw new IndexOutOfBoundsException();
diff --git a/src/jvm/clojure/lang/ASeq.java b/src/jvm/clojure/lang/ASeq.java
index 325aa27c24..f0f8e5d447 100644
--- a/src/jvm/clojure/lang/ASeq.java
+++ b/src/jvm/clojure/lang/ASeq.java
@@ -37,6 +37,11 @@ public boolean equiv(Object obj){
if(!(obj instanceof Sequential || obj instanceof List))
return false;
+
+ if(this instanceof Counted && obj instanceof Counted &&
+ ((Counted)this).count() != ((Counted)obj).count())
+ return false;
+
ISeq ms = RT.seq(obj);
for(ISeq s = seq(); s != null; s = s.next(), ms = ms.next())
{
diff --git a/src/jvm/clojure/lang/ArraySeq.java b/src/jvm/clojure/lang/ArraySeq.java
index 597a5410de..5f54d87aaf 100644
--- a/src/jvm/clojure/lang/ArraySeq.java
+++ b/src/jvm/clojure/lang/ArraySeq.java
@@ -15,6 +15,9 @@
import java.lang.reflect.Array;
public class ArraySeq extends ASeq implements IndexedSeq, IReduce{
+
+private static final long serialVersionUID = -9069152683729302290L;
+
public final Object[] array;
final int i;
//ISeq _rest;
@@ -142,6 +145,13 @@ public int lastIndexOf(Object o) {
return -1;
}
+public Object[] toArray(){
+ int sz = this.array.length - this.i;
+ Object[] ret = new Object[sz];
+ System.arraycopy(this.array, i, ret, 0, sz);
+ return ret;
+}
+
//////////////////////////////////// specialized primitive versions ///////////////////////////////
static public class ArraySeq_int extends ASeq implements IndexedSeq, IReduce{
diff --git a/src/jvm/clojure/lang/Compiler.java b/src/jvm/clojure/lang/Compiler.java
index 041786e888..12cf1e5623 100644
--- a/src/jvm/clojure/lang/Compiler.java
+++ b/src/jvm/clojure/lang/Compiler.java
@@ -1612,8 +1612,16 @@ public void emit(C context, ObjExpr objx, GeneratorAdapter gen){
gen.invokeInterface(type, m);
else
gen.invokeVirtual(type, m);
- //if(context != C.STATEMENT || method.getReturnType() == Void.TYPE)
- HostExpr.emitBoxReturn(objx, gen, method.getReturnType());
+ Class retClass = method.getReturnType();
+ if(context == C.STATEMENT)
+ {
+ if(retClass == long.class || retClass == double.class)
+ gen.pop2();
+ else if(retClass != void.class)
+ gen.pop();
+ }
+ else
+ HostExpr.emitBoxReturn(objx, gen, retClass);
}
else
{
@@ -1627,9 +1635,9 @@ public void emit(C context, ObjExpr objx, GeneratorAdapter gen){
method.emitClearLocals(gen);
}
gen.invokeStatic(REFLECTOR_TYPE, invokeInstanceMethodMethod);
+ if(context == C.STATEMENT)
+ gen.pop();
}
- if(context == C.STATEMENT)
- gen.pop();
}
public boolean hasJavaClass(){
@@ -6016,9 +6024,14 @@ public static class LocalBindingExpr implements Expr, MaybePrimitiveExpr, Assign
public LocalBindingExpr(LocalBinding b, Symbol tag)
{
if(b.getPrimitiveType() != null && tag != null)
- throw new UnsupportedOperationException("Can't type hint a primitive local");
+ if(! b.getPrimitiveType().equals(tagClass(tag)))
+ throw new UnsupportedOperationException("Can't type hint a primitive local with a different type");
+ else
+ this.tag = null;
+ else
+ this.tag = tag;
+
this.b = b;
- this.tag = tag;
this.clearPath = (PathNode)CLEAR_PATH.get();
this.clearRoot = (PathNode)CLEAR_ROOT.get();
@@ -7649,7 +7662,7 @@ public static Object load(Reader rdr, String sourcePath, String sourceName) {
catch(Throwable e)
{
if(!(e instanceof CompilerException))
- throw new CompilerException(sourcePath, (Integer) LINE_BEFORE.deref(), (Integer) COLUMN_BEFORE.deref(), e);
+ throw new CompilerException(sourcePath, (Integer) LINE_BEFORE.deref(), (Integer) COLUMN_BEFORE.deref(), null, CompilerException.PHASE_EXECUTION, e);
else
throw (CompilerException) e;
}
diff --git a/src/jvm/clojure/lang/Cycle.java b/src/jvm/clojure/lang/Cycle.java
index 877695558a..0be07b5949 100644
--- a/src/jvm/clojure/lang/Cycle.java
+++ b/src/jvm/clojure/lang/Cycle.java
@@ -93,4 +93,13 @@ public Object reduce(IFn f, Object start){
s = all;
}
}
+
+public int hashCode(){
+ throw new UnsupportedOperationException();
+}
+
+public int hasheq(){
+ throw new UnsupportedOperationException();
+}
+
}
diff --git a/src/jvm/clojure/lang/Delay.java b/src/jvm/clojure/lang/Delay.java
index 262c9c1a43..ffd418962d 100644
--- a/src/jvm/clojure/lang/Delay.java
+++ b/src/jvm/clojure/lang/Delay.java
@@ -54,7 +54,7 @@ public Object deref() {
return val;
}
-synchronized public boolean isRealized(){
+public boolean isRealized(){
return fn == null;
}
}
diff --git a/src/jvm/clojure/lang/Iterate.java b/src/jvm/clojure/lang/Iterate.java
index aec0c14aa2..5aaf9cbb52 100644
--- a/src/jvm/clojure/lang/Iterate.java
+++ b/src/jvm/clojure/lang/Iterate.java
@@ -84,4 +84,12 @@ public Object reduce(IFn rf, Object start){
v = f.invoke(v);
}
}
+
+public int hashCode(){
+ throw new UnsupportedOperationException();
+}
+
+public int hasheq(){
+ throw new UnsupportedOperationException();
+}
}
diff --git a/src/jvm/clojure/lang/Keyword.java b/src/jvm/clojure/lang/Keyword.java
index 02d21326a2..253f455e4a 100644
--- a/src/jvm/clojure/lang/Keyword.java
+++ b/src/jvm/clojure/lang/Keyword.java
@@ -23,6 +23,8 @@
public class Keyword implements IFn, Comparable, Named, Serializable, IHashEq {
+private static final long serialVersionUID = -2105088845257724163L;
+
private static ConcurrentHashMap> table = new ConcurrentHashMap();
static final ReferenceQueue rq = new ReferenceQueue();
public final Symbol sym;
@@ -93,13 +95,21 @@ public String toString(){
return _str;
}
+/**
+ * @deprecated CLJ-2350: This function is no longer called, but has not been
+ * removed to maintain the public interface.
+ */
public Object throwArity(){
throw new IllegalArgumentException("Wrong number of args passed to keyword: "
+ toString());
}
+Object throwArity(int n) {
+ throw new ArityException(n, toString());
+}
+
public Object call() {
- return throwArity();
+ return throwArity(0);
}
public void run(){
@@ -107,7 +117,7 @@ public void run(){
}
public Object invoke() {
- return throwArity();
+ return throwArity(0);
}
public int compareTo(Object o){
@@ -146,98 +156,98 @@ final public Object invoke(Object obj, Object notFound) {
}
public Object invoke(Object arg1, Object arg2, Object arg3) {
- return throwArity();
+ return throwArity(3);
}
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4) {
- return throwArity();
+ return throwArity(4);
}
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) {
- return throwArity();
+ return throwArity(5);
}
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6) {
- return throwArity();
+ return throwArity(6);
}
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7)
{
- return throwArity();
+ return throwArity(7);
}
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
Object arg8) {
- return throwArity();
+ return throwArity(8);
}
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
Object arg8, Object arg9) {
- return throwArity();
+ return throwArity(9);
}
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();
+ return throwArity(10);
}
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();
+ return throwArity(11);
}
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();
+ return throwArity(12);
}
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();
+ return throwArity(13);
}
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();
+ return throwArity(14);
}
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();
+ return throwArity(15);
}
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();
+ return throwArity(16);
}
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();
+ return throwArity(17);
}
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();
+ return throwArity(18);
}
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();
+ return throwArity(19);
}
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();
+ return throwArity(20);
}
public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
@@ -245,7 +255,7 @@ public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object
Object arg15, Object arg16, Object arg17, Object arg18, Object arg19, Object arg20,
Object... args)
{
- return throwArity();
+ return throwArity(20 + args.length);
}
diff --git a/src/jvm/clojure/lang/MultiFn.java b/src/jvm/clojure/lang/MultiFn.java
index fd37e2a085..44ac1ce1c0 100644
--- a/src/jvm/clojure/lang/MultiFn.java
+++ b/src/jvm/clojure/lang/MultiFn.java
@@ -85,7 +85,7 @@ public MultiFn preferMethod(Object dispatchValX, Object dispatchValY) {
rw.writeLock().lock();
try
{
- if(prefers(dispatchValY, dispatchValX))
+ if(prefers(hierarchy.deref(), dispatchValY, dispatchValX))
throw new IllegalStateException(
String.format("Preference conflict in multimethod '%s': %s is already preferred to %s",
name, dispatchValY, dispatchValX));
@@ -102,29 +102,29 @@ public MultiFn preferMethod(Object dispatchValX, Object dispatchValY) {
}
}
-private boolean prefers(Object x, Object y) {
+private boolean prefers(Object hierarchy, Object x, Object y) {
IPersistentSet xprefs = (IPersistentSet) getPreferTable().valAt(x);
if(xprefs != null && xprefs.contains(y))
return true;
- for(ISeq ps = RT.seq(parents.invoke(y)); ps != null; ps = ps.next())
+ for(ISeq ps = RT.seq(parents.invoke(hierarchy, y)); ps != null; ps = ps.next())
{
- if(prefers(x, ps.first()))
+ if(prefers(hierarchy, x, ps.first()))
return true;
}
- for(ISeq ps = RT.seq(parents.invoke(x)); ps != null; ps = ps.next())
+ for(ISeq ps = RT.seq(parents.invoke(hierarchy, x)); ps != null; ps = ps.next())
{
- if(prefers(ps.first(), y))
+ if(prefers(hierarchy, ps.first(), y))
return true;
}
return false;
}
-private boolean isA(Object x, Object y) {
- return RT.booleanCast(isa.invoke(hierarchy.deref(), x, y));
+private boolean isA(Object hierarchy, Object x, Object y) {
+ return RT.booleanCast(isa.invoke(hierarchy, x, y));
}
-private boolean dominates(Object x, Object y) {
- return prefers(x, y) || isA(x, y);
+private boolean dominates(Object hierarchy, Object x, Object y) {
+ return prefers(hierarchy, x, y) || isA(hierarchy, x, y);
}
private IPersistentMap resetCache() {
@@ -170,11 +170,11 @@ private IFn findAndCacheBestMethod(Object dispatchVal) {
for(Object o : getMethodTable())
{
Map.Entry e = (Map.Entry) o;
- if(isA(dispatchVal, e.getKey()))
+ if(isA(ch, dispatchVal, e.getKey()))
{
- if(bestEntry == null || dominates(e.getKey(), bestEntry.getKey()))
+ if(bestEntry == null || dominates(ch, e.getKey(), bestEntry.getKey()))
bestEntry = e;
- if(!dominates(bestEntry.getKey(), e.getKey()))
+ if(!dominates(ch, bestEntry.getKey(), e.getKey()))
throw new IllegalArgumentException(
String.format(
"Multiple methods in multimethod '%s' match dispatch value: %s -> %s and %s, and neither is preferred",
diff --git a/src/jvm/clojure/lang/Numbers.java b/src/jvm/clojure/lang/Numbers.java
index fa13cba62c..82d8e6914c 100644
--- a/src/jvm/clojure/lang/Numbers.java
+++ b/src/jvm/clojure/lang/Numbers.java
@@ -68,6 +68,8 @@ static interface Ops{
public Number dec(Number x);
public Number decP(Number x);
public Number unchecked_dec(Number x);
+
+ public Number abs(Number x);
}
static abstract class OpsP implements Ops{
@@ -619,6 +621,10 @@ public Number unchecked_dec(Number x){
long val = x.longValue();
return num(Numbers.unchecked_dec(val));
}
+
+ public Number abs(Number x){
+ return num(Math.abs(x.longValue()));
+ }
}
final static class DoubleOps extends OpsP{
@@ -706,6 +712,10 @@ public Number inc(Number x){
public Number dec(Number x){
return Double.valueOf(x.doubleValue() - 1);
}
+
+ public Number abs(Number x) {
+ return num(Math.abs(x.doubleValue()));
+ }
}
final static class RatioOps extends OpsP{
@@ -837,6 +847,11 @@ public Number dec(Number x){
return Numbers.add(x, -1);
}
+ public Number abs(Number x) {
+ Ratio r = (Ratio) x;
+ return new Ratio(r.numerator.abs(), r.denominator);
+ }
+
}
final static class BigIntOps extends OpsP{
@@ -935,6 +950,10 @@ public Number dec(Number x){
BigInteger bx = toBigInteger(x);
return BigInt.fromBigInteger(bx.subtract(BigInteger.ONE));
}
+
+ public Number abs(Number x) {
+ return BigInt.fromBigInteger(toBigInteger(x).abs());
+ }
}
@@ -1054,6 +1073,14 @@ public Number dec(Number x){
? bx.subtract(BigDecimal.ONE)
: bx.subtract(BigDecimal.ONE, mc);
}
+
+ public Number abs(Number x) {
+ MathContext mc = (MathContext) MATH_CONTEXT.deref();
+ BigDecimal bx = (BigDecimal) x;
+ return mc == null
+ ? ((BigDecimal) x).abs()
+ : ((BigDecimal) x).abs(mc);
+ }
}
static final LongOps LONG_OPS = new LongOps();
@@ -1888,10 +1915,7 @@ static public Number unchecked_dec(Object x){
static public double remainder(long x, double y){return remainder((double)x,y);}
static public long add(long x, long y){
- long ret = x + y;
- if ((ret ^ x) < 0 && (ret ^ y) < 0)
- return throwIntOverflow();
- return ret;
+ return Math.addExact(x, y);
}
static public Number addP(long x, long y){
@@ -1902,10 +1926,7 @@ static public Number addP(long x, long y){
}
static public long minus(long x, long y){
- long ret = x - y;
- if (((ret ^ x) < 0 && (ret ^ ~y) < 0))
- return throwIntOverflow();
- return ret;
+ return Math.subtractExact(x, y);
}
static public Number minusP(long x, long y){
@@ -1916,9 +1937,7 @@ static public Number minusP(long x, long y){
}
static public long minus(long x){
- if(x == Long.MIN_VALUE)
- return throwIntOverflow();
- return -x;
+ return Math.negateExact(x);
}
static public Number minusP(long x){
@@ -1928,9 +1947,7 @@ static public Number minusP(long x){
}
static public long inc(long x){
- if(x == Long.MAX_VALUE)
- return throwIntOverflow();
- return x + 1;
+ return Math.incrementExact(x);
}
static public Number incP(long x){
@@ -1940,9 +1957,7 @@ static public Number incP(long x){
}
static public long dec(long x){
- if(x == Long.MIN_VALUE)
- return throwIntOverflow();
- return x - 1;
+ return Math.decrementExact(x);
}
static public Number decP(long x){
@@ -1953,12 +1968,7 @@ static public Number decP(long x){
static public long multiply(long x, long y){
- if (x == Long.MIN_VALUE && y < 0)
- return throwIntOverflow();
- long ret = x * y;
- if (y != 0 && ret/y != x)
- return throwIntOverflow();
- return ret;
+ return Math.multiplyExact(x, y);
}
static public Number multiplyP(long x, long y){
@@ -4068,11 +4078,7 @@ static public Object max(long x, double y){
static public long max(long x, long y){
- if(x > y) {
- return x;
- } else {
- return y;
- }
+ return Math.max(x, y);
}
@@ -4166,11 +4172,7 @@ static public Object min(long x, double y){
static public long min(long x, long y){
- if(x < y) {
- return x;
- } else {
- return y;
- }
+ return Math.min(x, y);
}
static public Object min(long x, Object y){
@@ -4221,4 +4223,16 @@ static public Object min(Object x, Object y){
}
}
+static public long abs(long x){
+ return Math.abs(x);
+}
+
+static public double abs(double x){
+ return Math.abs(x);
+}
+
+static public Number abs(Object x) {
+ return ops(x).abs((Number)x);
+}
+
}
diff --git a/src/jvm/clojure/lang/PersistentArrayMap.java b/src/jvm/clojure/lang/PersistentArrayMap.java
index 27b860e5d5..1f86fd80aa 100644
--- a/src/jvm/clojure/lang/PersistentArrayMap.java
+++ b/src/jvm/clojure/lang/PersistentArrayMap.java
@@ -76,9 +76,61 @@ static public PersistentArrayMap createWithCheck(Object[] init){
return new PersistentArrayMap(init);
}
+/**
+ * This method attempts to find resue the given array as the basis for an array map as quickly as possible.
+ *
+ * If a trailing element exists in the array or it contains duplicate keys then it delegates to the complex path.
+ **/
static public PersistentArrayMap createAsIfByAssoc(Object[] init){
- if ((init.length & 1) == 1)
- throw new IllegalArgumentException(String.format("No value supplied for key: %s", init[init.length-1]));
+ boolean complexPath, hasTrailing;
+ complexPath = hasTrailing = ((init.length & 1) == 1);
+
+ for(int i=0;((i< init.length) && !complexPath);i += 2)
+ {
+ for(int j=0;jThis method handles the default case of an array containing alternating key/value pairs.
+ * It will reallocate a smaller init array if duplicate keys are found.
+ *
+ * If a trailing element is found then will attempt to add it to the resulting map as if by conj.
+ * No guarantees about the order of the keys in the trailing element are made.
+ **/
+private static PersistentArrayMap createAsIfByAssocComplexPath(Object[] init, boolean hasTrailing){
+ if(hasTrailing)
+ {
+ IPersistentCollection trailing = PersistentArrayMap.EMPTY.cons(init[init.length-1]);
+ init = growSeedArray(init, trailing);
+ }
+
// If this looks like it is doing busy-work, it is because it
// is achieving these goals: O(n^2) run time like
// createWithCheck(), never modify init arg, and only
diff --git a/src/jvm/clojure/lang/RT.java b/src/jvm/clojure/lang/RT.java
index 74399cf15f..5d20ef4964 100644
--- a/src/jvm/clojure/lang/RT.java
+++ b/src/jvm/clojure/lang/RT.java
@@ -1244,10 +1244,7 @@ static public int intCast(float x){
}
static public int intCast(long x){
- int i = (int) x;
- if(i != x)
- throw new IllegalArgumentException("Value out of range for int: " + x);
- return i;
+ return Math.toIntExact(x);
}
static public int intCast(double x){
diff --git a/src/jvm/clojure/lang/Repeat.java b/src/jvm/clojure/lang/Repeat.java
index 2ce4f2dab2..9547d66523 100644
--- a/src/jvm/clojure/lang/Repeat.java
+++ b/src/jvm/clojure/lang/Repeat.java
@@ -97,4 +97,17 @@ public Object reduce(IFn f, Object start){
}
}
+public int hashCode(){
+ if(count <= 0)
+ throw new UnsupportedOperationException();
+ else
+ return super.hashCode();
+}
+
+public int hasheq(){
+ if(count <= 0)
+ throw new UnsupportedOperationException();
+ else
+ return super.hasheq();
+}
}
diff --git a/test/clojure/test_clojure/clojure_xml.clj b/test/clojure/test_clojure/clojure_xml.clj
index cf7eb9508d..d37962f361 100644
--- a/test/clojure/test_clojure/clojure_xml.clj
+++ b/test/clojure/test_clojure/clojure_xml.clj
@@ -11,9 +11,18 @@
(ns clojure.test-clojure.clojure-xml
(:use clojure.test)
- (:require [clojure.xml :as xml]))
-
+ (:require [clojure.xml :as xml])
+ (:import [java.io ByteArrayInputStream]))
+(deftest CLJ-2611-avoid-XXE
+ (let [xml-str "
+
+ ]>
+&xxe; "]
+ (is (= {:tag :foo, :attrs nil, :content nil}
+ (with-open [input (ByteArrayInputStream. (.getBytes xml-str))]
+ (xml/parse input))))))
; parse
; emit-element
diff --git a/test/clojure/test_clojure/control.clj b/test/clojure/test_clojure/control.clj
index 92846ad38d..f3fe436b45 100644
--- a/test/clojure/test_clojure/control.clj
+++ b/test/clojure/test_clojure/control.clj
@@ -421,7 +421,14 @@
:b 1
:c -2
:d 4294967296
- :d 3))
+ :d 3)
+ (are [result input] (= result (case input
+ #{a} :set
+ :foo :keyword
+ a :symbol))
+ :symbol 'a
+ :keyword :foo
+ :set '#{a}))
(testing "test warn for hash collision"
(should-print-err-message
#"Performance warning, .*:\d+ - hash collision of some case test constants; if selected, those entries will be tested sequentially..*\r?\n"
diff --git a/test/clojure/test_clojure/data_structures.clj b/test/clojure/test_clojure/data_structures.clj
index 69baf137c6..854560466b 100644
--- a/test/clojure/test_clojure/data_structures.clj
+++ b/test/clojure/test_clojure/data_structures.clj
@@ -1330,3 +1330,34 @@
(is (= (hash (->Rec 1 1)) (hash (assoc r :a 1))))
(is (= (hash (->Rec 1 1)) (hash (dissoc r2 :c))))
(is (= (hash (->Rec 1 1)) (hash (dissoc (assoc r :c 1) :c))))))
+
+(deftest singleton-map-in-destructure-context
+ (let [sample-map {:a 1 :b 2}
+ {:keys [a] :as m1} (list sample-map)]
+ (is (= m1 sample-map))
+ (is (= a 1))))
+
+(deftest trailing-map-destructuring
+ (let [sample-map {:a 1 :b 2}
+ add (fn [& {:keys [a b]}] (+ a b))
+ addn (fn [n & {:keys [a b]}] (+ n a b))]
+ (testing "that kwargs are applied properly given a map in place of the key/val pairs"
+ (is (= 3 (add :a 1 :b 2)))
+ (is (= 3 (add {:a 1 :b 2})))
+ (is (= 13 (addn 10 :a 1 :b 2)))
+ (is (= 13 (addn 10 {:a 1 :b 2})))
+ (is (= 103 ((partial addn 100) :a 1 {:b 2})))
+ (is (= 103 ((partial addn 100 :a 1) {:b 2})))
+ (is (= 107 ((partial addn 100 :a 1) {:a 5 :b 2}))))
+ (testing "built maps"
+ (let [{:as m1} (list :a 1 :b 2)
+ {:as m2} (list :a 1 :b 2 {:c 3})
+ {:as m3} (list :a 1 :b 2 {:a 0})
+ {:keys [a4] :as m4} (list nil)]
+ (= m1 {:a 1 :b 2})
+ (= m2 {:a 1 :b 2 :c 3})
+ (= m3 {:a 0 :b 2})
+ (= m1 (seq-to-map-for-destructuring (list :a 1 :b 2)))
+ (= m2 (seq-to-map-for-destructuring (list :a 1 :b 2 {:c 3})))
+ (= m3 (seq-to-map-for-destructuring (list :a 1 :b 2 {:a 0})))
+ (= a4 nil)))))
diff --git a/test/clojure/test_clojure/java_interop.clj b/test/clojure/test_clojure/java_interop.clj
index 30fab56e56..4925284cc2 100644
--- a/test/clojure/test_clojure/java_interop.clj
+++ b/test/clojure/test_clojure/java_interop.clj
@@ -11,9 +11,13 @@
(ns clojure.test-clojure.java-interop
(:use clojure.test)
- (:require [clojure.inspector]
- [clojure.set :as set])
- (:import java.util.Base64))
+ (:require [clojure.data :as data]
+ [clojure.inspector]
+ [clojure.pprint :as pp]
+ [clojure.set :as set]
+ [clojure.test-clojure.proxy.examples :as proxy-examples])
+ (:import java.util.Base64
+ (java.util.concurrent.atomic AtomicLong AtomicInteger)))
; http://clojure.org/java_interop
; http://clojure.org/compilation
@@ -175,6 +179,37 @@
str)
"chain chain chain")))
+;https://clojure.atlassian.net/browse/CLJ-1973
+(deftest test-proxy-method-order
+ (let [class-reader (clojure.asm.ClassReader. proxy-examples/proxy1-class-name)
+ method-order (atom [])
+ method-visitor (proxy [clojure.asm.ClassVisitor] [clojure.asm.Opcodes/ASM4 nil]
+ (visitMethod [access name descriptor signature exceptions]
+ (swap! method-order conj {:name name :descriptor descriptor})
+ nil))
+ _ (.accept class-reader method-visitor 0)
+ expected [{:name "", :descriptor "()V"}
+ {:name "__initClojureFnMappings", :descriptor "(Lclojure/lang/IPersistentMap;)V"}
+ {:name "__updateClojureFnMappings", :descriptor "(Lclojure/lang/IPersistentMap;)V"}
+ {:name "__getClojureFnMappings", :descriptor "()Lclojure/lang/IPersistentMap;"}
+ {:name "clone", :descriptor "()Ljava/lang/Object;"}
+ {:name "hashCode", :descriptor "()I"}
+ {:name "toString", :descriptor "()Ljava/lang/String;"}
+ {:name "equals", :descriptor "(Ljava/lang/Object;)Z"}
+ {:name "a", :descriptor "(Ljava/io/File;)Z"}
+ {:name "a", :descriptor "(Ljava/lang/Boolean;)Ljava/lang/Object;"}
+ {:name "a", :descriptor "(Ljava/lang/Runnable;)Z"}
+ {:name "a", :descriptor "(Ljava/lang/String;)I"}
+ {:name "b", :descriptor "(Ljava/lang/String;)Ljava/lang/Object;"}
+ {:name "c", :descriptor "(Ljava/lang/String;)Ljava/lang/Object;"}
+ {:name "d", :descriptor "(Ljava/lang/String;)Ljava/lang/Object;"}
+ {:name "a", :descriptor "(Ljava/lang/Boolean;Ljava/lang/String;)I"}
+ {:name "a", :descriptor "(Ljava/lang/String;Ljava/io/File;)Z"}
+ {:name "a", :descriptor "(Ljava/lang/String;Ljava/lang/Runnable;)Z"}
+ {:name "a", :descriptor "(Ljava/lang/String;Ljava/lang/String;)I"}]
+ actual @method-order]
+ (is (= expected actual)
+ (with-out-str (pp/pprint (data/diff expected actual))))))
;; serialized-proxy can be regenerated using a modified version of
;; Clojure with the proxy serialization prohibition disabled and the
@@ -589,3 +624,18 @@
(is (= (char \a) \a)))
;; Note: More coercions in numbers.clj
+
+; Test that primitive boxing elision in statement context works
+; correctly (CLJ-2621)
+
+(defn inc-atomic-int [^AtomicInteger l]
+ (.incrementAndGet l)
+ nil)
+
+(defn inc-atomic-long [^AtomicLong l]
+ (.incrementAndGet l)
+ nil)
+
+(deftest test-boxing-prevention-when-compiling-statements
+ (is (= 1 (.get (doto (AtomicInteger. 0) inc-atomic-int))))
+ (is (= 1 (.get (doto (AtomicLong. 0) inc-atomic-long)))))
diff --git a/test/clojure/test_clojure/keywords.clj b/test/clojure/test_clojure/keywords.clj
index 9ef86d7dd2..614fbc14e2 100644
--- a/test/clojure/test_clojure/keywords.clj
+++ b/test/clojure/test_clojure/keywords.clj
@@ -23,3 +23,9 @@
(are [result lookup] (= result (find-keyword this-ns lookup))
::foo "foo"
nil (str absent-keyword-sym)))))
+
+(deftest arity-exceptions
+ (is (thrown-with-msg? IllegalArgumentException #"Wrong number of args \(0\) passed to: :kw" (:kw)))
+ (is (thrown-with-msg? IllegalArgumentException #"Wrong number of args \(20\) passed to: :foo/bar" (apply :foo/bar (range 20))))
+ (is (thrown-with-msg? IllegalArgumentException #"Wrong number of args \(21\) passed to: :foo/bar" (apply :foo/bar (range 21))))
+ (is (thrown-with-msg? IllegalArgumentException #"Wrong number of args \(22\) passed to: :foo/bar" (apply :foo/bar (range 22)))))
diff --git a/test/clojure/test_clojure/math.clj b/test/clojure/test_clojure/math.clj
new file mode 100644
index 0000000000..4520b41b2b
--- /dev/null
+++ b/test/clojure/test_clojure/math.clj
@@ -0,0 +1,326 @@
+; Copyright (c) Rich Hickey. All rights reserved.
+; The use and distribution terms for this software are covered by the
+; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+; which can be found in the file epl-v10.html at the root of this distribution.
+; By using this software in any fashion, you are agreeing to be bound by
+; the terms of this license.
+; You must not remove this notice, or any other, from this software.
+
+(ns clojure.test-clojure.math
+ (:require
+ [clojure.test :refer :all]
+ [clojure.math :as m]))
+
+(set! *warn-on-reflection* true)
+
+(defn neg-zero?
+ [^double d]
+ (and (zero? d) (< (Double/compare d 0.0) 0)))
+
+(defn pos-zero?
+ [^double d]
+ (and (zero? d) (not (< (Double/compare d 0.0) 0))))
+
+(defn ulp=
+ "Tests that y = x +/- m*ulp(x)"
+ [x y ^double m]
+ (let [mu (* (m/ulp x) m)]
+ (<= (- x mu) y (+ x mu))))
+
+(deftest test-sin
+ (is (NaN? (m/sin ##NaN)))
+ (is (NaN? (m/sin ##-Inf)))
+ (is (NaN? (m/sin ##Inf)))
+ (is (pos-zero? (m/sin 0.0)))
+ (is (neg-zero? (m/sin -0.0)))
+ (is (ulp= (m/sin m/PI) (- (m/sin (- m/PI))) 1)))
+
+(deftest test-cos
+ (is (NaN? (m/cos ##NaN)))
+ (is (NaN? (m/cos ##-Inf)))
+ (is (NaN? (m/cos ##Inf)))
+ (is (= 1.0 (m/cos 0.0) (m/cos -0.0)))
+ (is (ulp= (m/cos m/PI) (m/cos (- m/PI)) 1)))
+
+(deftest test-tan
+ (is (NaN? (m/tan ##NaN)))
+ (is (NaN? (m/tan ##-Inf)))
+ (is (NaN? (m/tan ##Inf)))
+ (is (pos-zero? (m/tan 0.0)))
+ (is (neg-zero? (m/tan -0.0)))
+ (is (ulp= (- (m/tan m/PI)) (m/tan (- m/PI)) 1)))
+
+(deftest test-asin
+ (is (NaN? (m/asin ##NaN)))
+ (is (NaN? (m/asin 2.0)))
+ (is (NaN? (m/asin -2.0)))
+ (is (zero? (m/asin -0.0))))
+
+(deftest test-acos
+ (is (NaN? (m/acos ##NaN)))
+ (is (NaN? (m/acos -2.0)))
+ (is (NaN? (m/acos 2.0)))
+ (is (ulp= (* 2 (m/acos 0.0)) m/PI 1)))
+
+(deftest test-atan
+ (is (NaN? (m/atan ##NaN)))
+ (is (pos-zero? (m/atan 0.0)))
+ (is (neg-zero? (m/atan -0.0)))
+ (is (ulp= (m/atan 1) 0.7853981633974483 1)))
+
+(deftest test-radians-degrees-roundtrip
+ (doseq [d (range 0.0 360.0 5.0)]
+ (is (ulp= (m/round d) (m/round (-> d m/to-radians m/to-degrees)) 1))))
+
+(deftest test-exp
+ (is (NaN? (m/exp ##NaN)))
+ (is (= ##Inf (m/exp ##Inf)))
+ (is (pos-zero? (m/exp ##-Inf)))
+ (is (ulp= (m/exp 0.0) 1.0 1))
+ (is (ulp= (m/exp 1) m/E 1)))
+
+(deftest test-log
+ (is (NaN? (m/log ##NaN)))
+ (is (NaN? (m/log -1.0)))
+ (is (= ##Inf (m/log ##Inf)))
+ (is (= ##-Inf (m/log 0.0)))
+ (is (ulp= (m/log m/E) 1.0 1)))
+
+(deftest test-log10
+ (is (NaN? (m/log10 ##NaN)))
+ (is (NaN? (m/log10 -1.0)))
+ (is (= ##Inf (m/log10 ##Inf)))
+ (is (= ##-Inf (m/log10 0.0)))
+ (is (ulp= (m/log10 10) 1.0 1)))
+
+(deftest test-sqrt
+ (is (NaN? (m/sqrt ##NaN)))
+ (is (NaN? (m/sqrt -1.0)))
+ (is (= ##Inf (m/sqrt ##Inf)))
+ (is (pos-zero? (m/sqrt 0)))
+ (is (= (m/sqrt 4.0) 2.0)))
+
+(deftest test-cbrt
+ (is (NaN? (m/cbrt ##NaN)))
+ (is (= ##-Inf (m/cbrt ##-Inf)))
+ (is (= ##Inf (m/cbrt ##Inf)))
+ (is (pos-zero? (m/cbrt 0)))
+ (is (= 2.0 (m/cbrt 8.0))))
+
+(deftest test-IEEE-remainder
+ (is (NaN? (m/IEEE-remainder ##NaN 1.0)))
+ (is (NaN? (m/IEEE-remainder 1.0 ##NaN)))
+ (is (NaN? (m/IEEE-remainder ##Inf 2.0)))
+ (is (NaN? (m/IEEE-remainder ##-Inf 2.0)))
+ (is (NaN? (m/IEEE-remainder 2 0.0)))
+ (is (= 1.0 (m/IEEE-remainder 5.0 4.0))))
+
+(deftest test-ceil
+ (is (NaN? (m/ceil ##NaN)))
+ (is (= ##Inf (m/ceil ##Inf)))
+ (is (= ##-Inf (m/ceil ##-Inf)))
+ (is (= 4.0 (m/ceil m/PI))))
+
+(deftest test-floor
+ (is (NaN? (m/floor ##NaN)))
+ (is (= ##Inf (m/floor ##Inf)))
+ (is (= ##-Inf (m/floor ##-Inf)))
+ (is (= 3.0 (m/floor m/PI))))
+
+(deftest test-rint
+ (is (NaN? (m/rint ##NaN)))
+ (is (= ##Inf (m/rint ##Inf)))
+ (is (= ##-Inf (m/rint ##-Inf)))
+ (is (= 1.0 (m/rint 1.2)))
+ (is (neg-zero? (m/rint -0.01))))
+
+(deftest test-atan2
+ (is (NaN? (m/atan2 ##NaN 1.0)))
+ (is (NaN? (m/atan2 1.0 ##NaN)))
+ (is (pos-zero? (m/atan2 0.0 1.0)))
+ (is (neg-zero? (m/atan2 -0.0 1.0)))
+ (is (ulp= (m/atan2 0.0 -1.0) m/PI 2))
+ (is (ulp= (m/atan2 -0.0 -1.0) (- m/PI) 2))
+ (is (ulp= (* 2.0 (m/atan2 1.0 0.0)) m/PI 2))
+ (is (ulp= (* -2.0 (m/atan2 -1.0 0.0)) m/PI 2))
+ (is (ulp= (* 4.0 (m/atan2 ##Inf ##Inf)) m/PI 2))
+ (is (ulp= (/ (* 4.0 (m/atan2 ##Inf ##-Inf)) 3.0) m/PI 2))
+ (is (ulp= (* -4.0 (m/atan2 ##-Inf ##Inf)) m/PI 2))
+ (is (ulp= (/ (* -4.0 (m/atan2 ##-Inf ##-Inf)) 3.0) m/PI 2)))
+
+(deftest test-pow
+ (is (= 1.0 (m/pow 4.0 0.0)))
+ (is (= 1.0 (m/pow 4.0 -0.0)))
+ (is (= 4.2 (m/pow 4.2 1.0)))
+ (is (NaN? (m/pow 4.2 ##NaN)))
+ (is (NaN? (m/pow ##NaN 2.0)))
+ (is (= ##Inf (m/pow 2.0 ##Inf)))
+ (is (= ##Inf (m/pow 0.5 ##-Inf)))
+ (is (= 0.0 (m/pow 2.0 ##-Inf)))
+ (is (= 0.0 (m/pow 0.5 ##Inf)))
+ (is (NaN? (m/pow 1.0 ##Inf)))
+ (is (pos-zero? (m/pow 0.0 1.5)))
+ (is (pos-zero? (m/pow ##Inf -2.0)))
+ (is (= ##Inf (m/pow 0.0 -2.0)))
+ (is (= ##Inf (m/pow ##Inf 2.0)))
+ (is (pos-zero? (m/pow -0.0 1.5)))
+ (is (pos-zero? (m/pow ##-Inf -1.5)))
+ (is (neg-zero? (m/pow -0.0 3.0)))
+ (is (neg-zero? (m/pow ##-Inf -3.0)))
+ (is (= ##Inf (m/pow -0.0 -1.5)))
+ (is (= ##Inf (m/pow ##-Inf 2.5)))
+ (is (= ##-Inf (m/pow -0.0 -3.0)))
+ (is (= ##-Inf (m/pow ##-Inf 3.0)))
+ (is (= 4.0 (m/pow -2.0 2.0)))
+ (is (= -8.0 (m/pow -2.0 3.0)))
+ (is (= 8.0 (m/pow 2.0 3.0))))
+
+(deftest test-round
+ (is (= 0 (m/round ##NaN)))
+ (is (= Long/MIN_VALUE (m/round ##-Inf)))
+ (is (= Long/MIN_VALUE (m/round (- Long/MIN_VALUE 2.0))))
+ (is (= Long/MAX_VALUE (m/round ##Inf)))
+ (is (= Long/MAX_VALUE (m/round (+ Long/MAX_VALUE 2.0))))
+ (is (= 4 (m/round 3.5))))
+
+(deftest test-add-exact
+ (try
+ (m/add-exact Long/MAX_VALUE 1)
+ (is false)
+ (catch ArithmeticException _
+ (is true))))
+
+(deftest test-subtract-exact
+ (try
+ (m/subtract-exact Long/MIN_VALUE 1)
+ (is false)
+ (catch ArithmeticException _
+ (is true))))
+
+(deftest test-multiply-exact
+ (try
+ (m/multiply-exact Long/MAX_VALUE 2)
+ (is false)
+ (catch ArithmeticException _
+ (is true))))
+
+(deftest test-increment-exact
+ (try
+ (m/increment-exact Long/MAX_VALUE)
+ (is false)
+ (catch ArithmeticException _
+ (is true))))
+
+(deftest test-decrement-exact
+ (try
+ (m/decrement-exact Long/MIN_VALUE)
+ (is false)
+ (catch ArithmeticException _
+ (is true))))
+
+(deftest test-negate-exact
+ (is (= (inc Long/MIN_VALUE) (m/negate-exact Long/MAX_VALUE)))
+ (try
+ (m/negate-exact Long/MIN_VALUE)
+ (is false)
+ (catch ArithmeticException _
+ (is true))))
+
+(deftest test-floor-div
+ (is (= Long/MIN_VALUE (m/floor-div Long/MIN_VALUE -1)))
+ (is (= -1 (m/floor-div -2 5))))
+
+(deftest test-floor-mod
+ (is (= 3 (m/floor-mod -2 5))))
+
+(deftest test-ulp
+ (is (NaN? (m/ulp ##NaN)))
+ (is (= ##Inf (m/ulp ##Inf)))
+ (is (= ##Inf (m/ulp ##-Inf)))
+ (is (= Double/MIN_VALUE (m/ulp 0.0)))
+ (is (= (m/pow 2 971) (m/ulp Double/MAX_VALUE)))
+ (is (= (m/pow 2 971) (m/ulp (- Double/MAX_VALUE)))))
+
+(deftest test-signum
+ (is (NaN? (m/signum ##NaN)))
+ (is (zero? (m/signum 0.0)))
+ (is (zero? (m/signum -0.0)))
+ (is (= 1.0 (m/signum 42.0)))
+ (is (= -1.0 (m/signum -42.0))))
+
+(deftest test-sinh
+ (is (NaN? (m/sinh ##NaN)))
+ (is (= ##Inf (m/sinh ##Inf)))
+ (is (= ##-Inf (m/sinh ##-Inf)))
+ (is (= 0.0 (m/sinh 0.0))))
+
+(deftest test-cosh
+ (is (NaN? (m/cosh ##NaN)))
+ (is (= ##Inf (m/cosh ##Inf)))
+ (is (= ##Inf (m/cosh ##-Inf)))
+ (is (= 1.0 (m/cosh 0.0))))
+
+(deftest test-tanh
+ (is (NaN? (m/tanh ##NaN)))
+ (is (= 1.0 (m/tanh ##Inf)))
+ (is (= -1.0 (m/tanh ##-Inf)))
+ (is (= 0.0 (m/tanh 0.0))))
+
+(deftest test-hypot
+ (is (= ##Inf (m/hypot 1.0 ##Inf)))
+ (is (= ##Inf (m/hypot ##Inf 1.0)))
+ (is (NaN? (m/hypot ##NaN 1.0)))
+ (is (NaN? (m/hypot 1.0 ##NaN)))
+ (is (= 13.0 (m/hypot 5.0 12.0))))
+
+(deftest test-expm1
+ (is (NaN? (m/expm1 ##NaN)))
+ (is (= ##Inf (m/expm1 ##Inf)))
+ (is (= -1.0 (m/expm1 ##-Inf)))
+ (is (= 0.0 (m/expm1 0.0))))
+
+(deftest test-log1p
+ (is (NaN? (m/log1p ##NaN)))
+ (is (= ##Inf (m/log1p ##Inf)))
+ (is (= ##-Inf (m/log1p -1.0)))
+ (is (pos-zero? (m/log1p 0.0)))
+ (is (neg-zero? (m/log1p -0.0))))
+
+(deftest test-copy-sign
+ (is (= 1.0 (m/copy-sign 1.0 42.0)))
+ (is (= -1.0 (m/copy-sign 1.0 -42.0)))
+ (is (= -1.0 (m/copy-sign 1.0 ##-Inf))))
+
+(deftest test-get-exponent
+ (is (= (inc Double/MAX_EXPONENT) (m/get-exponent ##NaN)))
+ (is (= (inc Double/MAX_EXPONENT) (m/get-exponent ##Inf)))
+ (is (= (inc Double/MAX_EXPONENT) (m/get-exponent ##-Inf)))
+ (is (= (dec Double/MIN_EXPONENT) (m/get-exponent 0.0)))
+ (is (= 0 (m/get-exponent 1.0)))
+ (is (= 13 (m/get-exponent 12345.678))))
+
+(deftest test-next-after
+ (is (NaN? (m/next-after ##NaN 1)))
+ (is (NaN? (m/next-after 1 ##NaN)))
+ (is (pos-zero? (m/next-after 0.0 0.0)))
+ (is (neg-zero? (m/next-after -0.0 -0.0)))
+ (is (= Double/MAX_VALUE (m/next-after ##Inf 1.0)))
+ (is (pos-zero? (m/next-after Double/MIN_VALUE -1.0))))
+
+(deftest test-next-up
+ (is (NaN? (m/next-up ##NaN)))
+ (is (= ##Inf (m/next-up ##Inf)))
+ (is (= Double/MIN_VALUE (m/next-up 0.0))))
+
+(deftest test-next-down
+ (is (NaN? (m/next-down ##NaN)))
+ (is (= ##-Inf (m/next-down ##-Inf)))
+ (is (= (- Double/MIN_VALUE) (m/next-down 0.0))))
+
+(deftest test-scalb
+ (is (NaN? (m/scalb ##NaN 1)))
+ (is (= ##Inf (m/scalb ##Inf 1)))
+ (is (= ##-Inf (m/scalb ##-Inf 1)))
+ (is (pos-zero? (m/scalb 0.0 2)))
+ (is (neg-zero? (m/scalb -0.0 2)))
+ (is (= 32.0 (m/scalb 2.0 4))))
diff --git a/test/clojure/test_clojure/multimethods.clj b/test/clojure/test_clojure/multimethods.clj
index 924b0bcbeb..435f0f64a5 100644
--- a/test/clojure/test_clojure/multimethods.clj
+++ b/test/clojure/test_clojure/multimethods.clj
@@ -203,6 +203,43 @@
(testing "The prefers method now returns the correct table"
(is (= {[::rect ::shape] #{[::shape ::rect]}} (prefers bar)))))
+(deftest indirect-preferences-mulitmethod-test
+ (testing "Using global hierarchy"
+ (derive ::parent-1 ::grandparent-1)
+ (derive ::parent-2 ::grandparent-2)
+ (derive ::child ::parent-1)
+ (derive ::child ::parent-2)
+ (testing "x should be preferred over y if x is preferred over an ancestor of y"
+ (defmulti indirect-1 keyword)
+ (prefer-method indirect-1 ::parent-1 ::grandparent-2)
+ (defmethod indirect-1 ::parent-1 [_] ::parent-1)
+ (defmethod indirect-1 ::parent-2 [_] ::parent-2)
+ (is (= ::parent-1 (indirect-1 ::child))))
+ (testing "x should be preferred over y if an ancestor of x is preferred over y"
+ (defmulti indirect-2 keyword)
+ (prefer-method indirect-2 ::grandparent-1 ::parent-2)
+ (defmethod indirect-2 ::parent-1 [_] ::parent-1)
+ (defmethod indirect-2 ::parent-2 [_] ::parent-2)
+ (is (= ::parent-1 (indirect-2 ::child)))))
+ (testing "Using custom hierarchy"
+ (def local-h (-> (make-hierarchy)
+ (derive :parent-1 :grandparent-1)
+ (derive :parent-2 :grandparent-2)
+ (derive :child :parent-1)
+ (derive :child :parent-2)))
+ (testing "x should be preferred over y if x is preferred over an ancestor of y"
+ (defmulti indirect-3 keyword :hierarchy #'local-h)
+ (prefer-method indirect-3 :parent-1 :grandparent-2)
+ (defmethod indirect-3 :parent-1 [_] :parent-1)
+ (defmethod indirect-3 :parent-2 [_] :parent-2)
+ (is (= :parent-1 (indirect-3 :child))))
+ (testing "x should be preferred over y if an ancestor of x is preferred over y"
+ (defmulti indirect-4 keyword :hierarchy #'local-h)
+ (prefer-method indirect-4 :grandparent-1 :parent-2)
+ (defmethod indirect-4 :parent-1 [_] :parent-1)
+ (defmethod indirect-4 :parent-2 [_] :parent-2)
+ (is (= :parent-1 (indirect-4 :child))))))
+
(deftest remove-all-methods-test
(testing "Core function remove-all-methods works"
(defmulti simple1 identity)
diff --git a/test/clojure/test_clojure/ns_libs.clj b/test/clojure/test_clojure/ns_libs.clj
index 0e470d7394..256f99ae87 100644
--- a/test/clojure/test_clojure/ns_libs.clj
+++ b/test/clojure/test_clojure/ns_libs.clj
@@ -103,3 +103,43 @@
(is (thrown-with-cause-msg? clojure.lang.Compiler$CompilerException
#"defrecord and deftype fields must be symbols, user\.MyType had: :key1"
(eval '(deftype MyType [:key1])))))
+
+(deftest require-as-alias
+ ;; :as-alias does not load
+ (require '[not.a.real.ns [foo :as-alias foo]
+ [bar :as-alias bar]])
+ (let [aliases (ns-aliases *ns*)
+ foo-ns (get aliases 'foo)
+ bar-ns (get aliases 'bar)]
+ (is (= 'not.a.real.ns.foo (ns-name foo-ns)))
+ (is (= 'not.a.real.ns.bar (ns-name bar-ns))))
+
+ (is (= :not.a.real.ns.foo/baz (read-string "::foo/baz")))
+
+ ;; can use :as-alias in use, but load will occur
+ (use '[clojure.walk :as-alias e1])
+ (is (= 'clojure.walk (ns-name (get (ns-aliases *ns*) 'e1))))
+ (is (= :clojure.walk/walk (read-string "::e1/walk")))
+
+ ;; can use both :as and :as-alias
+ (require '[clojure.set :as n1 :as-alias n2])
+ (let [aliases (ns-aliases *ns*)]
+ (is (= 'clojure.set (ns-name (get aliases 'n1))))
+ (is (= 'clojure.set (ns-name (get aliases 'n2))))
+ (is (= (resolve 'n1/union) #'clojure.set/union))
+ (is (= (resolve 'n2/union) #'clojure.set/union))))
+
+(deftest require-as-alias-then-load-later
+ ;; alias but don't load
+ (require '[clojure.test-clojure.ns-libs-load-later :as-alias alias-now])
+ (is (contains? (ns-aliases *ns*) 'alias-now))
+ (is (not (nil? (find-ns 'clojure.test-clojure.ns-libs-load-later))))
+
+ ;; not loaded!
+ (is (nil? (resolve 'alias-now/example)))
+
+ ;; load
+ (require 'clojure.test-clojure.ns-libs-load-later)
+
+ ;; now loaded!
+ (is (not (nil? (resolve 'alias-now/example)))))
\ No newline at end of file
diff --git a/test/clojure/test_clojure/ns_libs_load_later.clj b/test/clojure/test_clojure/ns_libs_load_later.clj
new file mode 100644
index 0000000000..2a45b86ab9
--- /dev/null
+++ b/test/clojure/test_clojure/ns_libs_load_later.clj
@@ -0,0 +1,12 @@
+; Copyright (c) Rich Hickey. All rights reserved.
+; The use and distribution terms for this software are covered by the
+; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+; which can be found in the file epl-v10.html at the root of this distribution.
+; By using this software in any fashion, you are agreeing to be bound by
+; the terms of this license.
+; You must not remove this notice, or any other, from this software.
+
+;; used by clojure.test-clojure.ns-libs/require-as-alias-then-load-later
+(ns clojure.test-clojure.ns-libs-load-later)
+
+(defn example [] true)
diff --git a/test/clojure/test_clojure/numbers.clj b/test/clojure/test_clojure/numbers.clj
index 26140a7c29..bf822cc947 100644
--- a/test/clojure/test_clojure/numbers.clj
+++ b/test/clojure/test_clojure/numbers.clj
@@ -181,9 +181,12 @@
(let [wrapped (fn [x]
(try
(f x)
- (catch IllegalArgumentException e :error)))]
+ (catch RuntimeException e :error)))]
(is (= vals (map wrapped inputs)))))))
+(deftest test-prim-with-matching-hint
+ (is (= 1 (let [x 1.2] (Math/round ^double x)))))
+
;; *** Functions ***
(defonce DELTA 1e-12)
@@ -644,6 +647,20 @@ Math/pow overflows to Infinity."
(is (= java.lang.Long (class (min 1.0 2.0 -10))))
(is (= java.lang.Double (class (min 1 2 -10.0 3 4 5))))))
+(deftest test-abs
+ (are [in ex] (= ex (abs in))
+ -1 1
+ 1 1
+ Long/MIN_VALUE Long/MIN_VALUE ;; special case!
+ -1.0 1.0
+ -0.0 0.0
+ ##-Inf ##Inf
+ ##Inf ##Inf
+ -123.456M 123.456M
+ -123N 123N
+ -1/5 1/5)
+ (is (NaN? (abs ##NaN))))
+
(deftest clj-868
(testing "min/max: NaN is contagious"
(letfn [(fnan? [^Float x] (Float/isNaN x))
diff --git a/test/clojure/test_clojure/other_functions.clj b/test/clojure/test_clojure/other_functions.clj
index 0f3093d183..517f633fcc 100644
--- a/test/clojure/test_clojure/other_functions.clj
+++ b/test/clojure/test_clojure/other_functions.clj
@@ -277,7 +277,9 @@
((some-fn number? odd? #(> % 0)) 2 4 6 8 -10)
;; 3 preds, short-circuiting
((some-fn number? odd? #(> % 0)) 1 :a)
+ ((some-fn number? odd? #(> % 0)) :a 1)
((some-fn number? odd? #(> % 0)) 1 3 :a)
+ ((some-fn number? odd? #(> % 0)) :a 1 3)
((some-fn number? odd? #(> % 0)) 1 3 5 :a)
((some-fn number? odd? #(> % 0)) 1 :a 3 5 7)
;; 4 preds
@@ -379,3 +381,21 @@
;; rest arity
{:a 5} (update {:a 1} :a + 1 1 1 1)
{:a 6} (update {:a 1} :a + 1 1 1 1 1)))
+
+(deftest test-update-vals
+ (let [inm (with-meta {:a 1 :b 2} {:has :meta})]
+ (are [result expr] (= result expr)
+ {:a 2 :b 3} (update-vals inm inc)
+ {:has :meta} (meta (update-vals inm inc))
+ {0 2 2 4} (update-vals (hash-map 0 1 2 3) inc)
+ {0 2 2 4} (update-vals (array-map 0 1 2 3) inc)
+ {0 2 2 4} (update-vals (sorted-map 2 3 0 1) inc))))
+
+(deftest test-update-keys
+ (let [inm (with-meta {:a 1 :b 2} {:has :meta})]
+ (are [result expr] (= result expr)
+ {"a" 1 "b" 2} (update-keys inm name)
+ {:has :meta} (meta (update-keys inm name))
+ {1 1 3 3} (update-keys (hash-map 0 1 2 3) inc)
+ {1 1 3 3} (update-keys (array-map 0 1 2 3) inc)
+ {1 1 3 3} (update-keys (sorted-map 2 3 0 1) inc))))
diff --git a/test/clojure/test_clojure/parse.clj b/test/clojure/test_clojure/parse.clj
new file mode 100644
index 0000000000..8078c527f6
--- /dev/null
+++ b/test/clojure/test_clojure/parse.clj
@@ -0,0 +1,102 @@
+(ns clojure.test-clojure.parse
+ (:require
+ [clojure.test :refer :all]
+ [clojure.test.check :as chk]
+ [clojure.test.check.generators :as gen]
+ [clojure.test.check.properties :as prop])
+ (:import
+ [java.util UUID]))
+
+(deftest test-parse-long
+ (are [s expected]
+ (= expected (parse-long s))
+ "100" 100
+ "+100" 100
+ "0" 0
+ "+0" 0
+ "-0" 0
+ "-42" -42
+ "9223372036854775807" Long/MAX_VALUE
+ "+9223372036854775807" Long/MAX_VALUE
+ "-9223372036854775808" Long/MIN_VALUE
+ "077" 77) ;; leading 0s are ignored! (not octal)
+
+ (are [s] ;; do not parse
+ (nil? (parse-long s))
+ "0.3" ;; no float
+ "9223372036854775808" ;; past max long
+ "-9223372036854775809" ;; past min long
+ "0xA0" ;; no hex
+ "2r010")) ;; no radix support
+
+;; generative test - gen long -> str -> parse, compare
+(deftest test-gen-parse-long
+ (let [res (chk/quick-check
+ 100000
+ (prop/for-all* [gen/large-integer]
+ #(= % (-> % str parse-long))))]
+ (if (:result res)
+ (is true) ;; pass
+ (is (:result res) (pr-str res)))))
+
+(deftest test-parse-double
+ (are [s expected]
+ (= expected (parse-double s))
+ "1.234" 1.234
+ "+1.234" 1.234
+ "-1.234" -1.234
+ "+0" +0.0
+ "-0.0" -0.0
+ "0.0" 0.0
+ "5" 5.0
+ "Infinity" Double/POSITIVE_INFINITY
+ "-Infinity" Double/NEGATIVE_INFINITY
+ "1.7976931348623157E308" Double/MAX_VALUE
+ "4.9E-324" Double/MIN_VALUE
+ "1.7976931348623157E309" Double/POSITIVE_INFINITY ;; past max double
+ "2.5e-324" Double/MIN_VALUE ;; past min double, above half minimum
+ "2.4e-324" 0.0) ;; below minimum double
+ (is (Double/isNaN (parse-double "NaN")))
+ (are [s] ;; nil on invalid string
+ (nil? (parse-double s))
+ "double" ;; invalid string
+ "1.7976931348623157G309")) ;; invalid, but similar to valid
+
+;; generative test - gen double -> str -> parse, compare
+(deftest test-gen-parse-double
+ (let [res (chk/quick-check
+ 100000
+ (prop/for-all* [gen/double]
+ #(let [parsed (-> % str parse-double)]
+ (if (Double/isNaN %)
+ (Double/isNaN parsed)
+ (= % parsed)))))]
+ (if (:result res)
+ (is true) ;; pass
+ (is (:result res) (pr-str res)))))
+
+(deftest test-parse-uuid
+ (is (parse-uuid (.toString (UUID/randomUUID))))
+ (is (nil? (parse-uuid "BOGUS"))) ;; nil on invalid uuid string
+ (are [s] ;; throw on invalid type (not string)
+ (try (parse-uuid s) (is false) (catch Throwable _ (is true)))
+ 123
+ nil))
+
+(deftest test-parse-boolean
+ (is (identical? true (parse-boolean "true")))
+ (is (identical? false (parse-boolean "false")))
+
+ (are [s] ;; nil on invalid string
+ (nil? (parse-boolean s))
+ "abc"
+ "TRUE"
+ "FALSE"
+ " true ")
+
+ (are [s] ;; throw on invalid type (not string)
+ (try (parse-boolean s) (is false) (catch Throwable _ (is true)))
+ nil
+ false
+ true
+ 100))
diff --git a/test/clojure/test_clojure/predicates.clj b/test/clojure/test_clojure/predicates.clj
index 7efdc6fe71..bb9074fb5f 100644
--- a/test/clojure/test_clojure/predicates.clj
+++ b/test/clojure/test_clojure/predicates.clj
@@ -172,3 +172,23 @@
(dotimes [i (count row)]
(is (= ((resolve (nth preds i)) v) (nth row i))
(pr-str (list (nth preds i) v))))))))
+
+;; Special double predicates
+
+(deftest test-double-preds
+ (is (NaN? ##NaN))
+ (is (NaN? (Double/parseDouble "NaN")))
+ (is (NaN? (Float/parseFloat "NaN")))
+ (is (NaN? Float/NaN))
+ (is (not (NaN? 5)))
+ (is (thrown? Throwable (NaN? nil)))
+ (is (thrown? Throwable (NaN? :xyz)))
+
+ (is (infinite? ##Inf))
+ (is (infinite? ##-Inf))
+ (is (infinite? Double/POSITIVE_INFINITY))
+ (is (infinite? Double/NEGATIVE_INFINITY))
+ (is (infinite? Float/POSITIVE_INFINITY))
+ (is (infinite? Float/NEGATIVE_INFINITY))
+ (is (thrown? Throwable (infinite? nil)))
+ (is (thrown? Throwable (infinite? :xyz))))
\ No newline at end of file
diff --git a/test/clojure/test_clojure/protocols.clj b/test/clojure/test_clojure/protocols.clj
index 3072915481..4e951449bb 100644
--- a/test/clojure/test_clojure/protocols.clj
+++ b/test/clojure/test_clojure/protocols.clj
@@ -47,13 +47,13 @@
(deftest protocols-test
(testing "protocol fns have useful metadata"
(let [common-meta {:ns (find-ns 'clojure.test-clojure.protocols.examples)
- :protocol #'ExampleProtocol}]
- (are [m f] (= (merge (quote m) common-meta)
+ :protocol #'ExampleProtocol :tag nil}]
+ (are [m f] (= (merge common-meta m)
(meta (var f)))
- {:name foo :arglists ([a]) :doc "method with one arg"} foo
- {:name bar :arglists ([a b]) :doc "method with two args"} bar
- {:name baz :arglists ([a] [a b]) :doc "method with multiple arities" :tag String} baz
- {:name with-quux :arglists ([a]) :doc "method name with a hyphen"} with-quux)))
+ {:name 'foo :arglists '([a]) :doc "method with one arg"} foo
+ {:name 'bar :arglists '([a b]) :doc "method with two args"} bar
+ {:name 'baz :arglists '([a] [a b]) :doc "method with multiple arities" :tag 'java.lang.String} baz
+ {:name 'with-quux :arglists '([a]) :doc "method name with a hyphen"} with-quux)))
(testing "protocol fns throw IllegalArgumentException if no impl matches"
(is (thrown-with-msg?
IllegalArgumentException
@@ -674,3 +674,34 @@
(deftest test-leading-dashes
(is (= 10 (-do-dashed (Dashed.))))
(is (= [10] (map -do-dashed [(Dashed.)]))))
+
+;; see CLJ-1879
+
+(deftest test-base-reduce-kv
+ (is (= {1 :a 2 :b}
+ (reduce-kv #(assoc %1 %3 %2)
+ {}
+ (seq {:a 1 :b 2})))))
+
+(defn aget-long-hinted ^long [x] (aget (longs-hinted x) 0))
+
+(deftest test-longs-hinted-proto
+ (is (= 1
+ (aget-long-hinted
+ (reify LongsHintedProto
+ (longs-hinted [_] (long-array [1])))))))
+
+;; CLJ-1180 - resolve type hints in protocol methods
+
+(import 'clojure.lang.ISeq)
+(defprotocol P
+ (^ISeq f [_]))
+(ns clojure.test-clojure.protocols.other
+ (:use clojure.test))
+(defn cf [val]
+ (let [aseq (clojure.test-clojure.protocols/f val)]
+ (count aseq)))
+(extend-protocol clojure.test-clojure.protocols/P String
+ (f [s] (seq s)))
+(deftest test-resolve-type-hints-in-protocol-methods
+ (is (= 4 (clojure.test-clojure.protocols/f "test"))))
diff --git a/test/clojure/test_clojure/protocols/examples.clj b/test/clojure/test_clojure/protocols/examples.clj
index 9d962d5651..0c247eab04 100644
--- a/test/clojure/test_clojure/protocols/examples.clj
+++ b/test/clojure/test_clojure/protocols/examples.clj
@@ -17,3 +17,5 @@
(hinted [^int i])
(hinted [^String s]))
+(defprotocol LongsHintedProto
+ (^longs longs-hinted [_]))
diff --git a/test/clojure/test_clojure/proxy/examples.clj b/test/clojure/test_clojure/proxy/examples.clj
new file mode 100644
index 0000000000..b98042320f
--- /dev/null
+++ b/test/clojure/test_clojure/proxy/examples.clj
@@ -0,0 +1,30 @@
+; Copyright (c) Rich Hickey. All rights reserved.
+; The use and distribution terms for this software are covered by the
+; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+; which can be found in the file epl-v10.html at the root of this distribution.
+; By using this software in any fashion, you are agreeing to be bound by
+; the terms of this license.
+; You must not remove this notice, or any other, from this software.
+
+(ns ^{:doc "Test proxy classes that are AOT-compiled for the tests in
+ clojure.test-clojure.java-interop."
+ :author "Ambrose Bonnaire-Sergeant"}
+ clojure.test-clojure.proxy.examples)
+
+(definterface A
+ (^int a [^String x])
+ (^boolean a [^java.io.File x])
+ (^boolean a [^Runnable x])
+ (a [^Boolean x])
+ (^int a [^Boolean x ^String y])
+ (^int a [^String x ^String y])
+ (^boolean a [^String x ^java.io.File y])
+ (^boolean a [^String x ^Runnable y])
+ (b [^String x])
+ (c [^String x])
+ (d [^String x]))
+
+(def ^String proxy1-class-name
+ (-> (proxy [A] [])
+ class
+ .getName))
diff --git a/test/clojure/test_clojure/run_single_test.clj b/test/clojure/test_clojure/run_single_test.clj
new file mode 100644
index 0000000000..abf1084c0a
--- /dev/null
+++ b/test/clojure/test_clojure/run_single_test.clj
@@ -0,0 +1,33 @@
+; Copyright (c) Rich Hickey. All rights reserved.
+; The use and distribution terms for this software are covered by the
+; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+; which can be found in the file epl-v10.html at the root of this distribution.
+; By using this software in any fashion, you are agreeing to be bound by
+; the terms of this license.
+; You must not remove this notice, or any other, from this software.
+
+(ns clojure.test-clojure.run-single-test
+ (:require [clojure.test :refer [is deftest run-test run-tests]]
+ [clojure.test-helper :refer [with-err-string-writer]]
+ [clojure.test-clojure.test-fixtures :as tf]))
+
+(defn not-a-test
+ [])
+
+(defmacro should-print-to-err
+ [re & body]
+ `(is (re-find ~re (with-err-string-writer ~@body))))
+
+(deftest reports-missing-var
+ (should-print-to-err #"^Unable to resolve .*/function-missing to a test function.*"
+ (let [result (eval `(run-test function-missing))]
+ (is (nil? result)))))
+
+(deftest reports-non-test-var
+ (should-print-to-err #"^.*/not-a-test is not a test.*"
+ (let [result (eval `(run-test not-a-test))]
+ (is (nil? result)))))
+
+(deftest can-run-test-with-fixtures
+ (is (= {:test 1, :pass 2, :fail 0, :error 0, :type :summary}
+ (run-test tf/can-use-once-fixtures))))
diff --git a/test/clojure/test_clojure/sequences.clj b/test/clojure/test_clojure/sequences.clj
index 54d640f72d..f0927061a4 100644
--- a/test/clojure/test_clojure/sequences.clj
+++ b/test/clojure/test_clojure/sequences.clj
@@ -988,7 +988,7 @@
{} {:a 1 :b 2}
#{} #{1 2} ))
-(defspec longrange-equals-range 100
+(defspec longrange-equals-range 1000
(prop/for-all [start gen/int
end gen/int
step gen/s-pos-int]
@@ -1384,3 +1384,98 @@
(when (reversible? coll)
(is (= true (instance? clojure.lang.IMeta (rseq coll))))
(is (= {:a true} (meta (with-meta (rseq coll) {:a true})))))))
+
+(deftest test-iteration-opts
+ (let [genstep (fn [steps]
+ (fn [k] (swap! steps inc) (inc k)))
+ test (fn [expect & iteropts]
+ (is (= expect
+ (let [nsteps (atom 0)
+ iter (apply iteration (genstep nsteps) iteropts)
+ ret (doall (seq iter))]
+ {:ret ret :steps @nsteps})
+ (let [nsteps (atom 0)
+ iter (apply iteration (genstep nsteps) iteropts)
+ ret (into [] iter)]
+ {:ret ret :steps @nsteps}))))]
+ (test {:ret [1 2 3 4]
+ :steps 5}
+ :initk 0 :somef #(< % 5))
+ (test {:ret [1 2 3 4 5]
+ :steps 5}
+ :initk 0 :kf (fn [ret] (when (< ret 5) ret)))
+ (test {:ret ["1"]
+ :steps 2}
+ :initk 0 :somef #(< % 2) :vf str))
+
+ ;; kf does not stop on false
+ (let [iter #(iteration (fn [k]
+ (if (boolean? k)
+ [10 :boolean]
+ [k k]))
+ :vf second
+ :kf (fn [[k v]]
+ (cond
+ (= k 3) false
+ (< k 14) (inc k)))
+ :initk 0)]
+ (is (= [0 1 2 3 :boolean 11 12 13 14]
+ (into [] (iter))
+ (seq (iter))))))
+
+(deftest test-iteration
+ ;; equivalence to line-seq
+ (let [readme #(java.nio.file.Files/newBufferedReader (.toPath (java.io.File. "readme.txt")))]
+ (is (= (with-open [r (readme)]
+ (vec (iteration (fn [_] (.readLine r)))))
+ (with-open [r (readme)]
+ (doall (line-seq r))))))
+
+ ;; paginated API
+ (let [items 12 pgsize 5
+ src (vec (repeatedly items #(java.util.UUID/randomUUID)))
+ api (fn [tok]
+ (let [tok (or tok 0)]
+ (when (< tok items)
+ {:tok (+ tok pgsize)
+ :ret (subvec src tok (min (+ tok pgsize) items))})))]
+ (is (= src
+ (mapcat identity (iteration api :kf :tok :vf :ret))
+ (into [] cat (iteration api :kf :tok :vf :ret)))))
+
+ (let [src [:a :b :c :d :e]
+ api (fn [k]
+ (let [k (or k 0)]
+ (if (< k (count src))
+ {:item (nth src k)
+ :k (inc k)})))]
+ (is (= [:a :b :c]
+ (vec (iteration api
+ :somef (comp #{:a :b :c} :item)
+ :kf :k
+ :vf :item))
+ (vec (iteration api
+ :kf #(some-> % :k #{0 1 2})
+ :vf :item))))))
+
+(deftest infinite-seq-hash
+ (are [e] (thrown? Exception (.hashCode ^Object e))
+ (iterate identity nil)
+ (cycle [1])
+ (repeat 1))
+ (are [e] (thrown? Exception (.hasheq ^clojure.lang.IHashEq e))
+ (iterate identity nil)
+ (cycle [1])
+ (repeat 1)))
+
+(defspec iteration-seq-equals-reduce 1000
+ (prop/for-all [initk gen/int
+ seed gen/int]
+ (let [src (fn []
+ (let [rng (java.util.Random. seed)]
+ (iteration #(unchecked-add % (.nextLong rng))
+ :somef (complement #(zero? (mod % 1000)))
+ :vf str
+ :initk initk)))]
+ (= (into [] (src))
+ (into [] (seq (src)))))))
diff --git a/test/clojure/test_clojure/serialization.clj b/test/clojure/test_clojure/serialization.clj
index 51a0d6a263..c9befc49cd 100644
--- a/test/clojure/test_clojure/serialization.clj
+++ b/test/clojure/test_clojure/serialization.clj
@@ -183,4 +183,11 @@
;; stateful seqs
(enumeration-seq (java.util.Collections/enumeration (range 50)))
- (iterator-seq (.iterator (range 50)))))
\ No newline at end of file
+ (iterator-seq (.iterator (range 50)))))
+
+;; necessary for CVE-2024-22871
+(deftest CLJ-2839
+ (are [e] (thrown? Exception (.hashCode ^Object (-> e serialize deserialize)))
+ (repeat 1)
+ (iterate identity nil)
+ (cycle [1])))
\ No newline at end of file
diff --git a/test/clojure/test_clojure/transducers.clj b/test/clojure/test_clojure/transducers.clj
index 76a0e978a3..b7a9c665e2 100644
--- a/test/clojure/test_clojure/transducers.clj
+++ b/test/clojure/test_clojure/transducers.clj
@@ -398,3 +398,13 @@
(sequence (map-indexed vector) [])))
(is (= [[0 1] [1 2] [2 3] [3 4]]
(sequence (map-indexed vector) (range 1 5)))))
+
+(deftest test-into+halt-when
+ (is (= :anomaly (into [] (comp (filter some?) (halt-when #{:anomaly}))
+ [1 2 3 :anomaly 4])))
+ (is (= {:anomaly :oh-no!,
+ :partial-results [1 2]}
+ (into []
+ (halt-when :anomaly #(assoc %2 :partial-results %1))
+ [1 2 {:anomaly :oh-no!} 3 4]))))
+
diff --git a/test/clojure/test_clojure/vectors.clj b/test/clojure/test_clojure/vectors.clj
index 0bea3ff4b8..ea2b8e77d5 100644
--- a/test/clojure/test_clojure/vectors.clj
+++ b/test/clojure/test_clojure/vectors.clj
@@ -416,3 +416,15 @@
(is (= [0 1 2 3] (vec (reify clojure.lang.IReduceInit
(reduce [_ f start]
(reduce f start (range 4))))))))
+
+(deftest test-reduce-kv-vectors
+ (is (= 25 (reduce-kv + 10 [2 4 6])))
+ (is (= 25 (reduce-kv + 10 (subvec [0 2 4 6] 1)))))
+
+(deftest test-vector-eqv-to-non-counted-types
+ (is (not= (range) [0 1 2]))
+ (is (not= [0 1 2] (range)))
+ (is (= [0 1 2] (take 3 (range))))
+ (is (= [0 1 2] (new java.util.ArrayList [0 1 2])))
+ (is (not= [1 2] (take 1 (cycle [1 2]))))
+ (is (= [1 2 3 nil 4 5 6 nil] (eduction cat [[1 2 3 nil] [4 5 6 nil]]))))