updated: string parser, run sl_parser after choices.

This isn't very clear, because the original was really bad.
The python code was hacked together.

We'll see.

session.cpp

@@ -60,7 +60,6 @@ std::smatch ansi_newline(const std::string &str) {
 }
 
 std::string clean_string(const std::string &source) {
-  // BOOST_LOG_NAMED_SCOPE("clean_string");
   std::string clean = source;
 
   replace(clean, "\n", "\\n");
@@ -77,6 +76,17 @@ std::string clean_string(const std::string &source) {
   return clean;
 }
 
+std::vector<std::string> split(const std::string &line) {
+  static std::regex rx_split("[^\\s]+");
+  std::vector<std::string> results;
+
+  for (auto it = std::sregex_iterator(line.begin(), line.end(), rx_split);
+       it != std::sregex_iterator(); ++it) {
+    results.push_back(it->str());
+  }
+  return results;
+}
+
 Session::Session(boost::asio::ip::tcp::socket socket,
                  boost::asio::io_service &io_service, std::string hostname,
                  std::string port)
@@ -225,41 +235,35 @@ void Session::on_server_line(const std::string &line) {
   // Do I need to run through the tests (below) before calling the parser here?
   // Or will the parsers know when they are done processing, and clear?
 
-  if (SL_parser) {
-    SL_parser(line);
-  }
-
   // ok, maybe that was the end of parsing?
 
-  if (!SL_parser) {
-    if ((line.substr(0, 19) == "The shortest path (") ||
-        (line.substr(0, 7) == "  TO > ")) {
-      SL_parser = [this](const std::string s) { this->SL_warpline(s); };
-      SL_warpline(line);
+  if ((line.substr(0, 19) == "The shortest path (") ||
+      (line.substr(0, 7) == "  TO > ")) {
+    SL_parser = [this](const std::string s) { this->SL_warpline(s); };
+  } else {
+    if (line.substr(0, 43) == " Items     Status  Trading % of max OnBoard") {
+      SL_parser = [this](const std::string s) { this->SL_portline(s); };
+
     } else {
-      if (line.substr(0, 43) == " Items     Status  Trading % of max OnBoard") {
-        SL_parser = [this](const std::string s) { this->SL_portline(s); };
-        SL_parser(line);
+      if (line.substr(0, 10) == "<Thievery>") {
+        SL_parser = [this](const std::string s) { this->SL_thiefline(s); };
+
       } else {
-        if (line.substr(0, 10) == "<Thievery>") {
-          SL_parser = [this](const std::string s) { this->SL_thiefline(s); };
-          SL_parser(line);
+        if (line == ": ") {
+          SL_parser = [this](const std::string s) { this->SL_cimline(s); };
         } else {
-          if (line == ": ") {
-            SL_parser = [this](const std::string s) { this->SL_cimline(s); };
-          } else {
-            if (line.substr(0, 1) == "Sector  : ") {
-              SL_parser = [this](const std::string s) {
-                this->SL_sectorline(s);
-              };
-              SL_parser(line);
-            }
+          if (line.substr(0, 1) == "Sector  : ") {
+            SL_parser = [this](const std::string s) { this->SL_sectorline(s); };
           }
         }
       }
     }
   }
 
+  if (SL_parser) {
+    SL_parser(line);
+  }
+
   // should I have an internal emit_server_line for parsing sections?
   // rather then having a weird state machine to track where we are?
 

session.h

@@ -212,18 +212,4 @@ private:
   std::string port_;
 };
 
-#ifdef NEVERMORE
-// The simple way to get the boost logging to log file and line number
-// information.  [Let the BUGZ_LOG macro do it!]
-#include <iomanip>
-#include <string.h>
-
-const char *trim_path(const char *filepath);
-
-#define BUGZ_LOG(severity)                                                     \
-  BOOST_LOG_TRIVIAL(severity)                                                  \
-      << "(" << std::setw(15) << trim_path(__FILE__) << ":" << std::setw(4)    \
-      << std::left << __LINE__ << ") "
-#endif
-
 #endif