From a33f35faabb2cf2902a0ae4f8c8a9f75b3a17dce Mon Sep 17 00:00:00 2001 From: Riyyi Date: Tue, 12 Jul 2022 01:42:36 +0200 Subject: [PATCH] Util: Rearrange Parser functions --- src/util/json/parser.cpp | 10 +++++----- src/util/json/parser.h | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/util/json/parser.cpp b/src/util/json/parser.cpp index 49d992a..8c35b94 100644 --- a/src/util/json/parser.cpp +++ b/src/util/json/parser.cpp @@ -86,11 +86,6 @@ bool Parser::reachedEnd() return m_index >= m_tokens->size(); } -Token Parser::peek() -{ - return m_tokens->at(m_index); -} - bool Parser::seekForward(Token::Type type) { for (; !reachedEnd(); ++m_index) { @@ -103,6 +98,11 @@ bool Parser::seekForward(Token::Type type) return false; } +Token Parser::peek() +{ + return m_tokens->at(m_index); +} + Token Parser::consume() { Token token = peek(); diff --git a/src/util/json/parser.h b/src/util/json/parser.h index 74c41e8..8f90b85 100644 --- a/src/util/json/parser.h +++ b/src/util/json/parser.h @@ -26,10 +26,9 @@ public: private: bool reachedEnd(); - - Token peek(); bool seekForward(Token::Type type); + Token peek(); Token consume(); Value getLiteral();