Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans

[apt.git] / apt-pkg / deb / deblistparser.h

diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index 8da051530fd06cf9b60e5a25e318a90ee733c64d..b55e57d41afcb962baad3be92e4f1246859d12a8 100644 (file)
--- a/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@ -12,8 +12,19 @@
 #define PKGLIB_DEBLISTPARSER_H
 
 #include <apt-pkg/pkgcachegen.h>
 #define PKGLIB_DEBLISTPARSER_H
 
 #include <apt-pkg/pkgcachegen.h>

-#include <apt-pkg/indexfile.h>

 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/tagfile.h>

+#include <apt-pkg/md5.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/macros.h>
+
+#include <string>
+#include <vector>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/indexfile.h>
+#endif
+
+class FileFd;

 
 class debListParser : public pkgCacheGenerator::ListParser
 {
 
 class debListParser : public pkgCacheGenerator::ListParser
 {


@@ -25,52 +36,93 @@ class debListParser : public pkgCacheGenerator::ListParser
       const char *Str;
       unsigned char Val;
    };
       const char *Str;
       unsigned char Val;
    };

-   
+

    private:
    private:

-   
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+
+   protected:

    pkgTagFile Tags;
    pkgTagSection Section;
    pkgTagFile Tags;
    pkgTagSection Section;

-   unsigned long iOffset;
-   string Arch;
-   
-   unsigned long UniqFindTagWrite(const char *Tag);
-   bool ParseStatus(pkgCache::PkgIterator Pkg,pkgCache::VerIterator Ver);
-   bool ParseDepends(pkgCache::VerIterator Ver,const char *Tag,
+   map_filesize_t iOffset;
+   std::string Arch;
+   std::vector<std::string> Architectures;
+   bool MultiArchEnabled;
+
+   virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver);
+   bool ParseDepends(pkgCache::VerIterator &Ver,const char *Tag,

                     unsigned int Type);
                     unsigned int Type);

-   bool ParseProvides(pkgCache::VerIterator Ver);
-   static bool GrabWord(string Word,WordList *List,unsigned char &Out);
-   
+   bool ParseProvides(pkgCache::VerIterator &Ver);
+   bool NewProvidesAllArch(pkgCache::VerIterator &Ver, std::string const &Package, std::string const &Version);
+   static bool GrabWord(std::string Word,WordList *List,unsigned char &Out);
+   APT_HIDDEN unsigned char ParseMultiArch(bool const showErrors);
+

    public:
 
    public:
 

-   static unsigned char GetPrio(string Str);
+   static unsigned char GetPrio(std::string Str);

       
    // These all operate against the current section
       
    // These all operate against the current section

-   virtual string Package();
-   virtual string Architecture();
+   virtual std::string Package();
+   virtual std::string Architecture();

    virtual bool ArchitectureAll();
    virtual bool ArchitectureAll();

-   virtual string Version();
-   virtual bool NewVersion(pkgCache::VerIterator Ver);
-   virtual string Description();
-   virtual string DescriptionLanguage();
+   virtual std::string Version();
+   virtual bool NewVersion(pkgCache::VerIterator &Ver);
+   virtual std::string Description(std::string const &lang);
+   virtual std::vector<std::string> AvailableDescriptionLanguages();

    virtual MD5SumValue Description_md5();
    virtual unsigned short VersionHash();
    virtual MD5SumValue Description_md5();
    virtual unsigned short VersionHash();

-   virtual bool UsePackage(pkgCache::PkgIterator Pkg,
-                          pkgCache::VerIterator Ver);
-   virtual unsigned long Offset() {return iOffset;};
-   virtual unsigned long Size() {return Section.size();};
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+   virtual bool SameVersion(unsigned short const Hash, pkgCache::VerIterator const &Ver);
+#endif
+   virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
+                          pkgCache::VerIterator &Ver);
+   virtual map_filesize_t Offset() {return iOffset;};
+   virtual map_filesize_t Size() {return Section.size();};

 
    virtual bool Step();
    
 
    virtual bool Step();
    

-   bool LoadReleaseInfo(pkgCache::PkgFileIterator FileI,FileFd &File,
-                       string section);
-   
+   bool LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,FileFd &File,
+                       std::string section);
+
+   static const char *ParseDepends(const char *Start,const char *Stop,
+        std::string &Package,std::string &Ver,unsigned int &Op);
+   static const char *ParseDepends(const char *Start,const char *Stop,
+        std::string &Package,std::string &Ver,unsigned int &Op,
+        bool const &ParseArchFlags);

    static const char *ParseDepends(const char *Start,const char *Stop,
    static const char *ParseDepends(const char *Start,const char *Stop,

-                           string &Package,string &Ver,unsigned int &Op,
-                           bool const &ParseArchFlags = false,
-                           bool const &StripMultiArch = false);
+        std::string &Package,std::string &Ver,unsigned int &Op,
+        bool const &ParseArchFlags, bool const &StripMultiArch);
+   static const char *ParseDepends(const char *Start,const char *Stop,
+        std::string &Package,std::string &Ver,unsigned int &Op,
+        bool const &ParseArchFlags, bool const &StripMultiArch,
+        bool const &ParseRestrictionsList);
+

    static const char *ConvertRelation(const char *I,unsigned int &Op);
 
    static const char *ConvertRelation(const char *I,unsigned int &Op);
 

-   debListParser(FileFd *File, string const &Arch = "");
+   debListParser(FileFd *File, std::string const &Arch = "");
+   virtual ~debListParser() {};
+};
+
+class debDebFileParser : public debListParser
+{
+ private:
+   std::string DebFile;
+
+ public:
+   debDebFileParser(FileFd *File, std::string const &DebFile);
+   virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
+                          pkgCache::VerIterator &Ver);
+};
+
+class debTranslationsParser : public debListParser
+{
+ public:
+   // a translation can never be a real package
+   virtual std::string Architecture() { return ""; }
+   virtual std::string Version() { return ""; }
+
+   debTranslationsParser(FileFd *File, std::string const &Arch = "")
+      : debListParser(File, Arch) {};

 };
 
 #endif
 };
 
 #endif