Removed lexical position

Author: amirbawab

include/easycc/Lexical.h

@@ -50,10 +50,9 @@ namespace ecc {
         * @param token value
         * @param line
         * @param column
-        * @param position
         */
         std::shared_ptr<LexicalToken> createToken(
-               std::string tokenName, std::string tokenValue, const int &line, const int &column, const int &position);
+               std::string tokenName, std::string tokenValue, const int &line, const int &column);
 
         /**
          * Generate an error message based on the error token name

include/easycc/LexicalToken.h

@@ -16,8 +16,8 @@ namespace ecc {
             NORMAL_FINAL_TOKEN
         };
 
-        LexicalToken(LexicalToken::Type type,std::string name, std::string value, int line, int column, int position) :
-                m_type(type), m_name(name), m_value(value), m_line(line), m_column(column), m_position(position){};
+        LexicalToken(LexicalToken::Type type,std::string name, std::string value, int line, int column) :
+                m_type(type), m_name(name), m_value(value), m_line(line), m_column(column){};
 
         /**
          * Get token name
@@ -43,12 +43,6 @@ namespace ecc {
          */
         int getColumn() const {return this->m_column;}
 
-        /**
-         * Get token position
-         * @return position
-         */
-        int getPosition() const {return this->m_position;}
-
         /**
          * Get lexical token type
          * @return lexical token type
@@ -65,7 +59,6 @@ namespace ecc {
         std::string m_value;
         int m_line;
         int m_column;
-        int m_position;
         LexicalToken::Type m_type;
     };
 }

src/lexical/Lexical.cpp

@@ -35,10 +35,8 @@ namespace ecc {
         // Keep track of file information
         int tokenLine = 1;
         int tokenColumn = 1;
-        int tokenPosition = 0;
         int line = 1;
         int column = 1;
-        int position = 0;
 
         // Keep track of the state
         std::shared_ptr<State> state = m_graph->getInitialState();
@@ -60,7 +58,6 @@ namespace ecc {
                 if(state->getType() == State::INITIAL) {
                     tokenLine = line;
                     tokenColumn = column;
-                    tokenPosition = position;
                 }
 
                 // Jump to the next state
@@ -79,7 +76,7 @@ namespace ecc {
 
                     // Create token
                     std::shared_ptr<LexicalToken> token =createToken(state->getTokenName(), tokenValueStream.str(),
-                                                                     tokenLine, tokenColumn, tokenPosition);
+                                                                     tokenLine, tokenColumn);
 
                     // If token created
                     if(token) {
@@ -121,8 +118,6 @@ namespace ecc {
             } else {
                 column++;
             }
-
-            position++;
         }
 
         // One more call for the end of file
@@ -140,7 +135,7 @@ namespace ecc {
         // If final state, then create the last token
         if(state->getType() == State::FINAL) {
             std::shared_ptr<LexicalToken> token = createToken(state->getTokenName(), tokenValueStream.str(),
-                                                              tokenLine, tokenColumn, tokenPosition);
+                                                              tokenLine, tokenColumn);
 
             // If token created
             if(token) {
@@ -157,7 +152,7 @@ namespace ecc {
         // Add final token
         lexicalVector.push_back(std::make_shared<LexicalToken>(
                 LexicalToken::Type::NORMAL_FINAL_TOKEN, LexicalToken::END_OF_FILE,
-                LexicalToken::END_OF_FILE, line, column, position));
+                LexicalToken::END_OF_FILE, line, column));
 
         // Log generate tokens
         BOOST_LOG(ecc_logger::get()) << "Finished generating lexical tokens:";
@@ -174,18 +169,18 @@ namespace ecc {
      * @return object | null if the token should be ignored
      */
     std::shared_ptr<LexicalToken> Lexical::createToken(
-            std::string tokenName, std::string tokenValue, const int &line, const int &column, const int &position) {
+            std::string tokenName, std::string tokenValue, const int &line, const int &column) {
 
         // Check the type of the token name
         if(m_config->isErrorToken(tokenName)) {
             return std::make_shared<LexicalToken>(
                     LexicalToken::Type::ERROR_TOKEN, tokenName,
-                    tokenValue, line, column, position);
+                    tokenValue, line, column);
         } else if(!m_config->mustIgnoreToken(tokenName)) {
             tokenName = m_config->updateTokenName(tokenName, tokenValue);
             return std::make_shared<LexicalToken>(
                     LexicalToken::Type::NORMAL_TOKEN, tokenName,
-                    tokenValue, line, column, position);
+                    tokenValue, line, column);
         }
         return nullptr;
     }

src/lexical/token/LexicalToken.cpp

@@ -8,7 +8,7 @@ namespace ecc{
 
     std::string LexicalToken::getString() {
         std::ostringstream ss;
-        ss << "<" << m_name << ",l:" << m_line << ",c:" << m_column << ",p:" << m_position << ">";
+        ss << "<" << m_name << ",l:" << m_line << ",c:" << m_column << ">";
         return ss.str();
     }
 }