From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Mihail Iosilevich Newsgroups: gmane.lisp.guile.bugs Subject: bug#55934: [PATCH] (library ...) form in cond-expand inside R7RS define-library Date: Sun, 12 Jun 2022 13:13:32 +0300 Message-ID: <87wndmi3zn.fsf@cerbo.mail-host-address-is-not-set> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="9597"; mail-complaints-to="usenet@ciao.gmane.io" To: 55934@debbugs.gnu.org Original-X-From: bug-guile-bounces+guile-bugs=m.gmane-mx.org@gnu.org Sun Jun 12 22:24:12 2022 Return-path: Envelope-to: guile-bugs@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 1o0U83-0002Oh-K2 for guile-bugs@m.gmane-mx.org; Sun, 12 Jun 2022 22:24:11 +0200 Original-Received: from localhost ([::1]:41754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0U82-0001fX-2z for guile-bugs@m.gmane-mx.org; Sun, 12 Jun 2022 16:24:10 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:58886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0U7v-0001fO-Im for bug-guile@gnu.org; Sun, 12 Jun 2022 16:24:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:34427) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0U7v-0005Sv-9U for bug-guile@gnu.org; Sun, 12 Jun 2022 16:24:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o0U7v-0004cU-6F for bug-guile@gnu.org; Sun, 12 Jun 2022 16:24:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Mihail Iosilevich Original-Sender: "Debbugs-submit" Resent-CC: bug-guile@gnu.org Resent-Date: Sun, 12 Jun 2022 20:24:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55934 X-GNU-PR-Package: guile X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-guile@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.165506541917709 (code B ref -1); Sun, 12 Jun 2022 20:24:03 +0000 Original-Received: (at submit) by debbugs.gnu.org; 12 Jun 2022 20:23:39 +0000 Original-Received: from localhost ([127.0.0.1]:56555 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o0U7J-0004bL-PF for submit@debbugs.gnu.org; Sun, 12 Jun 2022 16:23:39 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:35070) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o0KbG-0000tT-PS for submit@debbugs.gnu.org; Sun, 12 Jun 2022 06:13:45 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:54098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0KbG-0000mF-7w for bug-guile@gnu.org; Sun, 12 Jun 2022 06:13:42 -0400 Original-Received: from smtp.paranoid.email ([149.154.152.236]:16232 helo=mx.paranoid.email) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0KbD-0007Sb-Ro for bug-guile@gnu.org; Sun, 12 Jun 2022 06:13:41 -0400 Original-Received: from [172.19.0.4] (paranoid-filter.vpn [192.168.150.118]) by mx.paranoid.email (Postfix) with ESMTP id 4931A3F76E for ; Sun, 12 Jun 2022 10:13:34 +0000 (UCT) Original-Received: from [127.0.0.1] (95-37-215-100.dynamic.mts-nn.ru [95.37.215.100]) by mx.paranoid.email (Postfix) with ESMTPSA id BF0383F76C for ; Sun, 12 Jun 2022 10:13:33 +0000 (UCT) Received-SPF: pass client-ip=149.154.152.236; envelope-from=yosik@paranoid.email; helo=mx.paranoid.email X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, 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-Mailman-Approved-At: Sun, 12 Jun 2022 16:23:23 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guile@gnu.org List-Id: "Bug reports for GUILE, GNU's Ubiquitous Extension Language" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guile-bounces+guile-bugs=m.gmane-mx.org@gnu.org Original-Sender: "bug-guile" Xref: news.gmane.io gmane.lisp.guile.bugs:10288 Archived-At: Guile (3.0.8) reports a compilation error when cond-expand tries to check existence of a missing library: scheme@(guile-user)> (define-library (test) (cond-expand ((library (scheme sort)) (import (scheme sort))))) While compiling expression: no code for module (scheme sort) It looks like bug #40252 was not fully eliminated. Also, (library ...) cannot handle module names like (srfi 1), though (import (srfi 1)) works fine. For example, this code fails: scheme@(guile-user)> (define-library (test) (cond-expand ((library (srfi 1)) (import (srfi 1))))) While compiling expression: In procedure symbol->string: Wrong type argument in position 1 (expecting symbol): 1 There are probably other cases when (library ...) and (import ...) does not work identically: (library ...) uses resolve-interface while (import ...) uses resolve-r6rs-interface. This patch fixes both issues. diff --git a/module/ice-9/r7rs-libraries.scm b/module/ice-9/r7rs-libraries.scm index c4c4da22f..63a300a26 100644 --- a/module/ice-9/r7rs-libraries.scm +++ b/module/ice-9/r7rs-libraries.scm @@ -55,7 +55,10 @@ ((not req) (not (has-req? #'req))) ((library lib-name) - (->bool (resolve-interface (syntax->datum #'lib-name)))) + (->bool + (false-if-exception + (resolve-r6rs-interface + (syntax->datum #'lib-name))))) (id (identifier? #'id) ;; FIXME: R7RS (features) isn't quite the same as -- Mihail Iosilevitch