From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Maxim Cournoyer Newsgroups: gmane.lisp.guile.devel Subject: [PATCH v8 10/16] module: Add (scheme comparator). Date: Wed, 6 Dec 2023 18:15:06 -0500 Message-ID: <20231206231512.6505-11-maxim.cournoyer@gmail.com> References: <20231206231512.6505-1-maxim.cournoyer@gmail.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="37297"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Maxim Cournoyer To: guile-devel@gnu.org Original-X-From: guile-devel-bounces+guile-devel=m.gmane-mx.org@gnu.org Thu Dec 07 00:16:54 2023 Return-path: Envelope-to: guile-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rB18O-0009RH-P1 for guile-devel@m.gmane-mx.org; Thu, 07 Dec 2023 00:16:52 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rB17N-0001t7-FA; Wed, 06 Dec 2023 18:15:49 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rB17E-0001nO-G4 for guile-devel@gnu.org; Wed, 06 Dec 2023 18:15:45 -0500 Original-Received: from mail-oi1-x236.google.com ([2607:f8b0:4864:20::236]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rB17A-00018w-Sm for guile-devel@gnu.org; Wed, 06 Dec 2023 18:15:39 -0500 Original-Received: by mail-oi1-x236.google.com with SMTP id 5614622812f47-3b8b56d51a6so255041b6e.2 for ; Wed, 06 Dec 2023 15:15:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701904534; x=1702509334; darn=gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7zwx/YuiVHQb5fb5zTVMJGthqhV1HhhciGvyEs7ety4=; b=DCuOrP+Y3jpCU1LGIlOUN/eQX6JjspaMo+JPbVLTOK2mLFJxC7rEZMTCD1XOECqIYW hw8xpwLC2K7C62UkiGTewDRFKnLE6CldLa9n+FCaEyfIEq+cj8e84dHhdD7lJFbD62oV Sln/g0DxrdWQDOwVQLxKvazxaZ9Wp9F+ERvda66OhCFAIlSxsujq9IVySf4yail15Pc8 RRGivxREQlu8HXod/k056lJm3Nm6pR/ZtYjPTjGBEX85wl8nTbWT5xYV09HCUhomN8mW GpZDUSowGQCiRgu7u/ZbiO7/4cEnuaOEkBO7n8m5NQNUmif5TIqGAQDNaIJQ+MaGStSj dJKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701904534; x=1702509334; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7zwx/YuiVHQb5fb5zTVMJGthqhV1HhhciGvyEs7ety4=; b=czzmwDubErzKWPZNUdHFjj/FQPCw70sXBp8E9mbQV4uTORG+/ugxeaX862j8tY/p25 pbofDq7o9L3uYb7T60kcns9ReSQ2asu1P4RdtIZ+Da6OLGo/JnplChKQAo3hUcxyndbI +WR5ugodmuin7u+UI9aIVOwoVNOBrhfDjD1Ok9tvkHADmhWb4ZNLwjqUUFLx53hnuG9z KXFNVqi4oiXoRZEJZUelMmraQbifF7yhstol52qxaLNKwgNt99JP8KEhrI81pCNj/75X rmf7WyNttWixesMHWBB80IcUoSZCVqSzYzN+1bjXJFn6JEbtQ6UVY2Lo/Z6o+kJxGCDt Cc/Q== X-Gm-Message-State: AOJu0YxRb9Gio0AbQl9898Ub1g4RxEFXea7c5HN5fFZvxZfXLPGJGbX6 oRKywe+/h6ltHVYPw9KGSA/To84urLw= X-Google-Smtp-Source: AGHT+IF2E3BUw4T8qF4kkfc2UQ9QZWhOiSY+WduKuHm7mqFjha0M9MhrI9PVwDQqYcEHi0/ntZtRQw== X-Received: by 2002:a05:6808:1823:b0:3b8:b645:a87b with SMTP id bh35-20020a056808182300b003b8b645a87bmr1705851oib.77.1701904533952; Wed, 06 Dec 2023 15:15:33 -0800 (PST) Original-Received: from localhost.localdomain (dsl-10-130-68.b2b2c.ca. [72.10.130.68]) by smtp.gmail.com with ESMTPSA id re18-20020a05620a8e1200b0077d8ad77069sm3400qkn.26.2023.12.06.15.15.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 15:15:33 -0800 (PST) X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231206231512.6505-1-maxim.cournoyer@gmail.com> Received-SPF: pass client-ip=2607:f8b0:4864:20::236; envelope-from=maxim.cournoyer@gmail.com; helo=mail-oi1-x236.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane-mx.org@gnu.org Original-Sender: guile-devel-bounces+guile-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.lisp.guile.devel:22209 Archived-At: * module/scheme/comparator.sld: New R7RS library shim for SRFI 128. * am/bootstrap.am (SOURCES): Register it. * NEWS: Update NEWS. --- (no changes since v7) Changes in v7: - Register prerequisites for scheme/comparator.go in am/bootstrap.am Changes in v5: - Update NEWS NEWS | 1 + am/bootstrap.am | 2 ++ module/scheme/comparator.sld | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 module/scheme/comparator.sld diff --git a/NEWS b/NEWS index 31107a76d..45023d9fb 100644 --- a/NEWS +++ b/NEWS @@ -23,6 +23,7 @@ the compiler reports it as "possibly unused". ** Add (srfi 126), a hash tables library ** Add (srfi 128), a comparators library +** Add (scheme comparator) * Bug fixes diff --git a/am/bootstrap.am b/am/bootstrap.am index f0d4b86dd..ba5cd7291 100644 --- a/am/bootstrap.am +++ b/am/bootstrap.am @@ -66,6 +66,7 @@ ice-9/psyntax-pp.go: ice-9/psyntax.scm ice-9/psyntax-pp.scm srfi/srfi-126.go: srfi/srfi-1.go srfi/srfi-9.go srfi/srfi-9/gnu.go \ srfi/srfi-11.go srfi/srfi-128.go: srfi/srfi-69.go srfi/srfi-126.go +scheme/comparator.go: srfi/srfi-128.go # All sources. We can compile these in any order; the order below is # designed to hopefully result in the lowest total compile time. @@ -282,6 +283,7 @@ SOURCES = \ scheme/base.scm \ scheme/case-lambda.scm \ scheme/char.scm \ + scheme/comparator.sld \ scheme/complex.scm \ scheme/cxr.scm \ scheme/eval.scm \ diff --git a/module/scheme/comparator.sld b/module/scheme/comparator.sld new file mode 100644 index 000000000..5016e4392 --- /dev/null +++ b/module/scheme/comparator.sld @@ -0,0 +1,33 @@ +;;; comparator.sld --- R7RS library exposing SRFI 128. + +;;; Copyright (C) 2023 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 program. If not, see +;;; . + +(define-library (scheme comparator) + (export comparator? comparator-ordered? comparator-hashable? + make-comparator + make-pair-comparator make-list-comparator make-vector-comparator + make-eq-comparator make-eqv-comparator make-equal-comparator + boolean-hash char-hash char-ci-hash + string-hash string-ci-hash symbol-hash number-hash + make-default-comparator default-hash comparator-register-default! + comparator-type-test-predicate comparator-equality-predicate + comparator-ordering-predicate comparator-hash-function + comparator-test-type comparator-check-type comparator-hash + hash-bound hash-salt + =? ? <=? >=? + comparator-if<=>) + (import (srfi 128))) -- 2.41.0