From 7dfbb8bc4b3d9bb4ce82780227cff82c97a54448 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Tue, 24 Jun 2025 10:54:22 +0200
Subject: [PATCH] Inline scm_is_vector

* libguile/vectors.h (scm_is_vector): Define inline.
(SCM_I_IS_VECTOR): Remove.
* libguile/eval.c (env_tail): Use scm_is_vector.
* libguile/vectors.c (scm_is_vector): Remove.
---
 libguile/eval.c    | 2 +-
 libguile/vectors.c | 6 ------
 libguile/vectors.h | 8 ++++++--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/libguile/eval.c b/libguile/eval.c
index 2112cf9b2..625dc1aa2 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -218,7 +218,7 @@ next_rib (SCM env)
 static SCM
 env_tail (SCM env)
 {
-  while (SCM_I_IS_VECTOR (env))
+  while (scm_is_vector (env))
     env = next_rib (env);
   return env;
 }
diff --git a/libguile/vectors.c b/libguile/vectors.c
index 102c5ac7c..917f47a6b 100644
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -48,12 +48,6 @@
   } while (0)
 
 
-int
-scm_is_vector (SCM obj)
-{
-  return SCM_I_IS_VECTOR (obj);
-}
-
 const SCM *
 scm_vector_elements (SCM array, scm_t_array_handle *h,
 		     size_t *lenp, ssize_t *incp)
diff --git a/libguile/vectors.h b/libguile/vectors.h
index 2482faddd..f4385fc3d 100644
--- a/libguile/vectors.h
+++ b/libguile/vectors.h
@@ -28,6 +28,12 @@
 
 
 
+static inline int
+scm_is_vector (SCM obj)
+{
+  return SCM_HAS_TYP7 (obj, scm_tc7_vector);
+}
+
 SCM_API SCM scm_vector_p (SCM x);
 SCM_API SCM scm_vector_length (SCM v);
 SCM_API SCM scm_vector (SCM l);
@@ -44,7 +50,6 @@ SCM_API SCM scm_vector_copy (SCM vec);
 SCM_API SCM scm_vector_copy_partial (SCM vec, SCM start, SCM end);
 SCM_API SCM scm_vector_copy_x (SCM dst, SCM at, SCM src, SCM start, SCM end);
 
-SCM_API int scm_is_vector (SCM obj);
 SCM_API SCM scm_c_make_vector (size_t len, SCM fill);
 SCM_API size_t scm_c_vector_length (SCM vec);
 SCM_API SCM scm_c_vector_ref (SCM vec, size_t k);
@@ -77,7 +82,6 @@ SCM_API SCM *scm_vector_writable_elements (SCM array,
   (SCM_NIMP (x) &&                                              \
    ((SCM_CELL_TYPE (x) & (0x7f | SCM_F_VECTOR_IMMUTABLE))       \
     == scm_tc7_vector))
-#define SCM_I_IS_VECTOR(x)     (SCM_HAS_TYP7 (x, scm_tc7_vector))
 #define SCM_I_VECTOR_ELTS(x)   ((const SCM *) SCM_I_VECTOR_WELTS (x))
 #define SCM_I_VECTOR_WELTS(x)  (SCM_CELL_OBJECT_LOC (x, 1))
 #define SCM_I_VECTOR_LENGTH(x) (((size_t) SCM_CELL_WORD_0 (x)) >> 8)