[PATCH setup 3/4] Remove unused grammar for dependent package architecture information

Jon Turney jon.turney@dronecode.org.uk
Mon Dec 12 13:30:00 GMT 2016


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



More information about the Cygwin-apps mailing list