Be sure book file is closed before we leave

[stockfish] / src / book.h

diff --git a/src/book.h b/src/book.h
index b6cee8080ca02205ace5be669059e5e9740b447d..740ef74992562f3d7b6399096d3357124604903c 100644 (file)
--- a/src/book.h
+++ b/src/book.h
@@ -52,31 +52,24 @@ struct BookEntry {
   uint16_t sum;
 };
 
   uint16_t sum;
 };
 

-class Book {
-
+class Book : private std::ifstream {

 public:
 public:

-  // Constructors
-  Book();
-
-  // Open and close book files
-  void open(const std::string &fName);
+  ~Book();
+  void open(const std::string& fName);

   void close();
   void close();

-
-  // Testing if a book is opened
-  bool is_open() const;
-
-  // The file name of the currently active book

   const std::string file_name() const;
   const std::string file_name() const;

-
-  // Get a book move for a given position
-  Move get_move(const Position &pos) const;
+  Move get_move(const Position& pos);

 
 private:
 
 private:

-  int find_key(uint64_t key) const;
-  void read_entry(BookEntry &entry, int n) const;
+  Book& operator>>(uint64_t& n) { n = read_integer(8); return *this; }
+  Book& operator>>(uint16_t& n) { n = (uint16_t)read_integer(2); return *this; }
+  void operator>>(BookEntry& e) { *this >> e.key >> e.move >> e.count >> e.n >> e.sum; }
+
+  uint64_t read_integer(int size);
+  void read_entry(BookEntry& e, int n);
+  int find_key(uint64_t key);

 
   std::string fileName;
 
   std::string fileName;

-  mutable std::ifstream bookFile;

   int bookSize;
 };
 
   int bookSize;
 };