Skip to content
This repository has been archived by the owner on Oct 21, 2024. It is now read-only.

Commit

Permalink
0.11.6
Browse files Browse the repository at this point in the history 
Fixed a segmentation fault when mismatching parenthesis are used eg. PRINT )
Fixed a trailing 0 removing error
Added a patch so that doing PRINT 100+1*3 is possible (idk why it was happening so i fixed the effects instead of the problem)
Added examples
  • Loading branch information
@PQCraft
PQCraft authored Mar 18, 2021
1 parent 62903fe commit a1c30d3
Show file tree
Hide file tree
Showing 6 changed files with 102 additions and 27 deletions.
80 changes: 59 additions & 21 deletions clibasic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <editline.h>
#include <readline/history.h>

char VER[] = "0.11.5";
char VER[] = "0.11.6";

FILE *prog;
FILE *f[256];
Expand Down Expand Up @@ -199,7 +199,7 @@ int main(int argc, char *argv[]) {
while (true) {
if (!inProg) {
if (cmdint) {if (textlock) {tcsetattr(0, TCSANOW, &restore); textlock = false;} cmdint = false; goto brkproccmd;}
if (debug) printf("conbuf: {%s}\n", conbuf);
//if (debug) printf("conbuf: {%s}\n", conbuf);
if (conbuf[cp] == '"') {inStr = !inStr; cmdl++;} else
if ((conbuf[cp] == ':' && !inStr) || conbuf[cp] == '\0') {
while ((conbuf[cp - cmdl] == ' ') && cmdl > 0) {cmdl--;}
Expand All @@ -219,7 +219,7 @@ int main(int argc, char *argv[]) {
if (cmdint) {inProg = false; fclose(prog); free(progFilename); cmdint = false; goto brkproccmd;}
if (fgrabc(prog, cp) == '"') {inStr = !inStr; cmdl++;} else
if ((fgrabc(prog, cp) == ':' && !inStr) || fgrabc(prog, cp) == '\0' || fgrabc(prog, cp) == '\r' || fgrabc(prog, cp) == '\n' || fgrabc(prog, cp) == -1 || fgrabc(prog, cp) == 4 || fgrabc(prog, cp) == 0) {
if (fgrabc(prog, cp - cmdl - 1) == '\n' && !lockpl) {progLine++; if (debug) printf("found nl: [%ld]\n", cp);}
if (fgrabc(prog, cp - cmdl - 1) == '\n' && !lockpl) {progLine++; if (debug) printf("found nl: [%lld]\n", (long long int)cp);}
if (lockpl) lockpl = false;
while ((fgrabc(prog, cp - cmdl) == ' ' || (fgrabc(prog, cp) == '\r' && fgrabc(prog, cp - cmdl) == '\n')) && cmdl > 0) {cmdl--;}
if (fgrabc(prog, cp - cmdl) == '\'') {
Expand All @@ -240,8 +240,7 @@ int main(int argc, char *argv[]) {
}
}
brkproccmd:

if (debug) printf("conbuf: {%s}\n", conbuf);
//if (debug) printf("conbuf: {%s}\n", conbuf);
signal(SIGINT, cleanExit);
if (textlock) {tcsetattr(0, TCSANOW, &restore); textlock = false;}
}
Expand Down Expand Up @@ -334,7 +333,7 @@ bool isSpChar(char* bfr, int pos) {
}

bool isValidVarChar(char* bfr, int pos) {
return ((bfr[pos] >= 'A' && bfr[pos] <= 'Z') || (bfr[pos] >= 'a' && bfr[pos] <= 'z') || bfr[pos] == '_' || bfr[pos] == '$' || bfr[pos] == '%' || bfr[pos] == '&' || bfr[pos] == '!' || bfr[pos] == '~');
return ((bfr[pos] >= 'A' && bfr[pos] <= 'Z') || (bfr[pos] >= 'a' && bfr[pos] <= 'z') || (bfr[pos] >= '0' && bfr[pos] <= '9') || bfr[pos] == '_' || bfr[pos] == '$' || bfr[pos] == '%' || bfr[pos] == '&' || bfr[pos] == '!' || bfr[pos] == '~');
}

int copyStr(char* str1, char* str2) {
Expand Down Expand Up @@ -464,18 +463,21 @@ uint8_t getFunc(char* inbuf, char* outbuf) {
}

uint8_t getVar(char* vn, char* varout) {
if (debug) printf("getVar(\"%s\", \"%s\");\n", vn, varout);
if (vn[0] == '\0') return 0;
if (vn[strlen(vn) - 1] == ')') {
return getFunc(vn, varout);
}
for (int i = 0; vn[i] != '\0'; i++) {
if (vn[i] >= 'a' && vn[i] <= 'z') vn[i] -= 32;
}
for (int i = 0; vn[i] != '\0'; i++) {
if (!isValidVarChar(vn, i)) {
cerr = 4;
errstr = realloc(errstr, (strlen(vn) + 1) * sizeof(char));
copyStr(vn, errstr);
return 0;
}
if (vn[i] >= 'a' && vn[i] <= 'z') vn[i] -= 32;
}
int v = -1;
for (int i = 0; i < varmaxct; i++) {
Expand All @@ -492,14 +494,22 @@ uint8_t getVar(char* vn, char* varout) {
}

bool setVar(char* vn, char* val, uint8_t t) {
for (int i = 0; vn[i] != '\0'; i++) {
if (vn[i] >= 'a' && vn[i] <= 'z') vn[i] -= 32;
}
for (int i = 0; vn[i] != '\0'; i++) {
if (!isValidVarChar(vn, i)) {
cerr = 4;
errstr = realloc(errstr, (strlen(vn) + 1) * sizeof(char));
copyStr(vn, errstr);
return false;
}
if (vn[i] >= 'a' && vn[i] <= 'z') vn[i] -= 32;
}
if (getType(vn) != 255) {
cerr = 4;
errstr = realloc(errstr, (strlen(vn) + 1) * sizeof(char));
copyStr(vn, errstr);
return false;
}
int v = -1;
for (int i = 0; i < varmaxct; i++) {
Expand Down Expand Up @@ -567,9 +577,12 @@ uint8_t getVal(char* tmpinbuf, char* outbuf) {
jp = i;
copyStrSnip(inbuf, ip + 1, jp, tmp[0]);
t = getVal(tmp[0], tmp[0]);
if (debug) printf("t: %d\n", t);
if (t == 0) return 0;
if (dt == 0) dt = t;
if (t == 255) {t = 1; dt = 1;}
if (t != dt) {cerr = 2; return 0;}
if (debug) printf("dt: %d\n", dt);
copyStrSnip(inbuf, 0, ip, tmp[1]);
copyStrApnd(tmp[1], tmp[2]);
if (t == 1) copyStrApnd(tmp[3], tmp[2]);
Expand All @@ -582,6 +595,7 @@ uint8_t getVal(char* tmpinbuf, char* outbuf) {
}
}
}
if (tmpct != 0) {cerr = 1; return 0;}
ip = 0; jp = 0;
tmp[0][0] = 0; tmp[1][0] = 0; tmp[2][0] = 0; tmp[3][0] = 0;
while (true) {
Expand Down Expand Up @@ -625,7 +639,7 @@ uint8_t getVal(char* tmpinbuf, char* outbuf) {
if (tmp[0][i] == '"') inStr = !inStr;
if (tmp[0][i] == '(') {pct++;}
if (tmp[0][i] == ')') {pct--;}
if (tmp[0][i] == '^' && !inStr && pct == 0) {if (!gvchkchar(tmp[0], i)) {return 0;} p2 = i; numAct = 4;}
if (tmp[0][i] == '^' && !inStr && pct == 0) {if (!gvchkchar(tmp[0], i)) {return 0;} p2 = i; numAct = 4;}
}
for (int i = 0; tmp[0][i] != '\0' && p2 == 0; i++) {
if (tmp[0][i] == '"') inStr = !inStr;
Expand All @@ -648,11 +662,14 @@ uint8_t getVal(char* tmpinbuf, char* outbuf) {
if (t == 0) {cerr = 1; return 0;} else
if (t == 255) {t = getVar(tmp[0], tmp[0]);
if (t == 0) {return 0;}
if (t == 255) {t = 2; tmp[0][0] = '0'; tmp[0][1] = '\0';}
if (t != 2) {cerr = 2; return 0;}}
}
copyStr(tmp[0], tmp[1]); goto gvfexit;
}
if (debug) printf("1: tmp[0]: {%s} tmp[1]: {%s} tmp[2]: {%s} tmp[3]: {%s}\n", tmp[0], tmp[1], tmp[2], tmp[3]);
tmp[1][0] = 0; tmp[2][0] = 0; tmp[3][0] = 0;
if (debug) printf("2: tmp[0]: {%s} tmp[1]: {%s} tmp[2]: {%s} tmp[3]: {%s}\n", tmp[0], tmp[1], tmp[2], tmp[3]);
for (int i = p2 - 1; i > 0; i--) {
if (tmp[0][i] == '"') inStr = !inStr;
if (isSpChar(tmp[0], i) && !inStr) {p1 = i; break;}
Expand All @@ -661,14 +678,18 @@ uint8_t getVal(char* tmpinbuf, char* outbuf) {
if (tmp[0][i] == '"') inStr = !inStr;
if ((isSpChar(tmp[0], i) && i != p2 + 1 && !inStr) || tmp[0][i] == '\0') {p3 = i; break;}
}
if (tmp[0][p1] == '+') p1++;
copyStrSnip(tmp[0], p1, p2, tmp[2]);
if (debug) printf("3: tmp[0]: {%s} tmp[1]: {%s} tmp[2]: {%s} tmp[3]: {%s}\n", tmp[0], tmp[1], tmp[2], tmp[3]);
t = getType(tmp[2]);
if (t == 0) {cerr = 1; return 0;} else
if (t == 255) {t = getVar(tmp[2], tmp[2]); if (t == 0) {return 0;} if (t != 2) {cerr = 2; return 0;}}
copyStrSnip(tmp[0], p2 + 1, p3, tmp[3]);
if (debug) printf("4: tmp[0]: {%s} tmp[1]: {%s} tmp[2]: {%s} tmp[3]: {%s}\n", tmp[0], tmp[1], tmp[2], tmp[3]);
t = getType(tmp[3]);
if (t == 0) {cerr = 1; return 0;} else
if (t == 255) {t = getVar(tmp[3], tmp[3]); if (t == 0) {return 0;} if (t != 2) {cerr = 2; return 0;}}
if (debug) printf("5: tmp[0]: {%s} tmp[1]: {%s} tmp[2]: {%s} tmp[3]: {%s}\n", tmp[0], tmp[1], tmp[2], tmp[3]);
sscanf(tmp[2], "%lf", &num1);
sscanf(tmp[3], "%lf", &num2);
switch (numAct) {
Expand All @@ -678,10 +699,16 @@ uint8_t getVal(char* tmpinbuf, char* outbuf) {
case 3: if (num2 == 0) {cerr = 5; return 0;} num3 = num1 / num2; break;
case 4: num3 = pow(num1, num2); break;
}
if (debug) printf("num1: [%lf] num2: [%lf] num3: [%lf] \n", num1, num2, num3);
tmp[1][0] = 0;
sprintf(tmp[2], "%lf", num3);
while (tmp[2][strlen(tmp[2]) - 1] == '0') {tmp[2][strlen(tmp[2]) - 1] = 0;}
if (tmp[2][strlen(tmp[2]) - 1] == '.') {tmp[2][strlen(tmp[2]) - 1] = 0;}
if (dt == 2) {
bool dp = false;
int i = 0;
while (tmp[2][i] != '\0') {if (tmp[2][i] == '.') {dp = true;} i++;}
while (dp && tmp[2][strlen(tmp[2]) - 1] == '0') {tmp[2][strlen(tmp[2]) - 1] = 0;}
if (dp && tmp[2][strlen(tmp[2]) - 1] == '.') {tmp[2][strlen(tmp[2]) - 1] = 0;}
}
copyStrSnip(tmp[0], p3, strlen(tmp[0]), tmp[3]);
if (p1 != 0) copyStrSnip(tmp[0], 0, p1, tmp[1]);
copyStrApnd(tmp[2], tmp[1]);
Expand All @@ -694,6 +721,13 @@ uint8_t getVal(char* tmpinbuf, char* outbuf) {
ip = jp;
}
gvfexit:
if (dt == 2) {
bool dp = false;
int i = 0;
while (tmp[1][i] != '\0') {if (tmp[1][i] == '.') {dp = true;} i++;}
while (dp && tmp[1][strlen(tmp[1]) - 1] == '0') {tmp[1][strlen(tmp[1]) - 1] = 0;}
if (dp && tmp[1][strlen(tmp[1]) - 1] == '.') {tmp[1][strlen(tmp[1]) - 1] = 0;}
}
copyStr(tmp[1], outbuf);
if (outbuf[0] == '\0' && dt != 1) {outbuf[0] = '0'; outbuf[1] = '\0'; return 2;}
return dt;
Expand All @@ -709,8 +743,8 @@ bool solveargs() {
for (int i = 1; i <= argct; i++) {
argt[i] = 0;
for (int p = 0; p < 32767; p++) {tmpbuf[p] = 0;}
if (debug) printf("getting val...\n");
argt[i] = getVal(tmpargs[i], tmpbuf);
free(arg[i]);
arg[i] = malloc((argl[i] + 1) * sizeof(char));
copyStr(tmpbuf, arg[i]);
argl[i] = strlen(arg[i]);
Expand Down Expand Up @@ -750,12 +784,10 @@ int getArg(int num, char* inbuf, char* outbuf) {
if (ct == num) {outbuf[len] = inbuf[i]; len++;}
}
outbuf[len] = 0;
if (pct || inStr) return -1;
return len;
}

bool mkargs() {
int tmplen = 0;
char tmpbuf[2][32768];
int j = 0;
while (cmd[j] == ' ') {j++;}
Expand All @@ -770,20 +802,23 @@ bool mkargs() {
if (i == 0) {
copyStrSnip(cmd, j, h, tmpbuf[0]);
argl[i] = strlen(tmpbuf[0]);
if (debug) printf("length of arg[%d]: %d\n", i, argl[i]);
tmpargs[i] = malloc((argl[i] + 1) * sizeof(char));
copyStr(tmpbuf[0], tmpargs[i]);
copyStrSnip(cmd, h + 1, strlen(cmd), tmpbuf[0]);
} else {
tmplen = getArg(i - 1, tmpbuf[0], tmpbuf[1]);
if (tmplen == -1) {cerr = 1; return false;}
argl[i] = tmplen;
if (debug) printf("getting arg[%d]...\n", i);
argl[i] = getArg(i - 1, tmpbuf[0], tmpbuf[1]);
if (debug) printf("length of arg[%d]: %d\n", i, argl[i]);
tmpargs[i] = malloc((argl[i] + 1) * sizeof(char));
copyStr(tmpbuf[1], tmpargs[i]);
}
if (debug) printf("length of arg[%d]: %d\n", i, argl[i]);
tmpargs[i][argl[i]] = '\0';
}
if (argct == 1 && tmpargs[1][0] == '\0') {argct = 0;}
for (int i = 0; i <= argct; i++) {tmpargs[i][argl[i]] = '\0';}
if (debug) printf("solving args...\n");
return solveargs();
}

Expand Down Expand Up @@ -892,7 +927,7 @@ bool runlogic() {
if (dldcmd[dlstackp - 1]) {dldcmd[dlstackp] = true; return true;}
}
if (itstackp > 0) {
if (itdcmd[itstackp - 1]) {itdcmd[itstackp] = true; return true;}
if (itdcmd[itstackp - 1]) {dldcmd[dlstackp] = true; return true;}
}
int p = j;
while (cmd[p] != '\0') {if (cmd[p] != ' ') {cerr = 1; return true;} p++;}
Expand Down Expand Up @@ -930,6 +965,7 @@ bool runlogic() {
cp = dlstack[dlstackp];
progLine = dlpline[dlstackp];
lockpl = true;
dldcmd[dlstackp] = false;
dlstackp--;
int p = j;
while (cmd[p] != '\0') {if (cmd[p] != ' ') {cerr = 1; return true;} p++;}
Expand All @@ -948,6 +984,7 @@ bool runlogic() {
uint8_t testval = logictest(tmp[1]);
if (testval != 1 && testval != 0) return true;
if (testval == 1) {cp = dlstack[dlstackp]; progLine = dlpline[dlstackp]; lockpl = true;}
dldcmd[dlstackp] = false;
dlstackp--;
didloop = true;
return true;
Expand All @@ -959,13 +996,12 @@ bool runlogic() {
if (itdcmd[itstackp - 1]) {itdcmd[itstackp] = true; return true;}
}
if (dlstackp > 0) {
if (dldcmd[dlstackp - 1]) {dldcmd[dlstackp] = true; return true;}
if (dldcmd[dlstackp - 1]) {itdcmd[itstackp] = true; return true;}
}
copyStrSnip(cmd, j + 1, strlen(cmd), tmp[1]);
uint8_t testval = logictest(tmp[1]);
if (testval != 1 && testval != 0) return true;
itdcmd[itstackp] = (bool)testval;
itdcmd[itstackp] = !itdcmd[itstackp];
itdcmd[itstackp] = (bool)!testval;
return true;
}
if (!strcmp(tmp[0], "ELSE")) {
Expand All @@ -983,6 +1019,7 @@ bool runlogic() {
}
if (!strcmp(tmp[0], "ENDIF")) {
if (itstackp <= -1) {cerr = 7; goto lexit;}
itdcmd[itstackp] = false;
itstackp--;
return true;
}
Expand All @@ -1000,6 +1037,7 @@ void runcmd() {
if (dlstackp > -1) {if (dldcmd[dlstackp] == 1) return;}
if (itstackp > -1) {if (itdcmd[itstackp] == 1) return;}
if (debug) printf("passed\n");
if (debug) printf("making args...\n");
if (!mkargs()) goto cmderr;
for (int i = 0; i < argl[0]; i++) {
if (arg[0][i] >= 'a' && arg[0][i] <= 'z') {
Expand Down
6 changes: 3 additions & 3 deletions commands.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ if (!strcmp(arg[0], "WAIT")) {
if (argct != 1) {cerr = 3; goto cmderr;}
if (argt[1] != 2) {cerr = 2; goto cmderr;}
uint64_t d;
sscanf(arg[1], "%lu", &d);
sscanf(arg[1], "%llu", (long long unsigned *)&d);
uint64_t t = d * 1000000 + time_us();
while (t > time_us()) {}
goto cmderr;
Expand All @@ -83,7 +83,7 @@ if (!strcmp(arg[0], "WAITMS")) {
if (argct != 1) {cerr = 3; goto cmderr;}
if (argt[1] != 2) {cerr = 2; goto cmderr;}
uint64_t d;
sscanf(arg[1], "%lu", &d);
sscanf(arg[1], "%llu", (long long unsigned *)&d);
uint64_t t = d * 1000 + time_us();
while (t > time_us()) {}
goto cmderr;
Expand All @@ -93,7 +93,7 @@ if (!strcmp(arg[0], "WAITUS")) {
if (argct != 1) {cerr = 3; goto cmderr;}
if (argt[1] != 2) {cerr = 2; goto cmderr;}
uint64_t d;
sscanf(arg[1], "%lu", &d);
sscanf(arg[1], "%llu", (long long unsigned *)&d);
uint64_t t = d + time_us();
while (t > time_us()) {}
goto cmderr;
Expand Down
18 changes: 18 additions & 0 deletions examples/bunkerbomb.bas
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
set e, 0
dowhile e = 0
set i$, input$("Bomb le bunker? [Y/n]: ")
if i$ = "": set e, 1: endif
if chr$(asc(i$)) = "y": set e, 1: endif
if chr$(asc(i$)) = "Y": set e, 1: endif
if chr$(asc(i$)) = "n": set e, 2: endif
if chr$(asc(i$)) = "N": set e, 2: endif
loop
print "You have chosen...\n"
if e = 1
print "Sending nukes..."
wait 3
print "\nDone."
else
print "Le buker lives another day."
endif
exit
1 change: 1 addition & 0 deletions examples/hacker.bas
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
do: set e, cint(rand(31, 126)): set c, cint(rand(1)): color c*8+2: : if cint(rand(1)) = 0: : endif: print chr$(e): if cint(rand(15)) = 0: print "\r\e[2K": endif: if cint(rand(255)) = 0: print "\n": endif: loop
15 changes: 15 additions & 0 deletions examples/test.bas
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
print "test\n"
color 21
print "blue\n"
$txtbold

set E, 0
do
set E, E+1
print E, "\t"
loopwhile e < 256
foo

foo

nac
Loading

0 comments on commit a1c30d3

Please sign in to comment.