xmengnet/XZZ
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix some bug

Browse source
This commit is contained in:
weilinfox 2020-03-02 20:41:40 +08:00
parent b4ebced531
commit 97c928a2a4
1 changed files with 33 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
worker/bc.py
View file

@ -39,8 +39,12 @@ def exprCal (ch):
global divError global divError
mulflag = False mulflag = False
plusflag = False plusflag = False
for i in range(0, len(ch), 1): if (ch[0] == '-'):
if (ch[i] == "+" or ch[i] == '-'): ch = '0' + ch
ch = ch.replace("--", "+")
ch = ch.replace("+-", "-")
for i in range(1, len(ch), 1):
if ((ch[i] == "+" or ch[i] == '-') and ch[i-1] != '/' and ch[i-1] != '*'):
plusflag = True; plusflag = True;
elif (ch[i] == '*' or ch[i] == '/'): elif (ch[i] == '*' or ch[i] == '/'):
mulflag = True; mulflag = True;
@ -64,6 +68,8 @@ def exprCal (ch):
break; break;
fmul -= 1 fmul -= 1
lmul += 1 lmul += 1
if (ch[lmul] == '-' or ch[lmul] == '+'):
lmul += 1
while (fmul >= 0 and (ch[fmul].isdigit() or ch[fmul] == '.')): while (fmul >= 0 and (ch[fmul].isdigit() or ch[fmul] == '.')):
fmul -= 1 fmul -= 1
while (lmul < len(ch) and (ch[lmul].isdigit() or ch[lmul] == '.')): while (lmul < len(ch) and (ch[lmul].isdigit() or ch[lmul] == '.')):
@ -98,6 +104,8 @@ def exprCal (ch):
ch = exprCal(ch[:lst]) + ch[lst:] ch = exprCal(ch[:lst]) + ch[lst:]
elif (plusflag): elif (plusflag):
while (1): while (1):
ch = ch.replace("+-", "-")
ch = ch.replace("--", "+")
fst = lst = 0 fst = lst = 0
i = 0 i = 0
for c in ch: for c in ch:
@ -151,6 +159,13 @@ def bcMain(com):
com = com.replace("}", ")") com = com.replace("}", ")")
com = com.replace("[", "(") com = com.replace("[", "(")
com = com.replace("]", ")") com = com.replace("]", ")")
com = com.replace("+-", "-")
com = com.replace("--", "+")
com = com.replace("*+", "*")
com = com.replace("/+", "/")
com = com.replace("(-", "(0-")
com = com.replace("(+", "(0+")
com = com.replace("()", "")
com = com.replace("x", "*") com = com.replace("x", "*")
com = com.replace("X", "*") com = com.replace("X", "*")
@ -158,8 +173,11 @@ def bcMain(com):
for i in range(1, len(com)-1, 1): for i in range(1, len(com)-1, 1):
if (com[i] == '(' and (com[i-1].isdigit() or com[i-1] == '.' or com[i-1] == ')')): if (com[i] == '(' and (com[i-1].isdigit() or com[i-1] == '.' or com[i-1] == ')')):
com = com[:i] + "*" + com[i:] com = com[:i] + "*" + com[i:]
elif (com[i] == ')' and (com[i+1].isdigit() or com[i+1] == '.' or com[i+1] == '(')): elif (com[i] == ')' and (com[i+1].isdigit() or com[i+1] == '.' or com[i+1] == '(' or com[i+1] == '-')):
com = com[:i+1] + "*" + com[i+1:] com = com[:i+1] + "*" + com[i+1:]
#部分情况开头加0
if (com[0] == '+' or com[0] == '-' or com[0] == '.'):
com = '0' + com
#print(com) #print(com)
@ -183,7 +201,10 @@ def bcMain(com):
#运算符及小数点位置合法性 #运算符及小数点位置合法性
ncom = com.replace("(", "") ncom = com.replace("(", "")
ncom = ncom.replace(")", "") ncom = ncom.replace(")", "")
if (not ncom[0].isdigit() and ncom[0] != '.'):
if (not ncom[0].isdigit() and ncom[0] != '+' and ncom[0] != '-' and ncom[0] != '.'):
return reportErr(3, ncom[0])
elif ((ncom[0] == '+' or ncom[0] == '-') and (len(ncom) < 2 or not ncom[1].isdigit())):
return reportErr(3, ncom[0]) return reportErr(3, ncom[0])
elif (ncom[0] == '.' and (len(ncom) < 2 or not ncom[1].isdigit())): elif (ncom[0] == '.' and (len(ncom) < 2 or not ncom[1].isdigit())):
return reportErr(5, "") return reportErr(5, "")
@ -192,8 +213,14 @@ def bcMain(com):
elif (ncom[len(ncom)-1] == '.' and (len(ncom) < 2 or not ncom[len(ncom)-2].isdigit())): elif (ncom[len(ncom)-1] == '.' and (len(ncom) < 2 or not ncom[len(ncom)-2].isdigit())):
return reportErr(5, "") return reportErr(5, "")
for i in range(1, len(ncom)-1, 1): for i in range(1, len(ncom)-1, 1):
if (ncom[i] == "+" or ncom[i] == "-" or ncom[i] == "*" or ncom[i] == "/"): #if (ncom[i] == "+" or ncom[i] == "-" or ncom[i] == "*" or ncom[i] == "/"):
if ((not ncom[i-1].isdigit() and ncom[i-1] != '.') or (not ncom[i+1].isdigit() and ncom[i+1] != '.')): # if ((not ncom[i-1].isdigit() and ncom[i-1] != '.') or (not ncom[i+1].isdigit() and ncom[i+1] != '.')):
# return reportErr(3, ncom[i])
if (ncom[i] == "+" or ncom[i] == "-"):
if ((not ncom[i-1].isdigit() and ncom[i-1] != '.' and ncom[i-1] != "*" and ncom[i-1] != "/") or (not ncom[i+1].isdigit() and ncom[i+1] != '.')):
return reportErr(3, ncom[i])
if (ncom[i] == "*" or ncom[i] == "/"):
if ((not ncom[i-1].isdigit() and ncom[i-1] != '.') or (not ncom[i+1].isdigit() and ncom[i+1] != '.' and ncom[i+1] != "-" and ncom[i+1] != "+")):
return reportErr(3, ncom[i]) return reportErr(3, ncom[i])
elif (ncom[i] == '.'): elif (ncom[i] == '.'):
if (not ncom[i-1].isdigit() and not ncom[i+1].isdigit()): if (not ncom[i-1].isdigit() and not ncom[i+1].isdigit()):