Simplify printing of engine info

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/main.cpp b/src/main.cpp
index 9b1b5ecfe4f373ce3fc6849cb64a0b5c86e481e0..765cd2caa52b93d52ff9c7bbe0fb984b43d0676b 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -40,19 +40,18 @@ int main(int argc, char* argv[]) {
   Search::init();
   Threads.init();
 
   Search::init();
   Threads.init();
 

-  if (argc < 2)
-  {
-      cout << engine_name() << " by " << engine_authors() << endl;
+  cout << engine_info() << endl;
+
+  if (argc == 1)

       uci_loop();
       uci_loop();

-  }
+

   else if (string(argv[1]) == "bench")
       benchmark(argc, argv);
 
   else
   else if (string(argv[1]) == "bench")
       benchmark(argc, argv);
 
   else

-      cout << "Usage: stockfish bench [hash size = 128] [threads = 1] "
+      cerr << "\nUsage: stockfish bench [hash size = 128] [threads = 1] "

            << "[limit = 12] [fen positions file = default] "
            << "[limited by depth, time, nodes or perft = depth]" << endl;
 
   Threads.exit();
            << "[limit = 12] [fen positions file = default] "
            << "[limited by depth, time, nodes or perft = depth]" << endl;
 
   Threads.exit();

-  return 0;

 }
 }

diff --git a/src/misc.cpp b/src/misc.cpp
index 9189e327fd1f49b2048e9a515e53ffc70c2bd6aa..679e38affcd3df915f97f5d2af1fd3ed71962957 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -52,47 +52,44 @@
 
 using namespace std;
 
 
 using namespace std;
 

-/// Version number. If EngineVersion is left empty, then AppTag plus
-/// current date (in the format YYMMDD) is used as a version number.

 
 

-static const string AppName = "Stockfish";
-static const string EngineVersion = "";
-static const string AppTag  = "";
+/// Version number. If Version is left empty, then Tag plus current
+/// date (in the format YYMMDD) is used as a version number.

 
 

+static const string Version = "";
+static const string Tag  = "";

 
 

-/// engine_name() returns the full name of the current Stockfish version.
+
+/// engine_info() returns the full name of the current Stockfish version.

 /// This will be either "Stockfish YYMMDD" (where YYMMDD is the date when
 /// the program was compiled) or "Stockfish <version number>", depending
 /// This will be either "Stockfish YYMMDD" (where YYMMDD is the date when
 /// the program was compiled) or "Stockfish <version number>", depending

-/// on whether the constant EngineVersion is empty.
+/// on whether Version is empty.

 
 

-const string engine_name() {
+const string engine_info(bool to_uci) {

 
   const string months("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec");
   const string cpu64(Is64Bit ? " 64bit" : "");
   const string popcnt(HasPopCnt ? " SSE4.2" : "");
 
 
   const string months("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec");
   const string cpu64(Is64Bit ? " 64bit" : "");
   const string popcnt(HasPopCnt ? " SSE4.2" : "");
 

-  if (!EngineVersion.empty())
-      return AppName + " " + EngineVersion + cpu64 + popcnt;
-
-  stringstream s, date(__DATE__); // From compiler, format is "Sep 21 2008"

   string month, day, year;
   string month, day, year;

+  stringstream s, date(__DATE__); // From compiler, format is "Sep 21 2008"

 
 

-  date >> month >> day >> year;
-
-  s << AppName + " " + AppTag + " "
-    << setfill('0') << year.substr(2)
-    << setw(2) << (1 + months.find(month) / 4)
-    << setw(2) << day << cpu64 << popcnt;
-
-  return s.str();
-}
-
+  if (Version.empty())
+  {
+      date >> month >> day >> year;

 
 

-/// Our brave developers! Required by UCI
+      s << "Stockfish " << Tag
+        << setfill('0') << " " << year.substr(2)
+        << setw(2) << (1 + months.find(month) / 4)
+        << setw(2) << day << cpu64 << popcnt;
+  }
+  else
+      s << "Stockfish " << Version << cpu64 << popcnt;

 
 

-const string engine_authors() {
+  s << (to_uci ? "\nid author ": " by ")
+    << "Tord Romstad, Marco Costalba and Joona Kiiski";

 
 

-  return "Tord Romstad, Marco Costalba and Joona Kiiski";
+  return s.str();

 }
 
 
 }
 
 

diff --git a/src/misc.h b/src/misc.h
index c5ca538755665280b8daa7f496bd27a65ca34bab..70fc01ebfec08d4e5774db30d0fa2c38eb6f8b0c 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -26,8 +26,7 @@
 #include "lock.h"
 #include "types.h"
 
 #include "lock.h"
 #include "types.h"
 

-extern const std::string engine_name();
-extern const std::string engine_authors();
+extern const std::string engine_info(bool to_uci = false);

 extern int system_time();
 extern int cpu_count();
 extern void timed_wait(WaitCondition*, Lock*, int);
 extern int system_time();
 extern int cpu_count();
 extern void timed_wait(WaitCondition*, Lock*, int);

diff --git a/src/uci.cpp b/src/uci.cpp
index 9faf842f0f4b3e41a723d4a2b0fab80e4f654006..9086a62c478f5b02a229c9734fee54afbfedbdaa 100644 (file)
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -117,8 +117,7 @@ void uci_loop() {
                << "\npawn key: "     << pos.pawn_key() << endl;
 
       else if (token == "uci")
                << "\npawn key: "     << pos.pawn_key() << endl;
 
       else if (token == "uci")

-          cout << "id name "     << engine_name()
-               << "\nid author " << engine_authors()
+          cout << "id name "     << engine_info(true)

                << "\n"           << Options
                << "\nuciok"      << endl;
       else
                << "\n"           << Options
                << "\nuciok"      << endl;
       else