diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2014-06-16 22:35:14 -0400 |
|---|---|---|
| committer | lianah <lianahady@gmail.com> | 2014-06-19 18:24:39 -0400 |
| commit | ecdad6e99adf11a612ea6ddb1761e6cbbe780638 (patch) | |
| tree | 2d10fcfc872cd1439864b497a3f005d1e8e38f2a /src/main | |
| parent | fd252474451635ff36a64f1e0a58cfb20171a582 (diff) | |
More application-track fixes for use with trace executor.
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/driver_unified.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/main/driver_unified.cpp b/src/main/driver_unified.cpp index c39627550..54f6383ac 100644 --- a/src/main/driver_unified.cpp +++ b/src/main/driver_unified.cpp @@ -332,17 +332,14 @@ int runCvc4(int argc, char* argv[], Options& opts) { if(dynamic_cast<PushCommand*>(cmd) != NULL) { if(needReset) { pExecutor->reset(); - bool succ = Command::printsuccess::getPrintSuccess(*opts[options::out]); - Command::printsuccess::setPrintSuccess(*opts[options::out], false); - opts.set(options::printSuccess, false); for(size_t i = 0; i < allCommands.size(); ++i) { for(size_t j = 0; j < allCommands[i].size(); ++j) { Command* cmd = allCommands[i][j]->clone(); + cmd->setMuted(true); pExecutor->doCommand(cmd); delete cmd; } } - Command::printsuccess::setPrintSuccess(*opts[options::out], succ); needReset = false; } *opts[options::out] << CommandSuccess(); @@ -350,36 +347,33 @@ int runCvc4(int argc, char* argv[], Options& opts) { } else if(dynamic_cast<PopCommand*>(cmd) != NULL) { allCommands.pop_back(); // fixme leaks cmds here pExecutor->reset(); - bool succ = Command::printsuccess::getPrintSuccess(*opts[options::out]); - Command::printsuccess::setPrintSuccess(*opts[options::out], false); for(size_t i = 0; i < allCommands.size(); ++i) { for(size_t j = 0; j < allCommands[i].size(); ++j) { Command* cmd = allCommands[i][j]->clone(); + cmd->setMuted(true); pExecutor->doCommand(cmd); delete cmd; } } - Command::printsuccess::setPrintSuccess(*opts[options::out], succ); *opts[options::out] << CommandSuccess(); } else if(dynamic_cast<CheckSatCommand*>(cmd) != NULL || dynamic_cast<QueryCommand*>(cmd) != NULL) { if(needReset) { pExecutor->reset(); - bool succ = Command::printsuccess::getPrintSuccess(*opts[options::out]); - Command::printsuccess::setPrintSuccess(*opts[options::out], false); for(size_t i = 0; i < allCommands.size(); ++i) { for(size_t j = 0; j < allCommands[i].size(); ++j) { Command* cmd = allCommands[i][j]->clone(); + cmd->setMuted(true); pExecutor->doCommand(cmd); delete cmd; } } - Command::printsuccess::setPrintSuccess(*opts[options::out], succ); } status = pExecutor->doCommand(cmd); needReset = true; } else { - allCommands.back().push_back(cmd->clone()); + Command* copy = cmd->clone(); + allCommands.back().push_back(copy); if(dynamic_cast<QuitCommand*>(cmd) != NULL) { delete cmd; break; |