[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 01/01: Let assv/assoc shortcircuit to assq where feasibl
From: |
Andy Wingo |
Subject: |
[Guile-commits] 01/01: Let assv/assoc shortcircuit to assq where feasible |
Date: |
Sun, 7 Aug 2016 21:11:00 +0000 (UTC) |
wingo pushed a commit to branch master
in repository guile.
commit 469970d4b35e973b1fae969a4781a06d6abf0ba4
Author: David Kastrup <address@hidden>
Date: Thu Feb 11 12:31:48 2016 +0100
Let assv/assoc shortcircuit to assq where feasible
* libguile/alist.c (scm_sloppy_assv, scm_sloppy_assoc):
(scm_assv, scm_assoc): Shortcircuit to scm_assq where feasible.
---
libguile/alist.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/libguile/alist.c b/libguile/alist.c
index 82c70a0..1e607f1 100644
--- a/libguile/alist.c
+++ b/libguile/alist.c
@@ -28,6 +28,7 @@
#include "libguile/validate.h"
#include "libguile/pairs.h"
+#include "libguile/numbers.h"
#include "libguile/alist.h"
@@ -70,6 +71,11 @@ SCM_DEFINE (scm_sloppy_assv, "sloppy-assv", 2, 0, 0,
"Recommended only for use in Guile internals.")
#define FUNC_NAME s_scm_sloppy_assv
{
+ /* In Guile, `assv' is the same as `assq' for keys of all types except
+ numbers. */
+ if (!SCM_NUMP (key))
+ return scm_sloppy_assq (key, alist);
+
for (; scm_is_pair (alist); alist = SCM_CDR (alist))
{
SCM tmp = SCM_CAR (alist);
@@ -88,6 +94,10 @@ SCM_DEFINE (scm_sloppy_assoc, "sloppy-assoc", 2, 0, 0,
"Recommended only for use in Guile internals.")
#define FUNC_NAME s_scm_sloppy_assoc
{
+ /* Immediate values can be checked using `eq?'. */
+ if (SCM_IMP (key))
+ return scm_sloppy_assq (key, alist);
+
for (; scm_is_pair (alist); alist = SCM_CDR (alist))
{
SCM tmp = SCM_CAR (alist);
@@ -137,6 +147,12 @@ SCM_DEFINE (scm_assv, "assv", 2, 0, 0,
#define FUNC_NAME s_scm_assv
{
SCM ls = alist;
+
+ /* In Guile, `assv' is the same as `assq' for keys of all types except
+ numbers. */
+ if (!SCM_NUMP (key))
+ return scm_assq (key, alist);
+
for(; scm_is_pair (ls); ls = SCM_CDR (ls))
{
SCM tmp = SCM_CAR (ls);
@@ -158,6 +174,11 @@ SCM_DEFINE (scm_assoc, "assoc", 2, 0, 0,
#define FUNC_NAME s_scm_assoc
{
SCM ls = alist;
+
+ /* Immediate values can be checked using `eq?'. */
+ if (SCM_IMP (key))
+ return scm_assq (key, alist);
+
for(; scm_is_pair (ls); ls = SCM_CDR (ls))
{
SCM tmp = SCM_CAR (ls);