summaryrefslogtreecommitdiff
path: root/src/main/driver_unified.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/driver_unified.cpp')
-rw-r--r--src/main/driver_unified.cpp24
1 files changed, 16 insertions, 8 deletions
diff --git a/src/main/driver_unified.cpp b/src/main/driver_unified.cpp
index f27bf03f0..a26ee3b73 100644
--- a/src/main/driver_unified.cpp
+++ b/src/main/driver_unified.cpp
@@ -259,16 +259,20 @@ int runCvc5(int argc, char* argv[], Options& opts)
ParserBuilder parserBuilder(pExecutor->getSolver(),
pExecutor->getSymbolManager(),
- filename,
opts);
-
+ std::unique_ptr<Parser> parser(parserBuilder.build());
if( inputFromStdin ) {
- parserBuilder.withStreamInput(cin);
+ parser->setInput(
+ Input::newStreamInput(opts.getInputLanguage(), cin, filename));
+ }
+ else
+ {
+ parser->setInput(Input::newFileInput(
+ opts.getInputLanguage(), filename, opts.getMemoryMap()));
}
vector< vector<Command*> > allCommands;
allCommands.push_back(vector<Command*>());
- std::unique_ptr<Parser> parser(parserBuilder.build());
int needReset = 0;
// true if one of the commands was interrupted
bool interrupted = false;
@@ -411,14 +415,18 @@ int runCvc5(int argc, char* argv[], Options& opts)
ParserBuilder parserBuilder(pExecutor->getSolver(),
pExecutor->getSymbolManager(),
- filename,
opts);
-
+ std::unique_ptr<Parser> parser(parserBuilder.build());
if( inputFromStdin ) {
- parserBuilder.withStreamInput(cin);
+ parser->setInput(
+ Input::newStreamInput(opts.getInputLanguage(), cin, filename));
+ }
+ else
+ {
+ parser->setInput(Input::newFileInput(
+ opts.getInputLanguage(), filename, opts.getMemoryMap()));
}
- std::unique_ptr<Parser> parser(parserBuilder.build());
bool interrupted = false;
while (status)
{
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback