parser: changed class to be a function operator

removed set input function, now handled by constructor
changed token function to operator() function
renamed users instance from "parser" to "parse"

parser.cpp

@@ -26,8 +26,11 @@
 #include "table.h"
 
 
-Parser::Parser(void) :
+Parser::Parser(const QString &input) :
 	m_table(Table::instance()),
+	m_input {input},
+	m_pos {},
+	m_operandState {},
 	m_errorStatus {}
 {
 
@@ -40,7 +43,7 @@ Parser::Parser(void) :
 //   - after at time of return, member token is released (set to null)
 //   - the token may contain an error message if an error was found
 
-TokenPtr Parser::token(bool operandState)
+TokenPtr Parser::operator()(bool operandState)
 {
 	m_operandState = operandState;
 	skipWhitespace();

parser.h

@@ -35,14 +35,8 @@ class Table;
 class Parser
 {
 public:
-	explicit Parser(void);
-	void setInput(const QString &input)
-	{
-		m_input = input;
-		m_pos = 0;
-		m_operandState = false;
-	}
-	TokenPtr token(bool operandState = false);
+	explicit Parser(const QString &input);
+	TokenPtr operator()(bool operandState = false);
 	Status errorStatus()
 	{
 		return m_errorStatus;

test_ibcp.cpp

@@ -476,15 +476,13 @@ bool Tester::run(std::string copyrightStatement)
 // function to parse an input line and print the resulting tokens
 void Tester::parseInput(const std::string &testInput)
 {
-	Parser parser;
 	bool more;
 
-	QString tmp {testInput.c_str()};
-	parser.setInput(tmp);
+	Parser parse {testInput.c_str()};
 	do
 	{
-		TokenPtr token {parser.token()};
-		more = printToken(token, parser.errorStatus(), true)
+		TokenPtr token {parse()};
+		more = printToken(token, parse.errorStatus(), true)
 			&& !token->isCode(EOL_Code);
 	}
 	while (more);

translator.cpp

@@ -29,8 +29,7 @@
 
 
 Translator::Translator(void) :
-	m_table(Table::instance()),
-	m_parser {new Parser}
+	m_table(Table::instance())
 {
 
 }
@@ -54,7 +53,7 @@ RpnList Translator::translate(const QString &input, TestMode testMode)
 	TokenPtr token;
 	Status status;
 
-	m_parser->setInput(input);
+	m_parse.reset(new Parser {input});
 
 	m_holdStack.emplace(m_table.newToken(Null_Code));
 
@@ -119,9 +118,10 @@ RpnList Translator::translate(const QString &input, TestMode testMode)
 	{
 		m_output.setError(token);
 		m_output.setErrorStatus(status == Status::Parser
-			? m_parser->errorStatus() : status);
+			? m_parse->errorStatus() : status);
 		cleanUp();
 	}
+	m_parse.reset();
 	return std::move(m_output);
 }
 
@@ -552,7 +552,7 @@ Status Translator::getToken(TokenPtr &token, DataType dataType)
 {
 	// if data type is not none, then getting an operand token
 	bool operand {dataType != DataType{}};
-	token = m_parser->token(operand);
+	token = (*m_parse)(operand);
 	if (token->isType(Token::Type::Error))
 	{
 		if ((!operand && token->dataType() == DataType::Double)

translator.h

@@ -161,7 +161,7 @@ class Translator
 	using DoneStack = std::stack<DoneItem>;
 
 	Table &m_table;					// reference to the table instance
-	std::unique_ptr<Parser> m_parser;	// pointer to parser instance
+	std::unique_ptr<Parser> m_parse;	// pointer to parser instance
 	RpnList m_output;				// pointer to RPN list output
 	HoldStack m_holdStack;			// operator/function holding stack
 	DoneStack m_doneStack;			// items processed stack