From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 2828 invoked from network); 30 Jul 2022 01:04:50 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 30 Jul 2022 01:04:50 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1659143090; b=P03d7PwCSFJj1a5LTANQu0Ai97daAumyPe6dC0ESRbt/oiidD0CPicqm6hnUs0enitYz5qGOHM Y6eYV0VEn04RcN7xX9OZFp7kmWV4ET/iVPppvCa5k3ZaTL82Lm3U8M9XmDwgQP3aJAp1l011Q9 bjyiX1vGknKFXjauTVWiUOxkAGmUcD9b6qTsZvUCMMYzk7Vz6KKPobK/+rejbF9uFF5pJwGR3+ 0jtZg6jizW9nOk2bVTKQnH6Z1mHuwuIgF5mJnSq4rpHFj4u5crl3QOq89lbvV5BEevGex8WbNe ALIa40Y11pCKu6vGOdBfCqm2UfsbNJZppDpRfjg39MRZcg==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-oa1-f49.google.com) smtp.remote-ip=209.85.160.49; dkim=pass header.d=gmail.com header.s=20210112 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1659143090; bh=UAEzFdkBvBsDKowldonxG92QQcppNVDEmFXg1uHYZS0=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:DKIM-Signature: DKIM-Signature; b=qrFcmh1kX40SRS/eYFew73c5fA/UBakYlxh274YvyAklNPq6p4j7v5OWVlMqw7+47HsteIWM+I P5oVlt+3xRUrBln59YOnOKa/X088uXQyxD4euXtB8bHto1CenbNKqZWxrHEwzpmODb5uurbCn8 WvfDLsgoEgOLs9TU9wwDDxZwZ1/DGXvrRWyMi3JUJ+VPvY0iMnUZ3EOb5ut0j6u1s7tJScxA/g 4bVwDg72wPs+HssNywByVlYn2wiBmwk/9DI7poT99BwVOnZOLbxQNRL23pEwby3DcHyz2T7wTM ZElExkfhOiyRKuPcjzcvD2ycu44Hr3q1IuR0VGV/RH4y0Q==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=aLLvI4XKzw51U4dUoZfMmnDKsUX+30/K9SenmJEwfzE=; b=CqqxV8+YJb3dCRREk3WtPFWUag zn9yWKEvluD/1rbVixJpPj5N35Zf8eJjuncrFOH7n3zooyx+nGNbazt0HLF/od5SUhAoRB0435Dgp nkZoL31BZs3SHztb2wOkdWMt58UabPhxB0WDylFL/GuLNILDBwLE9+CU3MfVuczLnht/azY9LSX1j b+J/J5oWpf66Cll7evu7rGcykadRq9YrhGN8XlFEsNDFzBnj/JvvyNKwTaYT57DgTUy/ttjXswcNm SxjBlOhmD/+ShFNZJfypDeVrDwEsgk2i3hJe4/CWFguofG0y2jRylecFA5cC1NKNKVwSn9zwJGCF3 22l2/ByA==; Received: from authenticated user by zero.zsh.org with local id 1oHauQ-000MJb-6G; Sat, 30 Jul 2022 01:04:50 +0000 Authentication-Results: zsh.org; iprev=pass (mail-oa1-f49.google.com) smtp.remote-ip=209.85.160.49; dkim=pass header.d=gmail.com header.s=20210112 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none Received: from mail-oa1-f49.google.com ([209.85.160.49]:43781) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1oHasu-000Kqo-8O; Sat, 30 Jul 2022 01:03:16 +0000 Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-10e6bdbe218so7635396fac.10 for ; Fri, 29 Jul 2022 18:03:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=aLLvI4XKzw51U4dUoZfMmnDKsUX+30/K9SenmJEwfzE=; b=mhkaw1ndGmaQ8lFIXkdGQI1s1Ol5DJ81Qn+IHQ5fd4eIw6+fzFHO6rV6xf/kWqS2t+ i+LymDI6f4jMYU+P+bRMg8MGgzM4njVsAj5dJyYT//awWuDVoN3zkdA2tzY2eY02fsGJ 7xzbFkBcQofZU3hbJLIey3/aKxOj99fg1a7aoYIN9bR10jY7b74MheL1nTCg7aSfE3Md vAnFbzu1Y1TKsnAnAbxVRL21tIPoUDcjIr/KXgj3Ui9TClSjtDCTFh3J4Y6uGpW8+t0F ChzCNg0ICQtaUfYopCHorropdwJ8cTeQfDPVOkXsaX7QrpRQ5r4bCJ7mGflWqI+BMIhZ nJVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=aLLvI4XKzw51U4dUoZfMmnDKsUX+30/K9SenmJEwfzE=; b=zz+eGohjudkcQ7KoRRwopQxU0H3Cd6dZPqap040pG00fW1zpmrO4Pf5U8v1cOSMkhw zqgzqwMbMb3jFiWQiOs1/20TLrm6gZ60HInvVMjyYbXODaTBnVUhDPPcP0/1YT3LVvgz t+Gf67XfLU4EGzm/R/Jj04Q2RiZS9X5ysg8bWKMUa6ivUv7bHwKDWrl8oh0OR6Df6u9F UoXfv8+AQZGhvnXDCB7+Ugh8AJvwMabDP9evfPYeYNk+kQSO9FbW0FX/F72/SJ5DZow4 jNvrYLSU9XLcia9o7/XJRxHTqm53ccC3A7jJvI9ahmWHp9qCUtfiHvrUlSEogSaxFX8+ F/Aw== X-Gm-Message-State: AJIora9Cm6bTjsBRTTuj4m0ID97vpm6LZkzAyqRrseyJ3QuWUsjdgPM1 w93YIx2Du9UaXWjbHSXFhE1uJOCXVcg= X-Google-Smtp-Source: AGRyM1vtjetWYjtv4YJUqBD/EolSgqzSedHjQz40sRqR+0lzMsPupfOmT+Y13J8prUUfiYmW6sTUIQ== X-Received: by 2002:a05:6870:f591:b0:10d:6cce:decc with SMTP id eh17-20020a056870f59100b0010d6ccedeccmr3339239oab.116.1659142994768; Fri, 29 Jul 2022 18:03:14 -0700 (PDT) Received: from localhost ([2806:2f0:4000:5c95:4ae7:daff:fe31:3285]) by smtp.gmail.com with ESMTPSA id o32-20020a05687096a000b0010ea56a12a4sm351790oaq.10.2022.07.29.18.03.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 18:03:14 -0700 (PDT) From: Felipe Contreras To: zsh-workers@zsh.org Cc: Oliver Kiddle , Felipe Contreras Subject: [PATCH 2/3] completion: make: add a simpler parser Date: Fri, 29 Jul 2022 20:03:09 -0500 Message-Id: <20220730010310.3383526-3-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.37.1.225.gfa48d685d2 In-Reply-To: <20220730010310.3383526-1-felipe.contreras@gmail.com> References: <20220730010310.3383526-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Seq: 50436 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: List-Subscribe: List-Unsubscribe: List-Post: List-Owner: List-Archive: The make program does all the heavy lifting, there's no need to use a full parser. In the git build system I get an improvement of more than 3 times (from 3.68 to 1.07 seconds). Signed-off-by: Felipe Contreras --- Completion/Unix/Command/_make | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/Completion/Unix/Command/_make b/Completion/Unix/Command/_make index 28c529a88..94747ae58 100644 --- a/Completion/Unix/Command/_make +++ b/Completion/Unix/Command/_make @@ -118,6 +118,24 @@ _make-parseMakefile () { done } +_make-parseDataBase () { + local input var TAB=$'\t' IFS= + + while read input + do + case "$input " in + ([[:alnum:]][[:alnum:]_]#[" "$TAB]#(\?|:|::|)=*) + var=${input%%[ $TAB]#(\?|:|::|)=*} + VARIABLES[$var]=1 + ;; + + ([[*?[:alnum:]$][^$TAB:=%]#:[^=]*) + TARGETS+=( ${input%%:*} ) + ;; + esac + done +} + _make() { local prev="$words[CURRENT-1]" file expl tmp is_gnu incl match basedir nul=$'\0' @@ -239,7 +257,7 @@ _make() { if [[ $is_gnu == gnu ]] then if zstyle -t ":completion:${curcontext}:targets" call-command; then - _make-parseMakefile < <(_call_program targets "$words[1]" -nsp --no-print-directory -f "$file" .DEFAULT 2> /dev/null) + _make-parseDataBase < <(_call_program targets "$words[1]" -nsp --no-print-directory -f "$file" .DEFAULT 2> /dev/null) else _make-parseMakefile < $file fi -- 2.37.1.225.gfa48d685d2