Commit 41b1758b authored by Hiroyuki Iwatsuki's avatar Hiroyuki Iwatsuki

intptr_t uses to cast only.

parent b666b7d1
...@@ -660,7 +660,7 @@ new_op_asgn(parser_state *p, node *a, mrb_sym op, node *b) ...@@ -660,7 +660,7 @@ new_op_asgn(parser_state *p, node *a, mrb_sym op, node *b)
static node* static node*
new_int(parser_state *p, const char *s, int base) new_int(parser_state *p, const char *s, int base)
{ {
return list3((node*)NODE_INT, (node*)strdup(s), (node*)base); return list3((node*)NODE_INT, (node*)strdup(s), (node*)(intptr_t)base);
} }
// (:float . i) // (:float . i)
...@@ -688,14 +688,14 @@ new_dstr(parser_state *p, node *a) ...@@ -688,14 +688,14 @@ new_dstr(parser_state *p, node *a)
static node* static node*
new_back_ref(parser_state *p, int n) new_back_ref(parser_state *p, int n)
{ {
return cons((node*)NODE_BACK_REF, (node*)n); return cons((node*)NODE_BACK_REF, (node*)(intptr_t)n);
} }
// (:nthref . n) // (:nthref . n)
static node* static node*
new_nth_ref(parser_state *p, int n) new_nth_ref(parser_state *p, int n)
{ {
return cons((node*)NODE_NTH_REF, (node*)n); return cons((node*)NODE_NTH_REF, (node*)(intptr_t)n);
} }
static void static void
...@@ -774,7 +774,7 @@ ret_args(parser_state *p, node *n) ...@@ -774,7 +774,7 @@ ret_args(parser_state *p, node *n)
static void static void
assignable(parser_state *p, node *lhs) assignable(parser_state *p, node *lhs)
{ {
switch ((int)lhs->car) { switch ((int)(intptr_t)lhs->car) {
case NODE_LVAR: case NODE_LVAR:
local_add(p, (mrb_sym)lhs->cdr); local_add(p, (mrb_sym)lhs->cdr);
break; break;
...@@ -788,7 +788,7 @@ var_reference(parser_state *p, node *lhs) ...@@ -788,7 +788,7 @@ var_reference(parser_state *p, node *lhs)
{ {
node *n; node *n;
switch ((int)lhs->car) { switch ((int)(intptr_t)lhs->car) {
case NODE_LVAR: case NODE_LVAR:
if (!local_var_p(p, (mrb_sym)lhs->cdr)) { if (!local_var_p(p, (mrb_sym)lhs->cdr)) {
n = new_fcall(p, (mrb_sym)lhs->cdr, 0); n = new_fcall(p, (mrb_sym)lhs->cdr, 0);
...@@ -1989,7 +1989,7 @@ primary : literal ...@@ -1989,7 +1989,7 @@ primary : literal
} }
term term
{ {
$<node>$ = cons(local_switch(p), (node*)p->in_single); $<node>$ = cons(local_switch(p), (node*)(intptr_t)p->in_single);
p->in_single = 0; p->in_single = 0;
} }
bodystmt bodystmt
...@@ -1998,7 +1998,7 @@ primary : literal ...@@ -1998,7 +1998,7 @@ primary : literal
$$ = new_sclass(p, $3, $7); $$ = new_sclass(p, $3, $7);
local_resume(p, $<node>6->car); local_resume(p, $<node>6->car);
p->in_def = $<num>4; p->in_def = $<num>4;
p->in_single = (int)$<node>6->cdr; p->in_single = (int)(intptr_t)$<node>6->cdr;
} }
| keyword_module cpath | keyword_module cpath
{ {
...@@ -2972,12 +2972,12 @@ yywarning_s(parser_state *p, const char *fmt, const char *s) ...@@ -2972,12 +2972,12 @@ yywarning_s(parser_state *p, const char *fmt, const char *s)
static void static void
backref_error(parser_state *p, node *n) backref_error(parser_state *p, node *n)
{ {
switch ((int)n->car) { switch ((int)(intptr_t)n->car) {
case NODE_NTH_REF: case NODE_NTH_REF:
yyerror_i(p, "can't set variable $%d", (int)n->cdr); yyerror_i(p, "can't set variable $%d", (int)(intptr_t)n->cdr);
break; break;
case NODE_BACK_REF: case NODE_BACK_REF:
yyerror_i(p, "can't set variable $%c", (int)n->cdr); yyerror_i(p, "can't set variable $%c", (int)(intptr_t)n->cdr);
break; break;
} }
} }
...@@ -2993,7 +2993,7 @@ nextc(parser_state *p) ...@@ -2993,7 +2993,7 @@ nextc(parser_state *p)
if (p->pb) { if (p->pb) {
node *tmp; node *tmp;
c = (int)p->pb->car; c = (int)(intptr_t)p->pb->car;
tmp = p->pb; tmp = p->pb;
p->pb = p->pb->cdr; p->pb = p->pb->cdr;
cons_free(tmp); cons_free(tmp);
...@@ -3030,7 +3030,7 @@ pushback(parser_state *p, int c) ...@@ -3030,7 +3030,7 @@ pushback(parser_state *p, int c)
{ {
if (c < 0) return; if (c < 0) return;
p->column--; p->column--;
p->pb = cons((node*)c, p->pb); p->pb = cons((node*)(intptr_t)c, p->pb);
} }
static void static void
...@@ -3055,7 +3055,7 @@ peek_n(parser_state *p, int c, int n) ...@@ -3055,7 +3055,7 @@ peek_n(parser_state *p, int c, int n)
while (n--) { while (n--) {
c0 = nextc(p); c0 = nextc(p);
if (c0 < 0) return FALSE; if (c0 < 0) return FALSE;
list = push(list, (node*)c0); list = push(list, (node*)(intptr_t)c0);
} }
if (p->pb) { if (p->pb) {
p->pb = push(p->pb, (node*)list); p->pb = push(p->pb, (node*)list);
...@@ -4812,7 +4812,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -4812,7 +4812,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
if (!tree) return; if (!tree) return;
again: again:
dump_prefix(offset); dump_prefix(offset);
n = (int)tree->car; n = (int)(intptr_t)tree->car;
tree = tree->cdr; tree = tree->cdr;
switch (n) { switch (n) {
case NODE_BEGIN: case NODE_BEGIN:
...@@ -5051,7 +5051,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5051,7 +5051,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
dump_prefix(offset+1); dump_prefix(offset+1);
printf("method='%s' (%d)\n", printf("method='%s' (%d)\n",
mrb_sym2name(mrb, (mrb_sym)tree->cdr->car), mrb_sym2name(mrb, (mrb_sym)tree->cdr->car),
(int)tree->cdr->car); (int)(intptr_t)tree->cdr->car);
tree = tree->cdr->cdr->car; tree = tree->cdr->cdr->car;
if (tree) { if (tree) {
dump_prefix(offset+1); dump_prefix(offset+1);
...@@ -5164,7 +5164,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5164,7 +5164,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
parser_dump(mrb, tree->car, offset+2); parser_dump(mrb, tree->car, offset+2);
tree = tree->cdr; tree = tree->cdr;
dump_prefix(offset+1); dump_prefix(offset+1);
printf("op='%s' (%d)\n", mrb_sym2name(mrb, (mrb_sym)tree->car), (int)tree->car); printf("op='%s' (%d)\n", mrb_sym2name(mrb, (mrb_sym)tree->car), (int)(intptr_t)tree->car);
tree = tree->cdr; tree = tree->cdr;
parser_dump(mrb, tree->car, offset+1); parser_dump(mrb, tree->car, offset+1);
break; break;
...@@ -5255,7 +5255,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5255,7 +5255,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
break; break;
case NODE_INT: case NODE_INT:
printf("NODE_INT %s base %d\n", (char*)tree->car, (int)tree->cdr->car); printf("NODE_INT %s base %d\n", (char*)tree->car, (int)(intptr_t)tree->cdr->car);
break; break;
case NODE_FLOAT: case NODE_FLOAT:
...@@ -5268,7 +5268,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5268,7 +5268,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
break; break;
case NODE_STR: case NODE_STR:
printf("NODE_STR \"%s\" len %d\n", (char*)tree->car, (int)tree->cdr); printf("NODE_STR \"%s\" len %d\n", (char*)tree->car, (int)(intptr_t)tree->cdr);
break; break;
case NODE_DSTR: case NODE_DSTR:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment