Util: Add increment() and decrement() to Lexer

src/util/json/lexer.cpp

@@ -130,8 +130,7 @@ void Lexer::analyze()
 			break;
 		}
 
-		m_index++;
+		increment();
-		m_column++;
 	}
 }
 
@@ -147,11 +146,22 @@ char Lexer::peekNext()
 	return m_job->input()[m_index + 1];
 }
 
-char Lexer::consume()
+void Lexer::increment()
 {
-	char character = peek();
 	m_index++;
 	m_column++;
+}
+
+void Lexer::decrement()
+{
+	m_index--;
+	m_column--;
+}
+
+char Lexer::consume()
+{
+	char character = peek();
+	increment();
 	return character;
 }
 
@@ -161,8 +171,7 @@ bool Lexer::consumeSpecific(char character)
 		return false;
 	}
 
-	m_index++;
+	increment();
-	m_column++;
 	return true;
 }
 
@@ -196,9 +205,8 @@ bool Lexer::getString()
 			break;
 		}
 
-		m_index++;
-		m_column++;
 		symbol += character;
+		increment();
 	}
 
 	printf("Pushing ->       String:  \"%s\"\t%zu[%zu]\n", symbol.c_str(), m_line, column);
@@ -221,12 +229,10 @@ bool Lexer::getNumberOrLiteral(Token::Type type)
 			break;
 		}
 
-		m_index++;
-		m_column++;
 		symbol += character;
+		increment();
 	}
-	m_index--;
+	decrement();
-	m_column--;
 
 	m_tokens->push_back({ type, m_line, column, symbol });
 

src/util/json/lexer.h

@@ -51,6 +51,8 @@ private:
 	char peek();
 	char peekNext();
 
+	void increment();
+	void decrement();
 	char consume();
 	bool consumeSpecific(char character);