diff options
| author | Yukihiro Matsumoto <[email protected]> | 2012-07-15 16:25:29 +0900 |
|---|---|---|
| committer | Yukihiro Matsumoto <[email protected]> | 2012-07-15 16:25:29 +0900 |
| commit | 68d3b7644c1922119f76882f240f3aef6f2ee587 (patch) | |
| tree | 320fd73f3edbaef531924684061969cebc85d7b5 | |
| parent | c8700c4a2178dc0ab1824e98746d12754611768c (diff) | |
| parent | 9df3552b8e894ce40025e3a130658306552c2937 (diff) | |
| download | mruby-68d3b7644c1922119f76882f240f3aef6f2ee587.tar.gz mruby-68d3b7644c1922119f76882f240f3aef6f2ee587.zip | |
Merge branch 'master' of github.com:mruby/mruby
| -rw-r--r-- | src/parse.y | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/parse.y b/src/parse.y index c766b3927..48823233f 100644 --- a/src/parse.y +++ b/src/parse.y @@ -688,7 +688,7 @@ new_float(parser_state *p, const char *s) static node* new_str(parser_state *p, const char *s, int len) { - return cons((node*)NODE_STR, cons((node*)strndup(s, len), (node*)len)); + return cons((node*)NODE_STR, cons((node*)strndup(s, len), (node*)(intptr_t)len)); } // (:dstr . a) @@ -4708,7 +4708,7 @@ parser_update_cxt(parser_state *p, mrbc_context *cxt) int i = 0; if (!cxt) return; - if ((int)p->tree->car != NODE_SCOPE) return; + if ((int)(intptr_t)p->tree->car != NODE_SCOPE) return; n0 = n = p->tree->cdr->car; while (n) { i++; |