Revert "fix equal? between an array and a non-array"

This reverts commit 9d031d4d575ac8f343a5d984cb02cd374577c5a9.

diff --git a/libguile/eq.c b/libguile/eq.c
index 923fa77a198aadee981272d825e675026a579498..6a533da4e61a982029c3233e070e461c69534c68 100644 (file)
--- a/libguile/eq.c
+++ b/libguile/eq.c
@@ -321,7 +321,7 @@ scm_equal_p (SCM x, SCM y)
 
       /* Vectors can be equal to one-dimensional arrays.
        */
-      if (scm_is_array (x) && scm_is_array (y))
+      if (SCM_I_ARRAYP (x) || SCM_I_ARRAYP (y))
        return scm_array_equal_p (x, y);
 
       return SCM_BOOL_F;

diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index 40f5a98683a105eee4271f0b43da9474e105e10c..36afa2560a61e24fb18d7a0b4a65db556468abf7 100644 (file)
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -24,7 +24,6 @@ SUBDIRS = standalone
 SCM_TESTS = tests/alist.test                   \
            tests/and-let-star.test             \
            tests/arbiters.test                 \
-           tests/arrays.test                   \
            tests/asm-to-bytecode.test          \
            tests/bit-operations.test           \
            tests/brainfuck.test                \

diff --git a/test-suite/tests/arrays.test b/test-suite/tests/arrays.test
deleted file mode 100644 (file)
index 30dc750..0000000
--- a/test-suite/tests/arrays.test
+++ /dev/null
@@ -1,23 +0,0 @@
-;;;; arrays.test --- tests guile's arrays     -*- scheme -*-
-;;;;
-;;;; Copyright 2010 Free Software Foundation, Inc.
-;;;;
-;;;; This library is free software; you can redistribute it and/or
-;;;; modify it under the terms of the GNU Lesser General Public
-;;;; License as published by the Free Software Foundation; either
-;;;; version 3 of the License, or (at your option) any later version.
-;;;; 
-;;;; This library is distributed in the hope that it will be useful,
-;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;;; Lesser General Public License for more details.
-;;;; 
-;;;; You should have received a copy of the GNU Lesser General Public
-;;;; License along with this library; if not, write to the Free Software
-;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-(define-module (test-suite test-unif)
-  #:use-module (test-suite lib))
-
-(pass-if "equal? on array and non-array"
-  (not (equal? #2f64((0 1) (2 3)) 100)))