summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/jvm/clojure/lang/Numbers.java8
-rw-r--r--test/clojure/test_clojure/java_interop.clj4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/jvm/clojure/lang/Numbers.java b/src/jvm/clojure/lang/Numbers.java
index 043f9ae2..8d5fd855 100644
--- a/src/jvm/clojure/lang/Numbers.java
+++ b/src/jvm/clojure/lang/Numbers.java
@@ -1436,7 +1436,7 @@ static BitOps bitOps(Object x){
else
{
ISeq s = RT.seq(sizeOrSeq);
- int size = s.count();
+ int size = RT.count(s);
float[] ret = new float[size];
for(int i = 0; i < size && s != null; i++, s = s.next())
ret[i] = ((Number) s.first()).floatValue();
@@ -1467,7 +1467,7 @@ static public double[] double_array(Object sizeOrSeq){
else
{
ISeq s = RT.seq(sizeOrSeq);
- int size = s.count();
+ int size = RT.count(s);
double[] ret = new double[size];
for(int i = 0; i < size && s != null; i++, s = s.next())
ret[i] = ((Number) s.first()).doubleValue();
@@ -1498,7 +1498,7 @@ static public int[] int_array(Object sizeOrSeq){
else
{
ISeq s = RT.seq(sizeOrSeq);
- int size = s.count();
+ int size = RT.count(s);
int[] ret = new int[size];
for(int i = 0; i < size && s != null; i++, s = s.next())
ret[i] = ((Number) s.first()).intValue();
@@ -1529,7 +1529,7 @@ static public long[] long_array(Object sizeOrSeq){
else
{
ISeq s = RT.seq(sizeOrSeq);
- int size = s.count();
+ int size = RT.count(s);
long[] ret = new long[size];
for(int i = 0; i < size && s != null; i++, s = s.next())
ret[i] = ((Number) s.first()).longValue();
diff --git a/test/clojure/test_clojure/java_interop.clj b/test/clojure/test_clojure/java_interop.clj
index 699ba361..81c7df0e 100644
--- a/test/clojure/test_clojure/java_interop.clj
+++ b/test/clojure/test_clojure/java_interop.clj
@@ -146,13 +146,13 @@
; given size (and empty)
(are [x] (and (= (alength (~type-array x)) x)
- (= (vec (~type-array x)) (repeat x 0)))
+ (= (vec (~type-array x)) (repeat x 0)))
0 1 5 )
; copy of a sequence
(are [x] (and (= (alength (~type-array x)) (count x))
(= (vec (~type-array x)) x))
-;; [] ;; ERROR
+ []
[1]
[1 -2 3 0 5] )