[PATCH setup 2/8] Remove unused lexer tokens

[Jon Turney <jon dot turney at dronecode dot org dot uk>]

Terminals unused in grammar

   APATH
   PPATH
   INCLUDE_SETUP
   EXCLUDE_PACKAGE
   DOWNLOAD_URL
   DESCRIPTION
   EMAIL
   OPENSQUARE
   CLOSESQUARE

EXCLUDE_PACKAGE and DESCRIPTION aren't even produced by any lexer rule

OPENSQUARE and CLOSESQUARE are unused since 3074ce5e, EXCLUDE_PACKAGE seems
to have done something in 2001, the rest never seem to have been used.

Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
---
 inilex.ll   | 12 ------------
 iniparse.yy |  6 ++----
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/inilex.ll b/inilex.ll
index 7daca34..32a172b 100644
--- a/inilex.ll
+++ b/inilex.ll
@@ -146,13 +146,6 @@ B64	[a-zA-Z0-9_-]
 "Replaces:"		return REPLACES;
 "Provides:"		return PROVIDES;
 
-"apath:"		return APATH;
-"ppath:"		return PPATH;
-
-"include-setup:"	return INCLUDE_SETUP;
-
-"download-url:"		return DOWNLOAD_URL;
-
 ^{STR}":"		ignore_line ();
 
 "[curr]"		return T_CURR;
@@ -163,8 +156,6 @@ B64	[a-zA-Z0-9_-]
 
 "("			return OPENBRACE;
 ")"			return CLOSEBRACE;
-"["			return OPENSQUARE;
-"]"			return CLOSESQUARE;
 "<<"			return LT;
 ">>"			return GT;
 ">="			return GTEQUAL;
@@ -176,9 +167,6 @@ B64	[a-zA-Z0-9_-]
 "|"			return OR;
 "@"			return AT;
 
-{STR}"@"{STR}		{ yylval = new char [strlen(yytext) + 1];
-    			  strcpy (yylval, yytext);
-			  return EMAIL; }
 {STR}			{ yylval = new char [strlen(yytext) + 1];
   			  strcpy (yylval, yytext);
 			  return STRING; }
diff --git a/iniparse.yy b/iniparse.yy
index 7a0b522..70a9dd7 100644
--- a/iniparse.yy
+++ b/iniparse.yy
@@ -40,16 +40,14 @@ void add_correct_version();
 %token STRING 
 %token SETUP_TIMESTAMP SETUP_VERSION PACKAGEVERSION INSTALL SOURCE SDESC LDESC
 %token CATEGORY DEPENDS REQUIRES
-%token APATH PPATH INCLUDE_SETUP EXCLUDE_PACKAGE DOWNLOAD_URL
 %token T_PREV T_CURR T_TEST T_OTHER
 %token INSTALLEDSIZE MAINTAINER PRIORITY
 %token MD5 MD5LINE SHA512 SHA512LINE
-%token DESCTAG DESCRIPTION FILESIZE ARCHITECTURE SOURCEPACKAGE
+%token DESCTAG FILESIZE ARCHITECTURE SOURCEPACKAGE
 %token RECOMMENDS PREDEPENDS
 %token SUGGESTS CONFLICTS REPLACES PROVIDES PACKAGENAME STRTOEOL PARAGRAPH
-%token EMAIL COMMA OR NL AT
+%token COMMA OR NL AT
 %token OPENBRACE CLOSEBRACE EQUAL GT LT GTEQUAL LTEQUAL 
-%token OPENSQUARE CLOSESQUARE
 %token BINARYPACKAGE BUILDDEPENDS STANDARDSVERSION FORMAT DIRECTORY FILES
 %token MESSAGE
 %token ARCH RELEASE
-- 
2.8.3