Preferring brace initialization of SMTOption-s and avoiding narrowing conversions

Author: Tomaqa

src/bin/opensmt.cc

@@ -276,30 +276,30 @@ SMTConfig parseCMDLineArgs( int argc, char * argv[ ] )
                         printVersion();
                         exit(0);
                     case minUcoreLongOpt:
-                        res.setOption(SMTConfig::o_minimal_unsat_cores, SMTOption(true), msg);
+                        res.setOption(SMTConfig::o_minimal_unsat_cores, SMTOption{true}, msg);
                         break;
                     case fullUcoreLongOpt:
-                        res.setOption(SMTConfig::o_print_cores_full, SMTOption(true), msg);
+                        res.setOption(SMTConfig::o_print_cores_full, SMTOption{true}, msg);
                         break;
                 }
                 break;
             case 'h':
                 printHelp();
                 exit(0);
             case 'v':
-                res.setOption(SMTConfig::o_verbosity, SMTOption(true), msg);
+                res.setOption(SMTConfig::o_verbosity, SMTOption{true}, msg);
                 break;
             case 'd':
-                res.setOption(SMTConfig::o_dryrun, SMTOption(true), msg);
+                res.setOption(SMTConfig::o_dryrun, SMTOption{true}, msg);
                 break;
             case 'r':
-                if (!res.setOption(SMTConfig::o_random_seed, SMTOption(atoi(optarg)), msg))
+                if (!res.setOption(SMTConfig::o_random_seed, SMTOption{atoi(optarg)}, msg))
                     fprintf(stderr, "Error setting random seed: %s\n", msg);
                 else
                     fprintf(stderr, "; Using random seed %d\n", atoi(optarg));
                 break;
             case 'i':
-                res.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg);
+                res.setOption(SMTConfig::o_produce_inter, SMTOption{true}, msg);
                 break;
             case 't': {
                 int64_t timeLimit;
@@ -309,7 +309,7 @@ SMTConfig parseCMDLineArgs( int argc, char * argv[ ] )
                     throw std::invalid_argument{"Invalid argument of time-limit: "s + e.what()};
                 }
 
-                ok &= res.setOption(SMTConfig::o_time_limit, SMTOption(timeLimit), msg);
+                ok &= res.setOption(SMTConfig::o_time_limit, SMTOption{timeLimit}, msg);
                 break;
             }
             case 'p':

src/options/SMTConfig.h

@@ -148,6 +148,7 @@ namespace opensmt {
       SMTOption(int i)   : value(i) {}
       //+ Should also support long representation
       SMTOption(long i)  : SMTOption(static_cast<int>(i)) {}
+      SMTOption(long long i)  : SMTOption(static_cast<long>(i)) {}
       SMTOption(double i): value(i) {}
       SMTOption(const char* s) : value(s) {}
       inline bool isEmpty() const { return value.type == O_EMPTY; }
@@ -947,7 +948,7 @@ namespace opensmt {
 
       void setSimplifyInterpolant(int val) {
           const char* msg;
-          setOption(o_simplify_inter, SMTOption(val), msg);
+          setOption(o_simplify_inter, SMTOption{val}, msg);
       }
 
       int getSimplifyInterpolant() const {

src/parallel/opensmtSplitter.cc

@@ -80,16 +80,16 @@ int main( int argc, char * argv[] )
                 break;
             case 'd':
                 const char* msg;
-                c.setOption(SMTConfig::o_dryrun, SMTOption(true), msg);
+                c.setOption(SMTConfig::o_dryrun, SMTOption{true}, msg);
                 break;
             case 'r':
-                if (!c.setOption(SMTConfig::o_random_seed, SMTOption(atoi(optarg)), msg))
+                if (!c.setOption(SMTConfig::o_random_seed, SMTOption{atoi(optarg)}, msg))
                     fprintf(stderr, "Error setting random seed: %s\n", msg);
                 else
                     fprintf(stderr, "; Using random seed %d\n", atoi(optarg));
                 break;
             case 'i':
-                c.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg);
+                c.setOption(SMTConfig::o_produce_inter, SMTOption{true}, msg);
                 break;
             case 'p':
                 pipe = true;

src/unsatcores/UnsatCoreBuilder.cc

@@ -157,7 +157,7 @@ SMTConfig UnsatCoreBuilder::Minimize::makeSmtSolverConfig() const {
     assert(not newConfig.produce_inter());
 
     char const * msg = "ok";
-    newConfig.setOption(SMTConfig::o_produce_models, SMTOption(false), msg);
+    newConfig.setOption(SMTConfig::o_produce_models, SMTOption{false}, msg);
     assert(not newConfig.produce_models());
 
     return newConfig;