Aelita4
/
ONP
mirror of https://github.com/Aelita4/ONP.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Major bugfixes

This commit is contained in:
Aelita4 2021-01-19 21:14:40 +01:00
parent 415e1ecd6f
commit e6d279988b
1 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
main.cpp
View File

@ -219,6 +219,7 @@ std::string stringToONP(std::string s, int speed = 500)
char heap[100] {}; char heap[100] {};
for (int i = 0; i < 100; i++) heap[i] = '\0'; for (int i = 0; i < 100; i++) heap[i] = '\0';
int counter = 0; int counter = 0;
char prev = '\0';
for (int i = 0; i < len; i++) for (int i = 0; i < len; i++)
{ {
@ -275,10 +276,14 @@ std::string stringToONP(std::string s, int speed = 500)
case '*': case '*':
case '/': case '/':
numBuildCount = 1; numBuildCount = 1;
out += std::to_string(numBuild); if(prev == ')') prev = '\0';
numBuild = 0; else {
out += ";"; out += std::to_string(numBuild);
displayNumBuilder(0);
numBuild = 0;
out += ";";
displayNumBuilder(0);
}
while (counter) while (counter)
{ {
@ -321,7 +326,40 @@ std::string stringToONP(std::string s, int speed = 500)
color(WHITE, BLACK); color(WHITE, BLACK);
break; break;
case ')': case ')':
prev = ')';
numBuildCount = 1;
out += std::to_string(numBuild);
numBuild = 0;
out += ";";
displayNumBuilder(0);
while (counter)
{
if(heap[counter - 1] == '(') break;
if (priority(tmp) > priority(heap[counter - 1])) break;
out += heap[--counter];
heapPointer(counter);
heap[counter] = '\0';
/*gotoxy(3 + (2 * counter), 2);
color(RED, BLACK);
std::cout << " ";
color(WHITE, BLACK);*/
gotoxy(2, 3 + counter);
color(YELLOW, LIGHT_PURPLE);
if(counter != 0) std::cout << " ";
color(WHITE, BLACK);
}
heap[counter] = tmp;
/*gotoxy(3 + (2 * counter), 2);
color(RED, BLACK);
std::cout << tmp;
color(WHITE, BLACK);*/
heapPointer(counter + 1);
gotoxy(2, 4 + counter);
color(YELLOW, LIGHT_PURPLE);
std::cout << tmp;
counter++;
color(WHITE, BLACK);
for (; heap[counter] != '('; counter--) for (; heap[counter] != '('; counter--)
{ {
heapPointer(counter); heapPointer(counter);
@ -370,6 +408,7 @@ int calculateONP(std::string s, int speed = 500)
int counter = 0; int counter = 0;
int calculate = 0; int calculate = 0;
int digit = 0; int digit = 0;
char prev = '\0';
int heap[100]{}; int heap[100]{};
for (int i = 0; i < 100; i++) heap[i] = 0; for (int i = 0; i < 100; i++) heap[i] = 0;