From patchwork Mon Mar 29 10:18:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 28168 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4ACCA27BC63; Mon, 29 Mar 2021 11:20:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A332A27BC74 for ; Mon, 29 Mar 2021 11:20:10 +0100 (BST) Received: from localhost ([::1]:60986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lQp0D-0007Ud-RL for patchwork@mira.cbaines.net; Mon, 29 Mar 2021 06:20:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lQozK-0006ox-Dx for guix-patches@gnu.org; Mon, 29 Mar 2021 06:19:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36376) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lQozB-0003mH-1b for guix-patches@gnu.org; Mon, 29 Mar 2021 06:19:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lQozA-0008Lr-Ty for guix-patches@gnu.org; Mon, 29 Mar 2021 06:19:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47464] [PATCH 6/8] scripts: repl: Replace 'args-fold*' by 'parse-command-line'. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Mar 2021 10:19:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47464 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47464@debbugs.gnu.org Cc: zimoun Received: via spool by 47464-submit@debbugs.gnu.org id=B47464.161701311232009 (code B ref 47464); Mon, 29 Mar 2021 10:19:04 +0000 Received: (at 47464) by debbugs.gnu.org; 29 Mar 2021 10:18:32 +0000 Received: from localhost ([127.0.0.1]:47913 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQoyd-0008K5-Lw for submit@debbugs.gnu.org; Mon, 29 Mar 2021 06:18:32 -0400 Received: from mail-wr1-f51.google.com ([209.85.221.51]:34606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQoyT-0008Id-Ql for 47464@debbugs.gnu.org; Mon, 29 Mar 2021 06:18:22 -0400 Received: by mail-wr1-f51.google.com with SMTP id j7so12289640wrd.1 for <47464@debbugs.gnu.org>; Mon, 29 Mar 2021 03:18:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=i92BeYp5dlKfUCj1SjM/A/+nEeRsk/lR0aFtiaxZHZs=; b=aqUuZLY3hjqt0+XYZmeRKKqFJCpqrURX62vMKENFPxCWnZ8PLRXps4f8GmnDXu9Ubo KgA6hz8beqhmH5ZvoiNO/g/leLByrr/TCFqKt8idjNm8t/SIFqqLtanVwhxGfuT7huVr Glt8mownVuypapPTjy9eZiGkctROHrDoduLqxEyM5Q6lJcs4LRU8aHWyVYqW9cWBJfRi bP3ocE6kqDJ/YCaQfgFt6zdRkAEmQCCYIS4+2PBgkht8DhieDbg/A1NKDATJRPzG6jzO FagVtMsHr14a+GURxjenuutRcuBpd+G018SWLQ3w1ZJrYrTw54EqR9dWag+8jYpF6rJ8 7ncA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=i92BeYp5dlKfUCj1SjM/A/+nEeRsk/lR0aFtiaxZHZs=; b=ZTUqvsJBA0vJ4+bRNQ577MMCnbJmtxSFP5ugiVPXM4MCuoDMLiaXZjubgjG49/F1tG L+CBreyp5XBZJDaYS3DPBgaLuDlqra17wPrsAPkrNiQS2P6iqqm2YXCfU7KnGkwL3vcA Itr3/i4ED7UC5qDHeJF2Od5m0taoqRAsq+15icLpDOTtDRux9Gfm8kHJAE1ta10+/6m1 E1bftBwGHesF8BMrGZuOVVwuZJYZ8uZ3Z8jEGPG4zOKCxx3VxDjawX5N1Gf6LlZdR4zH oIdLYbiKi8eeypVgZGC3xRiKszwJYvtXacKAiH/9OrVjkNs088nmkKgsVi/jso15N2vt F0aQ== X-Gm-Message-State: AOAM531imw433GcKiyXq9xrwFFNL/m9l/qXeDkDmuvl14taJrDyhFM9S ONDNHP+j2gUVvVoTwuQLlv5OOfo17N8= X-Google-Smtp-Source: ABdhPJxV0qdjJOOr5qn43F4p0dBnr399BVPhQShvpdXolDgyBsHb6VZPsGghb528rbeF5Jtz8vSiVg== X-Received: by 2002:a5d:6c6a:: with SMTP id r10mr27845566wrz.42.1617013096333; Mon, 29 Mar 2021 03:18:16 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id 135sm25291792wma.44.2021.03.29.03.18.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 03:18:15 -0700 (PDT) From: zimoun Date: Mon, 29 Mar 2021 12:18:04 +0200 Message-Id: <20210329101806.54004-6-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210329101806.54004-1-zimon.toutoune@gmail.com> References: <20210329101806.54004-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/scripts/repl.scm (define-command): Replace 'args-fold*' by 'parse-command-line'. --- guix/scripts/repl.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/guix/scripts/repl.scm b/guix/scripts/repl.scm index 9f20803efc..50d18c7760 100644 --- a/guix/scripts/repl.scm +++ b/guix/scripts/repl.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2019, 2020 Ludovic Courtès -;;; Copyright © 2020 Simon Tournier +;;; Copyright © 2020, 2021 Simon Tournier ;;; Copyright © 2020 Konrad Hinsen ;;; ;;; This file is part of GNU Guix. @@ -143,14 +143,13 @@ call THUNK." (synopsis "read-eval-print loop (REPL) for interactive programming") (define opts - (args-fold* args %options - (lambda (opt name arg result) - (leave (G_ "~A: unrecognized option~%") name)) + (parse-command-line args %options (list %default-options) + #:build-options? #f + #:argument-handler (lambda (arg result) (append `((script . ,arg) (ignore-dot-guile? . #t)) - result)) - %default-options)) + result)))) (define user-config (and=> (getenv "HOME")