eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 00:49:19 +02:00
Code Issues 121 Wiki Activity

Merge pull request #104 from docentYT/faster-parser

Browse Source 
Fix not all cars are loaded
This commit is contained in:
Hirek
2026-05-06 18:21:18 +02:00
committed by GitHub
parent 39885afca0 112c714f79
commit 91c176c55c
2 changed files with 49 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
utilities/parser.cpp
View File

@@ -190,16 +190,17 @@ bool cParser::getTokens(unsigned int Count, bool ToLower, const char *Break)
this->str("");
this->clear();
*/
std::string token;
for (unsigned int i = tokens.size(); i < Count; ++i)
{
std::string token = readToken(ToLower, Break);
if (true == token.empty())
readToken(token, ToLower, Break);
if (token.empty())
{
// no more tokens
break;
}
tokens.emplace_back(std::move(token));
// collect parameters
tokens.emplace_back(token);
/*
if (i == 0)
this->str(token);
@@ -218,18 +219,6 @@ bool cParser::getTokens(unsigned int Count, bool ToLower, const char *Break)
return true;
}
std::string cParser::readTokenFromDelegate(bool ToLower, const char *Break)
{
if (!mIncludeParser)
return {};
std::string token = mIncludeParser->readToken(ToLower, Break);
if (token.empty())
{
mIncludeParser = nullptr;
}
return token;
}
std::string cParser::readTokenFromStream(bool ToLower, const char *Break)
{
std::string token;
@@ -240,9 +229,8 @@ std::string cParser::readTokenFromStream(bool ToLower, const char *Break)
while (token.empty() && mStream->peek() != EOF) {
while (mStream->peek() != EOF) {
while (mStream->peek() != EOF) { // idk why but with mStream->get(c) not all cars are loaded
c = static_cast<char>(mStream->get());
if (c == '\n') {
++mLine;
}
@@ -280,7 +268,7 @@ void cParser::stripFirstTokenBOM(std::string& token, bool ToLower, const char* B
// if first "token" was standalone BOM, read the next real token (avoid recursion)
while (token.empty() && mStream->peek() != EOF) {
token = readToken(ToLower, Break);
readToken(token, ToLower, Break);
// readToken will not re-enter BOM stripping because mFirstToken is now false
break;
}
@@ -322,7 +310,7 @@ void cParser::skipIncludeBlock() {
// mimic original: while token != "end" readToken(true)
std::string t;
do {
t = readToken(true);
readToken(t, true);
} while (t != "end" && !t.empty());
}
@@ -367,72 +355,81 @@ void cParser::startIncludeFromParser(cParser& srcParser, bool ToLower, std::stri
bool cParser::handleIncludeIfPresent(std::string& token, bool ToLower, const char* Break) {
// token-mode include: token == "include"
if (expandIncludes && token == "include") {
std::string includefile =
allowRandomIncludes ? deserialize_random_set(*this) : readToken(ToLower);
std::string includefile;
if (allowRandomIncludes)
includefile = deserialize_random_set(*this);
else
readToken(includefile, ToLower);
startIncludeFromParser(*this, ToLower, std::move(includefile));
// after processing include, return next token from current parser
token = readToken(ToLower, Break);
readToken(token, ToLower, Break);
return true;
}
// line-mode HACK: Break == "\n\r" and line begins with "include"
if ((std::strcmp(Break, "\n\r") == 0) && token.compare(0, 7, "include") == 0) {
cParser includeparser(token.substr(7));
std::string includefile =
allowRandomIncludes ? deserialize_random_set(includeparser) : includeparser.readToken(ToLower);
std::string includefile;
if (allowRandomIncludes)
includefile = deserialize_random_set(includeparser);
else
includeparser.readToken(includefile, ToLower);
startIncludeFromParser(includeparser, ToLower, std::move(includefile));
token = readToken(ToLower, Break);
readToken(token, ToLower, Break);
return true;
}
return false;
}
std::string cParser::readToken(bool ToLower, const char *Break)
void cParser::readToken(std::string &out, bool ToLower, const char *Break)
{
std::string token;
token = readTokenFromDelegate(ToLower, Break);
if (token.empty())
if (mIncludeParser)
{
token = readTokenFromStream(ToLower, Break);
mIncludeParser->readToken(out, ToLower, Break);
if (out.empty())
{
mIncludeParser = nullptr;
out = readTokenFromStream(ToLower, Break);
}
}
else
{
out = readTokenFromStream(ToLower, Break);
}
stripFirstTokenBOM(token, ToLower, Break);
stripFirstTokenBOM(out, ToLower, Break);
substituteParameters(token, ToLower);
substituteParameters(out, ToLower);
handleIncludeIfPresent(token, ToLower, Break);
return token;
handleIncludeIfPresent(out, ToLower, Break);
}
std::vector<std::string> cParser::readParameters(cParser &Input)
{
std::vector<std::string> includeparameters;
std::string parameter = Input.readToken(false); // w parametrach nie zmniejszamy
std::string parameter;
Input.readToken(parameter, false); // w parametrach nie zmniejszamy
while ((parameter.empty() == false) && (parameter != "end"))
{
includeparameters.emplace_back(parameter);
parameter = Input.readToken(false);
Input.readToken(parameter, false);
}
return includeparameters;
}
std::string cParser::readQuotes(char const Quote)
{ // read the stream until specified char or stream end
std::string token = "";
std::string token;
char c{0};
bool escaped = false;
while (mStream->peek() != EOF)
while (mStream->get(c))
{ // get all chars until the quote mark
c = mStream->get();
if (escaped)
{
escaped = false;
@@ -458,13 +455,11 @@ std::string cParser::readQuotes(char const Quote)
void cParser::skipComment(std::string const &Endmark)
{ // pobieranie znaków aż do znalezienia znacznika końca
std::string input = "";
std::string input;
char c{0};
auto const endmarksize = Endmark.size();
while (mStream->peek() != EOF)
while (mStream->get(c))
{
// o ile nie koniec pliku
c = mStream->get(); // pobranie znaku
if (c == '\n')
{
// update line counter
@@ -555,8 +550,8 @@ std::size_t cParser::count()
size_t count{0};
do
{
token = "";
token = readToken(false);
token.clear();
readToken(token, false);
++count;
} while (false == token.empty());

10
utilities/parser.h
View File

@@ -45,11 +45,14 @@ class cParser //: public std::stringstream
inline
void
ignoreToken() {
readToken(); };
std::string out;
readToken(out); };
inline
bool
expectToken( std::string const &Value ) {
return readToken() == Value; };
std::string out;
readToken(out);
return out == Value; };
inline
bool
eof() {
@@ -66,7 +69,6 @@ class cParser //: public std::stringstream
return m_autoclear; }
bool
getTokens( unsigned int Count = 1, bool ToLower = true, char const *Break = "\n\r\t ;" );
std::string readTokenFromDelegate(bool ToLower, const char *Break);
std::string readTokenFromStream(bool ToLower, const char *Break);
void stripFirstTokenBOM(std::string &token, bool ToLower, const char *Break);
void substituteParameters(std::string &token, bool ToLower);
@@ -103,7 +105,7 @@ class cParser //: public std::stringstream
void startIncludeFromParser(cParser &srcParser, bool ToLower, std::string includefile);
bool handleIncludeIfPresent(std::string &token, bool ToLower, const char *Break);
// methods:
std::string readToken(bool ToLower = true, const char *Break = "\n\r\t ;");
void readToken(std::string& out, bool ToLower = true, const char *Break = "\n\r\t ;");
static std::vector<std::string> readParameters( cParser &Input );
std::string readQuotes( char const Quote = '\"' );
void skipComment( std::string const &Endmark );