Now the program can actually start (but probably not much more)

Jesper Torp Kristensen · Jesper Torp Kristensen · commit 6ba128b2636f · 2016-01-03T23:56:48.000+01:00
diff --git a/src/Makefile b/src/Makefile
@@ -1,9 +1,10 @@
 CXX = g++
 
-CFLAGS  = -O3 -arch x86_64 -Wall -pedantic -ansi -Werror -Wextra -DNDEBUG
-CFLAGS_DB = -ggdb3 -pg -Wall -pedantic -ansi -Werror -Wextra
-CFLAGS_XB = -O3 -Wall -pedantic -ansi -DNDEBUG -DXBOARD
-CFLAGS_DB_XB = -ggdb3 -pg -Wall -pedantic -ansi -DXBOARD
+COMMON_FLAGS = -Wall -pedantic -pedantic-errors -ansi -Werror -Wextra -Wcomment -Wformat -Winit-self -Wmissing-include-dirs
+CFLAGS  = -O3 -arch x86_64 -DNDEBUG $(COMMON_FLAGS)
+CFLAGS_DB = -ggdb3 -pg $(COMMON_FLAGS)
+CFLAGS_XB = -O3 -DNDEBUG -DXBOARD $(COMMON_FLAGS)
+CFLAGS_DB_XB = -ggdb3 -pg -DXBOARD $(COMMON_FLAGS)
 
 SOURCES = $(wildcard *.cxx) $(wildcard */*.cxx) $(wildcard */*/*.cxx)
 MODS = $(SOURCES:.cxx=.o)
diff --git a/src/chess.cxx b/src/chess.cxx
@@ -47,12 +47,9 @@ int main(__attribute__((unused)) int argc, __attribute__((unused)) char* argv[])
   cout << "feature sigint=0\n";
   cout << "feature sigterm=0\n";
   cout << "feature done=1\n";
-
   endgame_settings = new EndgameSettings(&(comm->settings));
-
   search_version = *(comm->settings.get_int_setting("Default_search_function", 1));
   evaluation_version = *(comm->settings.get_int_setting("Default_evaluation_function", 1));
-
   cpu = load_cpu(cpu, search_version, evaluation_version, comm);
   cpu->new_game();
 
diff --git a/src/endgames/endgame_settings.cxx b/src/endgames/endgame_settings.cxx
@@ -19,7 +19,6 @@ void EndgameSettings::set_settings(Settings *_settings) {
 
   construction_method = get_int("construction_method");
   unreachability_depth_test = get_int("unreachability_depth_test");
-
   directory = get_string("directory");
 
   output_bdd_tables = get_bool("output_bdd_tables");
diff --git a/src/settings.cxx b/src/settings.cxx
@@ -19,7 +19,6 @@ char *new_string(int allocated_size = 256) {
   return (char *)malloc(allocated_size);
 }
 
-
 SettingValue::SettingValue(string value, string comment) : comment(comment) {
   if (value=="true"  ||  value=="false") {
     value_type = BoolValue;
@@ -34,7 +33,7 @@ SettingValue::SettingValue(string value, string comment) : comment(comment) {
   } else if (strstr(value.c_str(), "false")) {
     value_type = BoolValue;
     u.bool_value = false;
-    
+
   } else if (value[0]=='\"') {
     value_type = StringValue;
     u.string_value = new_string();
@@ -162,11 +161,10 @@ int *Settings::get_int_setting(string name, int _default) {
 }
 
 
-char *Settings::get_string_setting(string name, char *_default) {
+char *Settings::get_string_setting(string name) {
   if (values.count(name)) return values[name]->u.string_value;
-  cerr << "\nWarning: setting " << name << " not found. Returning "
-       << (_default ? _default : "\"\"") << ".\n";
-  values[name] = new SettingValue(_default, "// default value set");
+  cerr << "\nWarning: setting " << name << " not found. Returning \"\"." << endl;
+  values[name] = new SettingValue("\"\"", "// default value set");
   return values[name]->u.string_value;
 }
 
diff --git a/src/settings.hxx b/src/settings.hxx
@@ -29,7 +29,7 @@ struct SettingValue {
   union {
     bool bool_value;
     int int_value;
-    char *string_value;
+    char * string_value;
   } u;
 
   string comment;
@@ -54,9 +54,9 @@ public:
   void print(ostream &os, string only_with_prefix = "");
   void save();
 
-  bool *get_bool_setting(string name, bool _default = false);
-  int *get_int_setting(string name, int _default = 0);
-  char *get_string_setting(string name, char *_default = 0);
+  bool *get_bool_setting(string name, bool _default);
+  int *get_int_setting(string name, int _default);
+  char *get_string_setting(string name);
 
   void define(string name, string value, string comment="", bool force_new = false);
 
@@ -96,19 +96,19 @@ protected:
     assert(settings);
     return settings->get_int_setting(setting_name + name, _default);
   }
-  char *get_string(string name, char *_default = 0) {
+  char *get_string(string name) {
     assert(settings);
-    return settings->get_string_setting(setting_name + name, _default);
+    return settings->get_string_setting(setting_name + name);
   }
 
   void pbool(ostream &os, string name) {
     const string TF[2] = {"false","true"};
-    os << "\t" << name << " = " << TF[*(settings->get_bool_setting(setting_name + name))] << "\n";
+    os << "\t" << name << " = " << TF[*(settings->get_bool_setting(setting_name + name, false))] << "\n";
   }
   void pint(ostream &os, string name) {
-    os << "\t" << name << " = " << *(settings->get_int_setting(setting_name + name)) << "\n";
+    os << "\t" << name << " = " << *(settings->get_int_setting(setting_name + name, 0)) << "\n";
   }
-  
+
   string setting_name;
   Settings *settings;
 };
diff --git a/src/test_suite.cxx b/src/test_suite.cxx
@@ -394,7 +394,7 @@ class CompareEval {
                                             << ", fast evaluate = " << cpu->fast_evaluate() << "\n\n";
         allowed_diff = abs(l[index]-e);
         if (allowed_diff > 10000)
-          *(comm->settings.get_bool_setting("Eval3_show_evaluation_info")) = true;
+          *(comm->settings.get_bool_setting("Eval3_show_evaluation_info", false)) = true;
       }
     }
     if (++index == num_positions) load_files = false;

Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,7 @@ class CompareEval {`
`394`	`394`	`<< ", fast evaluate = " << cpu->fast_evaluate() << "\n\n";`
`395`	`395`	`allowed_diff = abs(l[index]-e);`
`396`	`396`	`if (allowed_diff > 10000)`
`397`		`- *(comm->settings.get_bool_setting("Eval3_show_evaluation_info")) = true;`
	`397`	`+ *(comm->settings.get_bool_setting("Eval3_show_evaluation_info", false)) = true;`
`398`	`398`	`}`
`399`	`399`	`}`
`400`	`400`	`if (++index == num_positions) load_files = false;`