From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 67479 invoked by alias); 12 Dec 2016 13:30:39 -0000 Mailing-List: contact cygwin-apps-help@cygwin.com; run by ezmlm Precedence: bulk Sender: cygwin-apps-owner@cygwin.com List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Mail-Followup-To: cygwin-apps@cygwin.com Received: (qmail 66718 invoked by uid 89); 12 Dec 2016 13:30:05 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.8 required=5.0 tests=AWL,BAYES_20,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_NONE autolearn=no version=3.3.2 spammy=HCc:D*uk, grammar, U*jon.turney, sk:jon.tur X-HELO: rgout01.bt.lon5.cpcloud.co.uk Received: from rgout0103.bt.lon5.cpcloud.co.uk (HELO rgout01.bt.lon5.cpcloud.co.uk) (65.20.0.123) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 12 Dec 2016 13:30:03 +0000 X-OWM-Source-IP: 86.179.112.226 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-Junkmail-Premium-Raw: score=7/50,refid=2.7.2:2016.12.12.125715:17:7.944,ip=,rules=__HAS_FROM, __TO_MALFORMED_2, __TO_NO_NAME, __HAS_CC_HDR, __CC_NAME, __CC_NAME_DIFF_FROM_ACC, __HAS_MSGID, __SANE_MSGID, __HAS_X_MAILER, __IN_REP_TO, __REFERENCES, __FROM_DOMAIN_IN_ANY_CC1, __ANY_URI, __URI_NO_WWW, __STOCK_PHRASE_7, __OEM_PRICE, __FRAUD_MONEY_CURRENCY_DOLLAR, __NO_HTML_TAG_RAW, BODYTEXTP_SIZE_3000_LESS, BODY_SIZE_1400_1499, __MIME_TEXT_P1, __MIME_TEXT_ONLY, __URI_NS, HTML_00_01, HTML_00_10, __FRAUD_MONEY_CURRENCY, BODY_SIZE_5000_LESS, BODY_SIZE_2000_LESS, __FROM_DOMAIN_IN_RCPT, IN_REP_TO, __MIME_TEXT_P, REFERENCES, BODY_SIZE_7000_LESS, NO_URI_HTTPS, MSG_THREAD, __CC_REAL_NAMES, MULTIPLE_REAL_RCPTS, LEGITIMATE_SIGNS, LEGITIMATE_NEGATE Received: from localhost.localdomain (86.179.112.226) by rgout01.bt.lon5.cpcloud.co.uk (9.0.019.13-1) (authenticated as jonturney@btinternet.com) id 584829CB006603B9; Mon, 12 Dec 2016 13:30:00 +0000 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH setup 3/4] Remove unused grammar for dependent package architecture information Date: Mon, 12 Dec 2016 13:30:00 -0000 Message-Id: <20161212132929.58904-4-jon.turney@dronecode.org.uk> In-Reply-To: <20161212132929.58904-1-jon.turney@dronecode.org.uk> References: <20161212132929.58904-1-jon.turney@dronecode.org.uk> X-SW-Source: 2016-12/txt/msg00015.txt.bz2 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 --- 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