Skip to content

Commit eebd4a9

Browse files
hasumikinhasumikin
committed
fix sign-compare warnings
1 parent b188651 commit eebd4a9

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

‎src/codegen.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ static struct mrc_insn_data
755755
mrc_last_insn(mrc_codegen_scope *s)
756756
{
757757
if (s->pc == 0) {
758-
struct mrc_insn_data data = { OP_NOP, 0 };
758+
struct mrc_insn_data data = { OP_NOP, 0, 0, 0, NULL };
759759
return data;
760760
}
761761
return mrc_decode_insn(&s->iseq[s->lastpc]);
@@ -1043,7 +1043,7 @@ static int
10431043
lv_idx(mrc_codegen_scope *s, mrc_sym id)
10441044
{
10451045
if (!s->lv) return 0;
1046-
for (int n = 0; n < s->lv->size; n++) {
1046+
for (size_t n = 0; n < s->lv->size; n++) {
10471047
if (s->lv->ids[n] == id) return n + 1;
10481048
}
10491049
return 0;

‎src/codegen_prism.inc

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,15 @@ gen_values(mrc_codegen_scope *s, mrc_node *tree, int val, int limit)
8888
if (cursp() >= slimit) slimit = INT16_MAX;
8989

9090
if (!val) {
91-
for (int i = 0; i < cast->arguments.size; i++) {
91+
for (size_t i = 0; i < cast->arguments.size; i++) {
9292
t = (mrc_node *)cast->arguments.nodes[i];
9393
codegen(s, t, NOVAL);
9494
n++;
9595
}
9696
return n;
9797
}
9898

99-
for (int i = 0; i < cast->arguments.size; i++) {
99+
for (size_t i = 0; i < cast->arguments.size; i++) {
100100
t = (mrc_node *)cast->arguments.nodes[i];
101101
if (nint(t) == PM_KEYWORD_HASH_NODE) break;
102102
int is_splat = nint(t) == PM_SPLAT_NODE;
@@ -370,7 +370,7 @@ gen_hash(mrc_codegen_scope *s, mrc_node *tree, int val, int limit)
370370
mrc_bool first = TRUE;
371371

372372
//while (tree) {
373-
for (int i = 0; i < elements.size; i++) {
373+
for (size_t i = 0; i < elements.size; i++) {
374374
if (nint(elements.nodes[i]) == PM_ASSOC_SPLAT_NODE) {
375375
CAST3(assoc_splat, elements.nodes[i], assocsplat);
376376
if (val && first) {
@@ -465,7 +465,7 @@ gen_call(mrc_codegen_scope *s, mrc_node *tree, int val, int safe)
465465
push();
466466
}
467467
}
468-
for (int i = 0; i < arguments->arguments.size; i++) {
468+
for (size_t i = 0; i < arguments->arguments.size; i++) {
469469
mrc_node *t = (mrc_node *)arguments->arguments.nodes[i];
470470
if (nint(t) == PM_KEYWORD_HASH_NODE) { /* keyword arguments */
471471
noop = 1;
@@ -665,7 +665,7 @@ lambda_body(mrc_codegen_scope *s, mrc_node *tree, mrc_node *body, pm_constant_id
665665
}
666666

667667

668-
int ma, mma, oa, ra, pa, ppa, ka, kd, ba, i, forwarding;
668+
size_t i, ma, mma, oa, ra, pa, ppa, ka, kd, ba, forwarding;;
669669
forwarding = 0;
670670
int block_reg = 0;
671671
pm_constant_id_list_t *lv = (pm_constant_id_list_t *)codegen_palloc(s, sizeof(pm_constant_id_list_t));
@@ -802,15 +802,15 @@ lambda_body(mrc_codegen_scope *s, mrc_node *tree, mrc_node *body, pm_constant_id
802802
for (i = 0; i < ma; i++) {
803803
if (nint(parameters->requireds.nodes[i]) == PM_MULTI_TARGET_NODE) {
804804
CAST3(multi_target, parameters->requireds.nodes[i], m);
805-
for (int j = 0; j < m->lefts.size; j++) {
805+
for (size_t j = 0; j < m->lefts.size; j++) {
806806
mrc_constant_id_list_append(s, lv, ((pm_required_parameter_node_t *)m->lefts.nodes[j])->name);
807807
}
808808
}
809809
}
810810
for (i = 0; i < pa; i++) {
811811
if (nint(parameters->posts.nodes[i]) == PM_MULTI_TARGET_NODE) {
812812
CAST3(multi_target, parameters->posts.nodes[i], m);
813-
for (int j = 0; j < m->lefts.size; j++) {
813+
for (size_t j = 0; j < m->lefts.size; j++) {
814814
mrc_constant_id_list_append(s, lv, ((pm_required_parameter_node_t *)m->lefts.nodes[j])->name);
815815
}
816816
}
@@ -1062,7 +1062,7 @@ gen_rescue(mrc_codegen_scope *s, mrc_node *tree, uint32_t *pos1, int *exc, uint3
10621062
if (nint((mrc_node *)rescue) != PM_RESCUE_NODE) {
10631063
codegen_error(s, "should not happen");
10641064
}
1065-
int i;
1065+
size_t i;
10661066
uint32_t pos2, tmp;
10671067

10681068
dispatch(s, *pos1);
@@ -1249,19 +1249,19 @@ codegen(mrc_codegen_scope *s, mrc_node *tree, int val)
12491249
case PM_MULTI_WRITE_NODE:
12501250
{
12511251
CAST(multi_write);
1252-
int len = 0, n = 0, post = 0;
1252+
size_t len = 0, n = 0, post = 0;
12531253
CAST3(array, cast->value, t);
12541254
int rhs = cursp();
12551255

12561256
if (!val && nint((mrc_node *)t) == PM_ARRAY_NODE && !(t->base.flags & PM_ARRAY_NODE_FLAGS_CONTAINS_SPLAT) ) {
12571257
/* fixed rhs */
12581258
len = t->elements.size;
1259-
for (int i = 0; i < len; i++) {
1259+
for (size_t i = 0; i < len; i++) {
12601260
codegen(s, t->elements.nodes[i], VAL);
12611261
}
12621262
if (0 < cast->lefts.size) {
12631263
n = 0;
1264-
for (int i = 0; i < cast->lefts.size; i++) {
1264+
for (size_t i = 0; i < cast->lefts.size; i++) {
12651265
if (i < len) {
12661266
gen_assignment(s, cast->lefts.nodes[i], NULL, rhs+n, NOVAL);
12671267
n++;
@@ -1291,7 +1291,7 @@ codegen(mrc_codegen_scope *s, mrc_node *tree, int val)
12911291
n += rn;
12921292
}
12931293
if (0 < post) {
1294-
for (int i = 0; i < post; i++) {
1294+
for (size_t i = 0; i < post; i++) {
12951295
if (n < len) {
12961296
gen_assignment(s, cast->rights.nodes[i], NULL, rhs+n, NOVAL);
12971297
}
@@ -1447,7 +1447,7 @@ codegen(mrc_codegen_scope *s, mrc_node *tree, int val)
14471447
push_n(2); pop_n(2); /* space for receiver, arguments and a block */
14481448
genop_3(s, OP_SEND, cursp(), idx, 0);
14491449

1450-
if (-1 != binary_operator) {
1450+
if (-1 != (int32_t)binary_operator) {
14511451
push();
14521452
codegen(s, value, VAL);
14531453
push(); pop();
@@ -1510,7 +1510,7 @@ codegen(mrc_codegen_scope *s, mrc_node *tree, int val)
15101510
}
15111511
int base, nargs = 0;
15121512
int idx, callargs = -1, vsp = -1;
1513-
uint32_t pos = -1;
1513+
int32_t pos = -1;
15141514
if (val) {
15151515
vsp = cursp();
15161516
push();
@@ -1534,7 +1534,7 @@ codegen(mrc_codegen_scope *s, mrc_node *tree, int val)
15341534
}
15351535
push_n(nargs + 2); pop_n(nargs + 2); /* space for receiver, arguments and a block */
15361536
genop_3(s, OP_SEND, cursp(), idx, callargs);
1537-
if (-1 != binary_operator) {
1537+
if (-1 != (int32_t)binary_operator) {
15381538
push();
15391539
codegen(s, value, VAL);
15401540
push(); pop();
@@ -1885,7 +1885,7 @@ codegen(mrc_codegen_scope *s, mrc_node *tree, int val)
18851885
push();
18861886
str_begin = TRUE;
18871887
}
1888-
for (int i = 0; i < cast->parts.size; i++) {
1888+
for (size_t i = 0; i < cast->parts.size; i++) {
18891889
codegen(s, cast->parts.nodes[i], VAL);
18901890
pop();
18911891
if (str_begin || 0 < i) {
@@ -1915,7 +1915,7 @@ codegen(mrc_codegen_scope *s, mrc_node *tree, int val)
19151915
push();
19161916
}
19171917
else {
1918-
for (int i = 0; i < cast->parts.size; i++) {
1918+
for (size_t i = 0; i < cast->parts.size; i++) {
19191919
if (nint(cast->parts.nodes[i]) != PM_STRING_NODE) {
19201920
codegen(s, cast->parts.nodes[i], NOVAL);
19211921
}
@@ -1954,7 +1954,7 @@ codegen(mrc_codegen_scope *s, mrc_node *tree, int val)
19541954
case PM_INTERPOLATED_STRING_NODE:
19551955
case PM_INTERPOLATED_SYMBOL_NODE:
19561956
{
1957-
int i;
1957+
size_t i;
19581958
mrc_node **nodes;
19591959
uint32_t size;
19601960
if (nt == PM_INTERPOLATED_SYMBOL_NODE) {
@@ -2013,7 +2013,7 @@ codegen(mrc_codegen_scope *s, mrc_node *tree, int val)
20132013
}
20142014
case PM_INTERPOLATED_X_STRING_NODE:
20152015
{
2016-
int i;
2016+
size_t i;
20172017
CAST(interpolated_x_string);
20182018
int sym = new_sym(s, MRC_SYM_1(Kernel));
20192019

@@ -2296,10 +2296,10 @@ codegen(mrc_codegen_scope *s, mrc_node *tree, int val)
22962296
head = cursp();
22972297
codegen(s, (mrc_node *)cast->predicate, VAL);
22982298
}
2299-
for (int i = 0; i < cast->conditions.size; i++) {
2299+
for (size_t i = 0; i < cast->conditions.size; i++) {
23002300
pm_when_node_t *when = (pm_when_node_t *)cast->conditions.nodes[i];
23012301
pos1 = pos2 = JMPLINK_START;
2302-
for (int j = 0; j < when->conditions.size; j++) {
2302+
for (size_t j = 0; j < when->conditions.size; j++) {
23032303
mrc_node *cond = when->conditions.nodes[j];
23042304
mrc_bool splat = FALSE;
23052305
if (nint(cond) == PM_SPLAT_NODE) {
@@ -2508,7 +2508,7 @@ codegen(mrc_codegen_scope *s, mrc_node *tree, int val)
25082508
case PM_UNDEF_NODE:
25092509
{
25102510
CAST(undef);
2511-
for (int i = 0; i < cast->names.size; i++) {
2511+
for (size_t i = 0; i < cast->names.size; i++) {
25122512
CAST3(symbol, cast->names.nodes[i], name);
25132513
int symbol = new_sym(s, nsym(s->c->p, name->unescaped.source, name->unescaped.length));
25142514
genop_1(s, OP_UNDEF, symbol);
@@ -2540,7 +2540,7 @@ codegen(mrc_codegen_scope *s, mrc_node *tree, int val)
25402540
push();
25412541
}
25422542
/* keyword arguments */
2543-
for (int i = 0; i < arguments->arguments.size; i++) {
2543+
for (size_t i = 0; i < arguments->arguments.size; i++) {
25442544
mrc_node *t = (mrc_node *)arguments->arguments.nodes[i];
25452545
if (nint(t) == PM_KEYWORD_HASH_NODE) {
25462546
nk = gen_hash(s, t, VAL, 14);

0 commit comments

Comments
 (0)