Anthony/open-story-teller
1
0
Fork 0
mirror of https://github.com/arabine/open-story-teller.git synced 2025-12-06 17:09:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix bad left/right line trim + fix wanings

Browse source
This commit is contained in:
Anthony Rabine 2023-12-21 22:20:28 +01:00
parent 09aab7241a
commit a730ea4e0b
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
software/chip32/chip32_assembler.cpp
View file

@ -256,7 +256,7 @@ bool Assembler::CompileConstantArgument(Instr &instr, const std::string &a)
// Detected string // Detected string
if ((a[0] == '"') && (a[a.size() - 1] == '"')) if ((a[0] == '"') && (a[a.size() - 1] == '"'))
{ {
for (int i = 1; i < (a.size() - 1); i++) for (unsigned int i = 1; i < (a.size() - 1); i++)
{ {
instr.compiledArgs.push_back(a[i]); instr.compiledArgs.push_back(a[i]);
} }
@ -335,11 +335,13 @@ bool Assembler::Parse(const std::string &data)
lineNum++; lineNum++;
Instr instr; Instr instr;
instr.line = lineNum; instr.line = lineNum;
int pos = line.find_first_of(";"); size_t pos = line.find_first_of(";");
if (pos != std::string::npos) { if (pos != std::string::npos) {
line.erase(pos); line.erase(pos);
} }
line.erase(std::remove(line.begin(), line.end(), '\t'), line.end()); // remove tabulations line.erase(0, line.find_first_not_of("\t\n\v\f\r ")); // left trim
line.erase(line.find_last_not_of("\t\n\v\f\r ") + 1); // right trim
if (std::all_of(line.begin(), line.end(), ::isspace)) continue; if (std::all_of(line.begin(), line.end(), ::isspace)) continue;
// Split the line // Split the line
@ -424,7 +426,7 @@ bool Assembler::Parse(const std::string &data)
// if ROM data, we generate one instruction per argument // if ROM data, we generate one instruction per argument
// reason: arguments may be labels, easier to replace later // reason: arguments may be labels, easier to replace later
for (int i = 2; i < lineParts.size(); i++) for (unsigned int i = 2; i < lineParts.size(); i++)
{ {
CHIP32_CHECK(instr, CompileConstantArgument(instr, lineParts[i]), "Compile argument error, stopping."); CHIP32_CHECK(instr, CompileConstantArgument(instr, lineParts[i]), "Compile argument error, stopping.");
m_instructions.push_back(instr); m_instructions.push_back(instr);