Also fix getline for analysis engine and genconfig

lightvector · Jun 14, 2020 · dad5c70 · dad5c70
1 parent 5c7e75c
commit dad5c70
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/cpp/command/analysis.cpp b/cpp/command/analysis.cpp
@@ -342,8 +342,7 @@ int MainCmds::analysis(int argc, const char* const* argv) {
 
   string line;
   json input;
-  while(cin) {
-    getline(cin,line);
+  while(getline(cin,line)) {
     line = Global::trim(line);
     if(line.length() == 0)
       continue;

diff --git a/cpp/command/benchmark.cpp b/cpp/command/benchmark.cpp
@@ -462,9 +462,13 @@ int MainCmds::genconfig(int argc, const char* const* argv, const char* firstComm
       try {
         cout << prompt << std::flush;
         string line;
-        std::getline(std::cin, line);
-        parse(Global::trim(line));
-        break;
+        if(std::getline(std::cin, line)) {
+          parse(Global::trim(line));
+          break;
+        }
+        else {
+          break;
+        }
       }
       catch(const StringError& err) {
         string what = err.what();
@@ -473,6 +477,9 @@ int MainCmds::genconfig(int argc, const char* const* argv, const char* firstComm
           cout << err.what() << endl;
       }
     }
+    if(!std::cin) {
+      throw StringError("Stdin was closed - failing and not generating a config");
+    }
   };
 
   auto parseYN = [](const string& line, bool& b) {

diff --git a/cpp/command/gtp.cpp b/cpp/command/gtp.cpp
@@ -1391,11 +1391,7 @@ int MainCmds::gtp(int argc, const char* const* argv) {
 
   bool currentlyAnalyzing = false;
   string line;
-  while(cin) {
-    getline(cin,line);
-    if(!cin)
-      break;
-
+  while(getline(cin,line)) {
     //Parse command, extracting out the command itself, the arguments, and any GTP id number for the command.
     string command;
     vector<string> pieces;