From bdba2bf65eb2f68daa1a5e488c4e50f5dac1b312 Mon Sep 17 00:00:00 2001 From: Mathias Preiner Date: Wed, 21 Mar 2018 15:48:57 -0700 Subject: Refactor mkoptions (#1631) This commit refactors code generation for options. It uses a new configuration format for defining options (*.toml) and a new Python script mkoptions.py to generate the source code and option documentation. The option behavior did not change for most of the options, except that for bool --enable-/--disable- long options enable/disable was removed. E.g. --enable-miplib-trick and --disable-miplib-trick got changed to --miplib-trick and --no-miplib-trick. This commit fixes also an issues with set-option/get-option via the SMT2 interface. Before long options were only accessible if the name included the =ARG part. --- test/regress/regress0/arith/miplib-opt1217--27.smt.expect | 2 +- test/regress/regress0/arith/miplib-pp08a-3000.smt.expect | 2 +- test/regress/regress0/arith/miplib.cvc | 2 +- test/regress/regress0/arith/miplib2.cvc | 2 +- test/regress/regress0/arith/miplib4.cvc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'test/regress/regress0') diff --git a/test/regress/regress0/arith/miplib-opt1217--27.smt.expect b/test/regress/regress0/arith/miplib-opt1217--27.smt.expect index f0bc97ee5..24c63a495 100644 --- a/test/regress/regress0/arith/miplib-opt1217--27.smt.expect +++ b/test/regress/regress0/arith/miplib-opt1217--27.smt.expect @@ -1,2 +1,2 @@ -% COMMAND-LINE: --enable-miplib-trick +% COMMAND-LINE: --miplib-trick % EXPECT: unsat diff --git a/test/regress/regress0/arith/miplib-pp08a-3000.smt.expect b/test/regress/regress0/arith/miplib-pp08a-3000.smt.expect index f0bc97ee5..24c63a495 100644 --- a/test/regress/regress0/arith/miplib-pp08a-3000.smt.expect +++ b/test/regress/regress0/arith/miplib-pp08a-3000.smt.expect @@ -1,2 +1,2 @@ -% COMMAND-LINE: --enable-miplib-trick +% COMMAND-LINE: --miplib-trick % EXPECT: unsat diff --git a/test/regress/regress0/arith/miplib.cvc b/test/regress/regress0/arith/miplib.cvc index 49c0b61cb..a7ae19b0a 100644 --- a/test/regress/regress0/arith/miplib.cvc +++ b/test/regress/regress0/arith/miplib.cvc @@ -1,4 +1,4 @@ -% COMMAND-LINE: --enable-miplib-trick +% COMMAND-LINE: --miplib-trick % EXPECT: sat tmp1, tmp2, tmp3 : INT; diff --git a/test/regress/regress0/arith/miplib2.cvc b/test/regress/regress0/arith/miplib2.cvc index 5cd2f545c..ce2e9712e 100644 --- a/test/regress/regress0/arith/miplib2.cvc +++ b/test/regress/regress0/arith/miplib2.cvc @@ -1,4 +1,4 @@ -% COMMAND-LINE: --enable-miplib-trick +% COMMAND-LINE: --miplib-trick % EXPECT: sat tmp1, tmp2, tmp3 : INT; diff --git a/test/regress/regress0/arith/miplib4.cvc b/test/regress/regress0/arith/miplib4.cvc index 9d7c4592e..722122b38 100644 --- a/test/regress/regress0/arith/miplib4.cvc +++ b/test/regress/regress0/arith/miplib4.cvc @@ -1,4 +1,4 @@ -% COMMAND-LINE: --enable-miplib-trick +% COMMAND-LINE: --miplib-trick % EXPECT: sat tmp1 : INT; -- cgit v1.2.3