Skip to content

Commit 3fa9b56

Browse files
committed
fix ac5 warning
1 parent b4321d3 commit 3fa9b56

File tree

4 files changed

+33
-28
lines changed

4 files changed

+33
-28
lines changed

src/PikaObj.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,14 +443,14 @@ PikaObj* _arg_to_obj(Arg* self, PIKA_BOOL* pIsTemp) {
443443
PikaObj* New_PikaStdData_String(Args * args);
444444
PikaObj* obj = newNormalObj(New_PikaStdData_String);
445445
obj_setStr(obj, "str", arg_getStr(self));
446-
*pIsTemp = 1;
446+
*pIsTemp = PIKA_TRUE;
447447
return obj;
448448
}
449449
if (arg_getType(self) == ARG_TYPE_BYTES) {
450450
PikaObj* New_PikaStdData_ByteArray(Args * args);
451451
PikaObj* obj = newNormalObj(New_PikaStdData_ByteArray);
452452
obj_setArg(obj, "raw", self);
453-
*pIsTemp = 1;
453+
*pIsTemp = PIKA_TRUE;
454454
return obj;
455455
}
456456
#endif

src/PikaParser.c

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2080,6 +2080,8 @@ static char* Suger_multiAssign(Args* out_buffs, char* line) {
20802080
Arg* out_list = arg_newStr("");
20812081
Arg* out_item = arg_newStr("");
20822082
Arg* line_out_arg = arg_newStr("");
2083+
char* line_item = NULL;
2084+
char* out_list_str = NULL;
20832085
int out_num = 0;
20842086
Cursor_forEachToken(cs, line) {
20852087
Cursor_iterStart(&cs);
@@ -2107,11 +2109,11 @@ static char* Suger_multiAssign(Args* out_buffs, char* line) {
21072109
goto exit;
21082110
}
21092111

2110-
char* line_item =
2112+
line_item =
21112113
strsFormat(&buffs, PIKA_LINE_BUFF_SIZE, "$tmp= %s\n", arg_getStr(stmt));
21122114
line_out_arg = arg_strAppend(line_out_arg, line_item);
21132115

2114-
char* out_list_str = arg_getStr(out_list);
2116+
out_list_str = arg_getStr(out_list);
21152117
while (1) {
21162118
char* item = Cursor_popToken(&buffs, &out_list_str, ",");
21172119
if (item[0] == '\0') {
@@ -2547,6 +2549,25 @@ char* GenRule_toAsm(GenRule rule,
25472549
}
25482550

25492551
char* AST_genAsm(AST* ast, Args* outBuffs) {
2552+
2553+
const GenRule rules_topAst[] = {
2554+
{.ins = "CTN", .type = VAL_NONEVAL, .ast = "continue"},
2555+
{.ins = "BRK", .type = VAL_NONEVAL, .ast = "break"},
2556+
{.ins = "DEL", .type = VAL_DYNAMIC, .ast = "del"},
2557+
{.ins = "GLB", .type = VAL_DYNAMIC, .ast = "global"},
2558+
{.ins = "RIS", .type = VAL_DYNAMIC, .ast = "raise"},
2559+
{.ins = "ASS", .type = VAL_NONEVAL, .ast = "assert"},
2560+
{.ins = "RET", .type = VAL_NONEVAL, .ast = "return"}};
2561+
2562+
/* generate code for block ast */
2563+
const GenRule rules_block[] = {
2564+
{.ins = "TRY", .type = VAL_NONEVAL, .ast = "try"},
2565+
{.ins = "EXP", .type = VAL_NONEVAL, .ast = "except"},
2566+
{.ins = "NEL", .type = VAL_STATIC_, .ast = "else", .val = "1"},
2567+
{.ins = "JEZ", .type = VAL_STATIC_, .ast = "if", .val = "1"},
2568+
{.ins = "JEZ", .type = VAL_STATIC_, .ast = "while", .val = "2"},
2569+
};
2570+
25502571
Args buffs = {0};
25512572
char* pikaAsm = strsCopy(&buffs, "");
25522573
QueueObj* exitBlock;
@@ -2777,14 +2798,7 @@ char* AST_genAsm(AST* ast, Args* outBuffs) {
27772798
is_block_matched = 1;
27782799
goto exit;
27792800
}
2780-
/* generate code for block ast */
2781-
const GenRule rules_block[] = {
2782-
{.ins = "TRY", .type = VAL_NONEVAL, .ast = "try"},
2783-
{.ins = "EXP", .type = VAL_NONEVAL, .ast = "except"},
2784-
{.ins = "NEL", .type = VAL_STATIC_, .ast = "else", .val = "1"},
2785-
{.ins = "JEZ", .type = VAL_STATIC_, .ast = "if", .val = "1"},
2786-
{.ins = "JEZ", .type = VAL_STATIC_, .ast = "while", .val = "2"},
2787-
};
2801+
27882802

27892803
for (size_t i = 0; i < sizeof(rules_block) / sizeof(GenRule); i++) {
27902804
GenRule rule = rules_block[i];
@@ -2795,15 +2809,6 @@ char* AST_genAsm(AST* ast, Args* outBuffs) {
27952809
}
27962810
}
27972811

2798-
const GenRule rules_topAst[] = {
2799-
{.ins = "CTN", .type = VAL_NONEVAL, .ast = "continue"},
2800-
{.ins = "BRK", .type = VAL_NONEVAL, .ast = "break"},
2801-
{.ins = "DEL", .type = VAL_DYNAMIC, .ast = "del"},
2802-
{.ins = "GLB", .type = VAL_DYNAMIC, .ast = "global"},
2803-
{.ins = "RIS", .type = VAL_DYNAMIC, .ast = "raise"},
2804-
{.ins = "ASS", .type = VAL_NONEVAL, .ast = "assert"},
2805-
{.ins = "RET", .type = VAL_NONEVAL, .ast = "return"}};
2806-
28072812
/* generate code for top level ast */
28082813
for (size_t i = 0; i < sizeof(rules_topAst) / sizeof(rules_topAst[0]);
28092814
i++) {

src/PikaVM.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ static void VMState_delLReg(VMState* vm, uint8_t index) {
244244
static void VMState_initReg(VMState* vm) {
245245
for (uint8_t i = 0; i < PIKA_REGIST_SIZE; i++) {
246246
vm->lreg[i] = NULL;
247-
vm->ireg[i] = 0;
247+
vm->ireg[i] = PIKA_FALSE;
248248
}
249249
}
250250

@@ -286,7 +286,7 @@ Arg* __vm_get(PikaObj* self, Arg* key, Arg* obj) {
286286
}
287287
if (ARG_TYPE_STRING == type) {
288288
#if PIKA_STRING_UTF8_ENABLE
289-
PIKA_BOOL is_temp = 0;
289+
PIKA_BOOL is_temp = PIKA_FALSE;
290290
obj_new = arg_newObj(_arg_to_obj(obj, &is_temp));
291291
type = arg_getType(obj_new);
292292
#else
@@ -417,7 +417,7 @@ Arg* __vm_slice(PikaObj* self, Arg* end, Arg* obj, Arg* start, int step) {
417417
PikaObj* New_PikaStdData_Tuple(Args * args);
418418
if (arg_obj->constructor == New_PikaStdData_List ||
419419
arg_obj->constructor == New_PikaStdData_Tuple) {
420-
PikaObj* sliced_obj = newNormalObj(arg_obj->constructor);
420+
PikaObj* sliced_obj = newNormalObj((NewFun)arg_obj->constructor);
421421
__vm_List___init__(sliced_obj);
422422
for (int i = start_i; i < end_i; i++) {
423423
Arg* i_arg = arg_newInt(i);
@@ -1050,8 +1050,8 @@ static Arg* VM_instruction_handler_RUN(PikaObj* self,
10501050
/* support for super() */
10511051
if (strEqu(run_path, "super")) {
10521052
run_path = _find_super_class_name(vm);
1053-
vm->in_super = 1;
1054-
skip_init = 1;
1053+
vm->in_super = PIKA_TRUE;
1054+
skip_init = PIKA_TRUE;
10551055
}
10561056
#endif
10571057

@@ -1418,7 +1418,7 @@ static Arg* _VM_JEZ(PikaObj* self,
14181418
int pika_assert) {
14191419
int thisBlockDeepth = VMState_getBlockDeepthNow(vm);
14201420
int jmp_expect = fast_atoi(data);
1421-
vm->ireg[thisBlockDeepth] = !pika_assert;
1421+
vm->ireg[thisBlockDeepth] = (PIKA_BOOL)!pika_assert;
14221422

14231423
if (0 == pika_assert) {
14241424
/* jump */

src/__instruction_table.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,4 @@ def_ins(ASS)
9595
/* expect */
9696
def_ins(EXP)
9797
/* jump no zero */
98-
def_ins(JNZ)
98+
def_ins(JNZ)

0 commit comments

Comments
 (0)