use some enum classes

move ParseResult to recursivedescent.h

1 files changed, 7 insertions, 7 deletions

diff --git a/src/operator-close.cc b/src/operator-close.cc
index 322dea1..37e4805 100644
--- a/src/operator-close.cc
+++ b/src/operator-close.cc
@@ -24,7 +24,7 @@ const std::string CloseOperator::getName() const
   return "CLOSE";
 }
 
-int CloseOperator::getState() const
+Session::State CloseOperator::getState() const
 {
   return Session::SELECTED;
 }
@@ -39,21 +39,21 @@ Operator::ProcessResult CloseOperator::process(Depot &depot, Request &command)
   Session &session = Session::getInstance();
   session.setState(Session::AUTHENTICATED);
 
-  return OK;
+  return Operator::ProcessResult::OK;
 }
 
-Operator::ParseResult CloseOperator::parse(Request &c_in) const
+Parser::ParseResult CloseOperator::parse(Request &c_in)
 {
   Session &session = Session::getInstance();
 
-  if (c_in.getUidMode()) return REJECT;
+  if (c_in.getUidMode()) return Parser::ParseResult::REJECT;
 
-  Operator::ParseResult res;
-  if ((res = expectCRLF()) != ACCEPT) {
+  Parser::ParseResult res;
+  if ((res = expectCRLF()) != Parser::ParseResult::ACCEPT) {
     session.setLastError("Expected CRLF after CLOSE");
     return res;
   }
 
   c_in.setName("CLOSE");
-  return ACCEPT;
+  return Parser::ParseResult::ACCEPT;
 }