diff options
author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-12-22 12:06:34 -0500 |
---|---|---|
committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-12-22 12:06:34 -0500 |
commit | b2bb2138543e75f64c3a794df940a221e4b5a97b (patch) | |
tree | ab1ac02ffcc9306a9ed922642fb51dcb8e33f53c | |
parent | c33d53d005c41cf5705a85f86311d8d0142d2a01 (diff) | |
parent | 45df48dc08246ad014083f4ecd33246771a18d87 (diff) |
Merge branch '1.3.x'
-rw-r--r-- | src/main/driver_unified.cpp | 2 | ||||
-rw-r--r-- | src/main/options | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/driver_unified.cpp b/src/main/driver_unified.cpp index 1922455d6..d1baaa2e9 100644 --- a/src/main/driver_unified.cpp +++ b/src/main/driver_unified.cpp @@ -237,7 +237,7 @@ int runCvc4(int argc, char* argv[], Options& opts) { // Parse and execute commands until we are done Command* cmd; bool status = true; - if(opts[options::interactive]) { + if(opts[options::interactive] && inputFromStdin) { #ifndef PORTFOLIO_BUILD if(!opts.wasSetByUser(options::incrementalSolving)) { cmd = new SetOptionCommand("incremental", true); diff --git a/src/main/options b/src/main/options index faac6b8f1..35e3df7d2 100644 --- a/src/main/options +++ b/src/main/options @@ -7,7 +7,7 @@ module DRIVER "main/options.h" Driver common-option version -V --version/ bool identify this CVC4 binary -alias --license = --version +undocumented-alias --license = --version common-option help -h --help/ bool full command line reference |