diff options
| author | Morgan Deters <mdeters@gmail.com> | 2012-09-15 22:41:03 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2012-09-15 22:41:03 +0000 |
| commit | c00efa92e9d61d808a8346e1d8bb3523e24d8ee2 (patch) | |
| tree | 85ecfd0e8770ef539f36ec04afd34a583e75cf38 /src/options | |
| parent | c09fae89b38b525c6e2ab1691be4363d0cb1157b (diff) | |
minor interface improvements, compliance fixes
(this commit was certified error- and warning-free by the test-and-commit script.)
Diffstat (limited to 'src/options')
| -rwxr-xr-x | src/options/mkoptions | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/options/mkoptions b/src/options/mkoptions index 73a2b94a3..500f5373f 100755 --- a/src/options/mkoptions +++ b/src/options/mkoptions @@ -518,7 +518,7 @@ template <> bool Options::wasSetByUser(options::${internal}__option_t) const { r preemptGetopt(extra_argc, extra_argv, \"$link\");" done fi - if [ "$type" = bool -a -n "$cases" -o -n "$cases_alternate" ]; then + if [ "$type" = bool ] && [ -n "$cases" -o -n "$cases_alternate" -o -n "$smtname" ]; then run_handlers= if [ -n "$handlers" ]; then echo "$kf:$lineno: error: bool-valued options cannot have handlers" >&2 @@ -713,7 +713,7 @@ template <> void Options::assignBool(options::${internal}__option_t, std::string #line $lineno \"$kf\" Trace(\"options\") << \"user assigned option $internal\" << std::endl; }" - elif [ -n "$expect_arg" -a "$internal" != - ] && [ -n "$cases" -o "$cases_alternate" -o "$smtname" ]; then + elif [ -n "$expect_arg" -a "$internal" != - ] && [ -n "$cases" -o -n "$cases_alternate" -o -n "$smtname" ]; then all_custom_handlers="${all_custom_handlers} #line $lineno \"$kf\" template <> void Options::assign(options::${internal}__option_t, std::string option, std::string value, SmtEngine* smt) { |