From 73b78d87007f7d77f15246d571908c634d797e56 Mon Sep 17 00:00:00 2001 From: lzy Date: Mon, 27 May 2024 02:42:35 +0800 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=E9=87=8D=E6=9E=84(main.c/?= =?UTF-8?q?sqlist.c)=EF=BC=9A=E6=9B=B4=E6=AD=A3=E5=87=BD=E6=95=B0deal=5Fbr?= =?UTF-8?q?acket=E5=91=BD=E5=90=8D=E4=B8=BAdeal=5Fbracket=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E7=BC=BA=E5=A4=B1=E7=9A=84=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=9E=8Bvoid=20?= =?UTF-8?q?=F0=9F=93=9D=20=E6=96=87=E6=A1=A3(main.c)=EF=BC=9A=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E9=BB=98=E8=AE=A4=E8=BF=94=E5=9B=9E=E5=80=BC?= =?UTF-8?q?-1=E4=BB=A5=E5=A4=84=E7=90=86=E6=93=8D=E4=BD=9C=E7=AC=A6?= =?UTF-8?q?=E4=BC=98=E5=85=88=E7=BA=A7=E7=9A=84=E6=83=85=E5=86=B5=20?= =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D(main.c)=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9st=5Fpush=E5=87=BD=E6=95=B0=E8=B0=83=E7=94=A8=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E7=B1=BB=E5=9E=8B=EF=BC=8C=E8=A7=A3=E5=86=B3=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E8=AD=A6=E5=91=8A=20=F0=9F=93=A6=20=E9=83=A8=E7=BD=B2?= =?UTF-8?q?(sqlist.c)=EF=BC=9A=E4=B8=BAsqlist=5Funion=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E7=BC=BA=E5=B0=91=E7=9A=84=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- C11-数据结构/ds/line/compute/main.c | 9 +++++---- C11-数据结构/ds/line/list/arr/sqlist.c | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/C11-数据结构/ds/line/compute/main.c b/C11-数据结构/ds/line/compute/main.c index 39eac3e..38c2507 100644 --- a/C11-数据结构/ds/line/compute/main.c +++ b/C11-数据结构/ds/line/compute/main.c @@ -25,7 +25,7 @@ static void compute(sqstack *snum, int *op) st_push(snum, &n); } -static deal_bracket(sqstack *snum, sqstack *sop) +static void deal_bracket(sqstack *snum, sqstack *sop) { datatype old_op; @@ -50,6 +50,7 @@ static int get_pri(int op) case '-': return 1; case '*': case '/': return 2; + default: return -1; } } @@ -60,7 +61,7 @@ static void deal_op(sqstack *snum, sqstack *sop, char op) if (st_isempty(sop) || op == '(') { - st_push(sop, &op); + st_push(sop, (datatype *)&op); return; } @@ -68,7 +69,7 @@ static void deal_op(sqstack *snum, sqstack *sop, char op) if (get_pri(op) > get_pri(old_op)) { - st_push(sop, &op); + st_push(sop, (datatype *)&op); return; } @@ -81,7 +82,7 @@ static void deal_op(sqstack *snum, sqstack *sop, char op) st_top(sop, &old_op); } - st_push(sop, &op); + st_push(sop, (datatype *)&op); } diff --git a/C11-数据结构/ds/line/list/arr/sqlist.c b/C11-数据结构/ds/line/list/arr/sqlist.c index cf73532..d7a011c 100644 --- a/C11-数据结构/ds/line/list/arr/sqlist.c +++ b/C11-数据结构/ds/line/list/arr/sqlist.c @@ -128,4 +128,6 @@ int sqlist_union(sqlist *list1, sqlist *list2) sqlist_insert(list1, 0, &list2->data[i]); } } + + return 0; }