Received: by mail.netbsd.org (Postfix, from userid 605) id 1944784D72; Tue, 9 Aug 2022 19:53:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 52E8A84D6C for ; Tue, 9 Aug 2022 19:53:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id XREFB2umlCCy for ; Tue, 9 Aug 2022 19:53:02 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id C3A5484CE2 for ; Tue, 9 Aug 2022 19:53:02 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id BD034FB1A; Tue, 9 Aug 2022 19:53:02 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_16600747828650" MIME-Version: 1.0 Date: Tue, 9 Aug 2022 19:53:02 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/pkgtools/lintpkgsrc/files To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20220809195302.BD034FB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_16600747828650 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Tue Aug 9 19:53:02 UTC 2022 Modified Files: pkgsrc/pkgtools/lintpkgsrc/files: lintpkgsrc.pl Log Message: lintpkgsrc: clean up parsing of variable assignments To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_16600747828650 Content-Disposition: inline Content-Length: 2074 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl diff -u pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.62 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.63 --- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.62 Tue Aug 9 19:42:46 2022 +++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl Tue Aug 9 19:53:02 2022 @@ -1,6 +1,6 @@ #!@PERL5@ -# $NetBSD: lintpkgsrc.pl,v 1.62 2022/08/09 19:42:46 rillig Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.63 2022/08/09 19:53:02 rillig Exp $ # Written by David Brownlee . # @@ -589,25 +589,28 @@ sub parse_makefile_vars($$) { next; } - if (/^ *([-\w\.]+)\s*([:+?]?)=\s*(.*)/) { - my ($key, $plus, $value) = ($1, $2, $3); + if (/^[ ]* ([-\w\.]+) \s* ([:+?]?=) \s* (.*)/x) { + my ($varname, $op, $value) = ($1, $2, $3); - if ($plus eq ':') { - $vars{$key} = parse_expand_vars($value, \%vars); - } elsif ($plus eq '+' && defined $vars{$key}) { - $vars{$key} .= " $value"; - } elsif ($plus ne '?' || !defined $vars{$key}) { - $vars{$key} = $value; + if ($op eq ':=') { + $vars{$varname} = parse_expand_vars($value, \%vars); + } elsif ($op eq '+=' && defined $vars{$varname}) { + $vars{$varname} .= " $value"; + # TODO: Handle append to undefined variable. + } elsif ($op eq '?=' && defined $vars{$varname}) { + # Do nothing. + } else { + $vars{$varname} = $value; } - debug("assignment: $key$plus=[$value] ($vars{$key})\n"); + debug($op eq '=' + ? "assignment: $varname $op $value\n" + : "assignment: $varname $op $value => $vars{$varname}\n"); # Give python a little hand (XXX - do we wanna consider actually # implementing make .for loops, etc? # - if ($key eq 'PYTHON_VERSIONS_ACCEPTED') { - my ($pv); - - foreach $pv (split(/\s+/, $vars{PYTHON_VERSIONS_ACCEPTED})) { + if ($varname eq 'PYTHON_VERSIONS_ACCEPTED') { + foreach my $pv (split(/\s+/, $vars{PYTHON_VERSIONS_ACCEPTED})) { $vars{'_PYTHON_VERSION_FIRSTACCEPTED'} ||= $pv; $vars{"_PYTHON_VERSION_${pv}_OK"} = 'yes'; } --_----------=_16600747828650--