♻️ 重构(main.c/sqlist.c):更正函数deal_bracket命名为deal_bracket,增加了缺失的函数返回类型void

📝 文档(main.c):增加了默认返回值-1以处理操作符优先级的情况
🐛 修复(main.c):修改st_push函数调用参数类型,解决编译警告
📦 部署(sqlist.c):为sqlist_union函数添加了缺少的返回语句
This commit is contained in:
lzy
2024-05-27 02:42:35 +08:00
parent a277dec1fe
commit 73b78d8700
2 changed files with 7 additions and 4 deletions

View File

@@ -25,7 +25,7 @@ static void compute(sqstack *snum, int *op)
st_push(snum, &n); st_push(snum, &n);
} }
static deal_bracket(sqstack *snum, sqstack *sop) static void deal_bracket(sqstack *snum, sqstack *sop)
{ {
datatype old_op; datatype old_op;
@@ -50,6 +50,7 @@ static int get_pri(int op)
case '-': return 1; case '-': return 1;
case '*': case '*':
case '/': return 2; 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 == '(') if (st_isempty(sop) || op == '(')
{ {
st_push(sop, &op); st_push(sop, (datatype *)&op);
return; return;
} }
@@ -68,7 +69,7 @@ static void deal_op(sqstack *snum, sqstack *sop, char op)
if (get_pri(op) > get_pri(old_op)) if (get_pri(op) > get_pri(old_op))
{ {
st_push(sop, &op); st_push(sop, (datatype *)&op);
return; return;
} }
@@ -81,7 +82,7 @@ static void deal_op(sqstack *snum, sqstack *sop, char op)
st_top(sop, &old_op); st_top(sop, &old_op);
} }
st_push(sop, &op); st_push(sop, (datatype *)&op);
} }

View File

@@ -128,4 +128,6 @@ int sqlist_union(sqlist *list1, sqlist *list2)
sqlist_insert(list1, 0, &list2->data[i]); sqlist_insert(list1, 0, &list2->data[i]);
} }
} }
return 0;
} }