From d2caba1f6649328a584b3bc24478b43e49d3fae5 Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Tue, 1 Apr 2014 09:39:41 +0200 Subject: [PATCH 1/1] Do not workaround function argument evaluation Rewrite options initialization to do not trying to hack upon the undefined evaluation order of function arguments. No functional change. --- src/ucioption.cpp | 82 +++++++++++++++++++++++++++-------------------- src/ucioption.h | 1 + 2 files changed, 48 insertions(+), 35 deletions(-) diff --git a/src/ucioption.cpp b/src/ucioption.cpp index 2184c692..dbab6fc1 100644 --- a/src/ucioption.cpp +++ b/src/ucioption.cpp @@ -54,36 +54,36 @@ bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const void init(OptionsMap& o) { - o["Write Debug Log"] = Option(false, on_logger); - o["Write Search Log"] = Option(false); - o["Search Log Filename"] = Option("SearchLog.txt"); - o["Book File"] = Option("book.bin"); - o["Best Book Move"] = Option(false); - o["Contempt Factor"] = Option(0, -50, 50); - o["Mobility (Midgame)"] = Option(100, 0, 200, on_eval); - o["Mobility (Endgame)"] = Option(100, 0, 200, on_eval); - o["Pawn Structure (Midgame)"] = Option(100, 0, 200, on_eval); - o["Pawn Structure (Endgame)"] = Option(100, 0, 200, on_eval); - o["Passed Pawns (Midgame)"] = Option(100, 0, 200, on_eval); - o["Passed Pawns (Endgame)"] = Option(100, 0, 200, on_eval); - o["Space"] = Option(100, 0, 200, on_eval); - o["Aggressiveness"] = Option(100, 0, 200, on_eval); - o["Cowardice"] = Option(100, 0, 200, on_eval); - o["Min Split Depth"] = Option(0, 0, 12, on_threads); - o["Threads"] = Option(1, 1, MAX_THREADS, on_threads); - o["Idle Threads Sleep"] = Option(true); - o["Hash"] = Option(32, 1, 16384, on_hash_size); - o["Clear Hash"] = Option(on_clear_hash); - o["Ponder"] = Option(true); - o["OwnBook"] = Option(false); - o["MultiPV"] = Option(1, 1, 500); - o["Skill Level"] = Option(20, 0, 20); - o["Emergency Move Horizon"] = Option(40, 0, 50); - o["Emergency Base Time"] = Option(60, 0, 30000); - o["Emergency Move Time"] = Option(30, 0, 5000); - o["Minimum Thinking Time"] = Option(20, 0, 5000); - o["Slow Mover"] = Option(80, 10, 1000); - o["UCI_Chess960"] = Option(false); + o["Write Debug Log"] << Option(false, on_logger); + o["Write Search Log"] << Option(false); + o["Search Log Filename"] << Option("SearchLog.txt"); + o["Book File"] << Option("book.bin"); + o["Best Book Move"] << Option(false); + o["Contempt Factor"] << Option(0, -50, 50); + o["Mobility (Midgame)"] << Option(100, 0, 200, on_eval); + o["Mobility (Endgame)"] << Option(100, 0, 200, on_eval); + o["Pawn Structure (Midgame)"] << Option(100, 0, 200, on_eval); + o["Pawn Structure (Endgame)"] << Option(100, 0, 200, on_eval); + o["Passed Pawns (Midgame)"] << Option(100, 0, 200, on_eval); + o["Passed Pawns (Endgame)"] << Option(100, 0, 200, on_eval); + o["Space"] << Option(100, 0, 200, on_eval); + o["Aggressiveness"] << Option(100, 0, 200, on_eval); + o["Cowardice"] << Option(100, 0, 200, on_eval); + o["Min Split Depth"] << Option(0, 0, 12, on_threads); + o["Threads"] << Option(1, 1, MAX_THREADS, on_threads); + o["Idle Threads Sleep"] << Option(true); + o["Hash"] << Option(32, 1, 16384, on_hash_size); + o["Clear Hash"] << Option(on_clear_hash); + o["Ponder"] << Option(true); + o["OwnBook"] << Option(false); + o["MultiPV"] << Option(1, 1, 500); + o["Skill Level"] << Option(20, 0, 20); + o["Emergency Move Horizon"] << Option(40, 0, 50); + o["Emergency Base Time"] << Option(60, 0, 30000); + o["Emergency Move Time"] << Option(30, 0, 5000); + o["Minimum Thinking Time"] << Option(20, 0, 5000); + o["Slow Mover"] << Option(80, 10, 1000); + o["UCI_Chess960"] << Option(false); } @@ -92,7 +92,7 @@ void init(OptionsMap& o) { std::ostream& operator<<(std::ostream& os, const OptionsMap& om) { - for (size_t idx = 0; idx < om.size() + 1; ++idx) // idx could start from 1 + for (size_t idx = 0; idx < om.size(); ++idx) for (OptionsMap::const_iterator it = om.begin(); it != om.end(); ++it) if (it->second.idx == idx) { @@ -113,16 +113,16 @@ std::ostream& operator<<(std::ostream& os, const OptionsMap& om) { /// Option class constructors and conversion operators -Option::Option(const char* v, OnChange f) : type("string"), min(0), max(0), idx(Options.size()), on_change(f) +Option::Option(const char* v, OnChange f) : type("string"), min(0), max(0), on_change(f) { defaultValue = currentValue = v; } -Option::Option(bool v, OnChange f) : type("check"), min(0), max(0), idx(Options.size()), on_change(f) +Option::Option(bool v, OnChange f) : type("check"), min(0), max(0), on_change(f) { defaultValue = currentValue = (v ? "true" : "false"); } -Option::Option(OnChange f) : type("button"), min(0), max(0), idx(Options.size()), on_change(f) +Option::Option(OnChange f) : type("button"), min(0), max(0), on_change(f) {} -Option::Option(int v, int minv, int maxv, OnChange f) : type("spin"), min(minv), max(maxv), idx(Options.size()), on_change(f) +Option::Option(int v, int minv, int maxv, OnChange f) : type("spin"), min(minv), max(maxv), on_change(f) { std::ostringstream ss; ss << v; defaultValue = currentValue = ss.str(); } @@ -137,6 +137,18 @@ Option::operator std::string() const { } +/// operator<<() inits options and assigns idx in the correct printing order + +Option& Option::operator<<(const Option& o) { + + static size_t index = 0; + + *this = o; + idx = index++; + return *this; +} + + /// operator=() updates currentValue and triggers on_change() action. It's up to /// the GUI to check for option's limits, but we could receive the new value from /// the user by console window, so let's check the bounds anyway. diff --git a/src/ucioption.h b/src/ucioption.h index 2eb937a8..75e4ac13 100644 --- a/src/ucioption.h +++ b/src/ucioption.h @@ -47,6 +47,7 @@ public: Option(int v, int min, int max, OnChange = NULL); Option& operator=(const std::string& v); + Option& operator<<(const Option& o); operator int() const; operator std::string() const; -- 2.39.2