niansa/pilang2
1
0
Fork 0
mirror of https://gitlab.com/niansa/pilang2.git synced 2025-03-06 20:49:22 +01:00
Code Releases Activity

Fixed bug with # in string

Browse source
This commit is contained in:
niansa 2020-05-02 12:36:38 +01:00
parent 56393f28f0
commit 8a4572991c
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
main.cpp
View file

@ -478,7 +478,9 @@ void init_interpreter(int argc, char *argv[]) {
} }
std::string execline(std::string commandstr) { std::string execline(std::string commandstr) {
commandstr = ltrim(commandstr.substr(0, commandstr.find("#", 0))); commandstr = ltrim(commandstr);
if (commandstr[0] == '#')
return success;
//std::cout << "$ " << commandstr << std::endl; //std::cout << "$ " << commandstr << std::endl;
if (rtrim(commandstr) == "") { // Command is empty if (rtrim(commandstr) == "") { // Command is empty
return commandstr; return commandstr;
@ -508,13 +510,14 @@ std::string execline(std::string commandstr) {
bool charig = false; bool charig = false;
bool skipall = false; bool skipall = false;
for (std::string::iterator currchar = argsstr.begin(); currchar < argsstr.end(); currchar++) { for (std::string::iterator currchar = argsstr.begin(); currchar < argsstr.end(); currchar++) {
if (skipall) { if (skipall and *currchar != ',') {
continue; continue;
} else if (*currchar == '"' and !skipall) { } else if (*currchar == '"' and !skipall) {
instring = !instring; instring = !instring;
if (currarg == "") if (currarg == "")
arginstring = true; arginstring = true;
} else if (*currchar == '#' and !charig and !instring) { } else if (*currchar == '#' and !charig and !instring) {
*(currchar + 1) = ',';
skipall = true; skipall = true;
} else if (*currchar == ',' and !charig and !instring) { } else if (*currchar == ',' and !charig and !instring) {
if (currarg.length() != 0 and *currarg.begin() == '$' and !arginstring) { if (currarg.length() != 0 and *currarg.begin() == '$' and !arginstring) {