From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from primenet.com.au (ns1.primenet.com.au [203.24.36.2]) by inbox.vuxu.org (OpenSMTPD) with ESMTP id ae313d6d for ; Tue, 2 Apr 2019 03:07:26 +0000 (UTC) Received: (qmail 21903 invoked by alias); 2 Apr 2019 03:07:11 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 44199 Received: (qmail 10389 invoked by uid 1010); 2 Apr 2019 03:07:11 -0000 X-Qmail-Scanner-Diagnostics: from mail-ot1-f54.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.101.1/25405. spamassassin: 3.4.2. Clear:RC:0(209.85.210.54):SA:0(-1.7/5.0):. Processed in 1.924568 secs); 02 Apr 2019 03:07:11 -0000 X-Envelope-From: phy1729@gmail.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at _netblocks.google.com designates 209.85.210.54 as permitted sender) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:mail-followup-to:mime-version :content-disposition:user-agent; bh=W1qytAiCkM2zPIu1S5WlCFK+W6t5sXq+nrK8C3RgytQ=; b=BGiyZbQTw9SwdhigPHjkJWgTZKWZYV3Wzb43PaikYkfRhGV+xy5nY2tiIYV0doMIMh NX0OmLf/7w1I6VWnVTzhQiS2x+MeeyacYMGlGeCBXp0WWTJWZyFDFgUCEnvc7OZlDVNB 3TcnvS8HYx+P3+Pjhz369IMbsvWG8Pgmk5ecc4mL4A3l1NvlTdQ3s/SHJlebK19whRgX hKoHcD7a2dCQXFyYbxiE0Y324ytwX8keLnF+o/LfqdpEAj2ocECNPcrGsuy6SP2Q0RJT zPhTub2tvHuJl0JCaGce6gaCROUtXpMZJ5RMTu9JdZcLgPWV8pD/ZokWBb2o78cvkQH3 zZ4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mail-followup-to :mime-version:content-disposition:user-agent; bh=W1qytAiCkM2zPIu1S5WlCFK+W6t5sXq+nrK8C3RgytQ=; b=JPa6RDzIBMsl6sVVx78OIlycff66dKkVbuZGXYk+/xZovQ9lpHZn6+RHcEEaKJD+L1 maQSRMICrgF0evesaQeBljRQE4iawVgSRR8UzuvAAlKk+LF/fTvuTF/iMydRkr+Q5kk2 Up1bFumDaUMsTQFxzHNA+5Jio3TXK/lOnAnVpPsYaBGHzGQkGvyGlFhUBxrJS/4ijzQb XGm86LuVclaHsuitSVPTsGfa7L7RpPDT5AqQ2Q7alsLBGuAk3dhAQ9hXZqe2xw6D3tKv t/eQTNwyt4Fm8Re1XBBPa4qJT7bYommUpp/4X6bq+iHcse9j1Crsls7JlSZECojWOJVz QCaw== X-Gm-Message-State: APjAAAXG3gO+DBUQ7+y7LydGRAtfJ57Am1cmCeAgXMqlRT5M3c+5gJF4 TVIpa419fnSpyBZQ4rf94kqzCxsRdKQ= X-Google-Smtp-Source: APXvYqw8mPWZIU5wlhec4sotIzeBfiwrGaZ96nDgRKM+Z16d6EcgNXFlfMgs+s9LKH5aKmH5JOhAWQ== X-Received: by 2002:a05:6830:15d0:: with SMTP id j16mr21508706otr.286.1554174395232; Mon, 01 Apr 2019 20:06:35 -0700 (PDT) Date: Mon, 1 Apr 2019 22:06:32 -0500 From: Matthew Martin To: zsh-workers@zsh.org Subject: [PATCH 1/4] _normal: Use zparseopts Message-ID: <20190402030629.GA36265@CptOrmolo.darkstar> Mail-Followup-To: zsh-workers@zsh.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.11.4 (2019-03-13) Use zparseopts in preparation for later diffs adding -p and -P. --- Completion/Base/Core/_normal | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Completion/Base/Core/_normal b/Completion/Base/Core/_normal index dd607d2b2..fe336e303 100644 --- a/Completion/Base/Core/_normal +++ b/Completion/Base/Core/_normal @@ -1,13 +1,10 @@ #compdef -command-line- -local _comp_command1 _comp_command2 _comp_command skip +local _comp_command1 _comp_command2 _comp_command +local -A opts -if [[ "$1" = -s ]]; then - skip=(-s) -else - skip=() - _compskip='' -fi +zparseopts -A opts -D - s +(( $+opts[-s] )) || _compskip= # Check for a history reference to complete modifiers. # $PREFIX has a quoted form of the !, so we can't test that @@ -37,5 +34,5 @@ fi _set_command -_dispatch "$skip[@]" "$_comp_command" \ +_dispatch ${(k)opts[-s]} "$_comp_command" \ "$_comp_command1" "$_comp_command2" -default- -- 2.21.0