From: Jon Turney <jon.turney@dronecode.org.uk>
To: cygwin-apps@cygwin.com
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Subject: [PATCH setup 3/4] Remove unused grammar for dependent package architecture information
Date: Mon, 12 Dec 2016 13:30:00 -0000 [thread overview]
Message-ID: <20161212132929.58904-4-jon.turney@dronecode.org.uk> (raw)
In-Reply-To: <20161212132929.58904-1-jon.turney@dronecode.org.uk>
A dependency package entry can apparently end with '[architecturelist]', but
this would be completely ignored if anything ever generated it...
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
---
iniparse.yy | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/iniparse.yy b/iniparse.yy
index 173c665..8ae1e2d 100644
--- a/iniparse.yy
+++ b/iniparse.yy
@@ -195,8 +195,8 @@ listseparator: /* empty */
;
versionedpackageentry /* empty not allowed */
- : STRING { iniBuilder->buildPackageListOrNode($1); } versioncriteria architecture
- | versionedpackageentry OR STRING { iniBuilder->buildPackageListOrNode($3); } versioncriteria architecture
+ : STRING { iniBuilder->buildPackageListOrNode($1); } versioncriteria
+ | versionedpackageentry OR STRING { iniBuilder->buildPackageListOrNode($3); } versioncriteria
;
versioncriteria: /* empty */
@@ -210,16 +210,7 @@ operator /* non-empty */
| LTEQUAL { iniBuilder->buildPackageListOperator (PackageSpecification::LessThanEquals); }
| GTEQUAL { iniBuilder->buildPackageListOperator (PackageSpecification::MoreThanEquals); }
;
-
-architecture: /* empty */
- | OPENSQUARE architecturelist CLOSESQUARE
- ;
-architecturelist: /* empty */
- | architecturelist STRING
- ;
-
-
SourceFilesList: /* empty */
| SourceFilesList MD5 STRING STRING { iniBuilder->buildSourceFile ((unsigned char *)$2, $3, $4); } NL
;
--
2.8.3
next prev parent reply other threads:[~2016-12-12 13:30 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-12 13:30 [PATCH setup 0/4] Various setup patches Jon Turney
2016-12-12 13:30 ` [PATCH setup 4/4] Codesign setup.exe (DO NOT APPLY) Jon Turney
2016-12-12 17:31 ` Corinna Vinschen
2016-12-12 18:47 ` Achim Gratz
2016-12-13 8:30 ` Corinna Vinschen
2016-12-13 18:33 ` Achim Gratz
2016-12-13 20:01 ` Corinna Vinschen
2016-12-13 14:36 ` Jon Turney
2016-12-12 13:30 ` Jon Turney [this message]
2016-12-12 13:30 ` [PATCH setup 1/4] Use English button labels 'Keep', 'Current' and 'Test' Jon Turney
2016-12-12 13:30 ` [PATCH setup 2/4] Fully initialize PROPSHEETPAGE Jon Turney
2016-12-12 17:25 ` [PATCH setup 0/4] Various setup patches Corinna Vinschen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161212132929.58904-4-jon.turney@dronecode.org.uk \
--to=jon.turney@dronecode.org.uk \
--cc=cygwin-apps@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).