2002-07-10 Robert Collins <rbtcollins@hotmail.com>

        * iniparse.y: Add basis for support for parsing a debian Sources file.
        * inilex.l: Ditto.

diff --git a/ChangeLog b/ChangeLog
index 8c3a857d6e204669abc304591ac9ecf8639ab46d..d78c6cfb5018697cf6e1cad98228f673a5c7d1b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-10  Robert Collins  <rbtcollins@hotmail.com>
+
+       * iniparse.y: Add basis for support for parsing a debian Sources file.
+       * inilex.l: Ditto.
+
 2002-07-09  Robert Collins  <rbtcollins@hotmail.com>
 
        Change custom container code for packagedb::packages to STL containers

diff --git a/inilex.l b/inilex.l
index b004931690dbfc8dd3eed28e242efc6e67701f18..24633dfb04f2fabd29396c2ace30095da9f38c55 100644 (file)
--- a/inilex.l
+++ b/inilex.l
@@ -82,6 +82,12 @@ STR  [a-zA-Z0-9_./:\+-]+
 "Maintainer:"          BEGIN (eolstate); return MAINTAINER;
 "Architecture:"                return ARCHITECTURE;
 "Source:"              return SOURCEPACKAGE;
+"Binary:"              return BINARYPACKAGE;
+"Build-Depends:"       return BUILDDEPENDS;
+"Standards-Version:"   return STANDARDSVERSION; 
+"Format:"              return FORMAT;
+"Directory:"           return DIRECTORY;
+"Files:"               return FILES;
 
 "category:"|"Section:" return CATEGORY;
 "Priority:"            return PRIORITY;

diff --git a/iniparse.y b/iniparse.y
index 09c9f7e77562413d985a0aada205f5811db2f60f..12ab7df81eddcd2d2327e444780ff29bfb554247 100644 (file)
--- a/iniparse.y
+++ b/iniparse.y
@@ -53,6 +53,7 @@ void add_correct_version();
 %token SUGGESTS CONFLICTS REPLACES PROVIDES PACKAGENAME STRTOEOL PARAGRAPH LEX_EOF
 %token EMAIL COMMA OR NL AT
 %token OPENBRACE CLOSEBRACE EQUAL GT LT GTEQUAL LTEQUAL 
+%token BINARYPACKAGE BUILDDEPENDS STANDARDSVERSION FORMAT DIRECTORY FILES
 
 %%
 
@@ -103,12 +104,16 @@ singleitem /* non-empty */
  | MAINTAINER STRING NL                { iniBuilder->buildMaintainer ($2); }
  | ARCHITECTURE STRING NL      { iniBuilder->buildArchitecture ($2); }
  | FILESIZE STRING NL          { iniBuilder->buildInstallSize($2); }
+ | FORMAT STRING NL            { /* TODO */ }
+ | DIRECTORY STRING NL         { /* TODO */ }
+ | STANDARDSVERSION STRING NL  { /* TODO */ }
  | MD5LINE MD5 NL      { iniBuilder->buildInstallMD5 ((unsigned char *)$2); }
  | SOURCEPACKAGE source NL
  | CATEGORY categories NL
  | INSTALL STRING { iniBuilder->buildPackageInstall ($2); } installmeta NL
  | SOURCE STRING STRING sourceMD5 NL {iniBuilder->buildPackageSource ($2, $3);}
  | PROVIDES            { iniBuilder->buildBeginProvides(); } packagelist NL
+ | BINARYPACKAGE  { /* TODO */ } packagelist NL
  | CONFLICTS   { iniBuilder->buildBeginConflicts(); } versionedpackagelist NL
  | DEPENDS { iniBuilder->buildBeginDepends(); } versionedpackagelist NL
  | REQUIRES { iniBuilder->buildBeginDepends(); }versionedpackagelistsp NL
@@ -116,6 +121,8 @@ singleitem /* non-empty */
  | RECOMMENDS { iniBuilder->buildBeginRecommends(); }   versionedpackagelist NL
  | SUGGESTS { iniBuilder->buildBeginSuggests(); } versionedpackagelist NL
  | REPLACES { iniBuilder->buildBeginReplaces(); }       versionedpackagelist NL
+ | BUILDDEPENDS { /* todo */ } versionedpackagelist NL
+ | FILES NL SourceFilesList
  | DESCTAG mlinedesc
  | LEX_EOF                     { YYACCEPT; }
  | error                       { yyerror (String("unrecognized line ") 
@@ -196,4 +203,8 @@ operator /* non-empty */
  | GTEQUAL { iniBuilder->buildPackageListOperator (PackageSpecification::MoreThanEquals); }
  ;
  
+SourceFilesList: /* empty */
+ | SourceFilesList MD5 STRING STRING NL
+ ;
+ 
 %%