diff options
| author | mimaki <[email protected]> | 2012-04-20 16:57:43 +0900 |
|---|---|---|
| committer | mimaki <[email protected]> | 2012-04-20 16:57:43 +0900 |
| commit | 4be3ca52090c6e3fde54c9678079eb1c02fc6862 (patch) | |
| tree | 02d2b13e8496df1f227ca2c4855f121d12d0fc20 /src | |
| parent | d67cd99b47a57dc3bf28af0b3bdc42d2eb887f03 (diff) | |
| parent | dc2c98ab4c01135bee7349bd364535f6d3d211e6 (diff) | |
| download | mruby-4be3ca52090c6e3fde54c9678079eb1c02fc6862.tar.gz mruby-4be3ca52090c6e3fde54c9678079eb1c02fc6862.zip | |
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'src')
| -rw-r--r-- | src/parse.y | 1 | ||||
| -rw-r--r-- | src/pool.c | 2 | ||||
| -rw-r--r-- | src/transcode.c | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/parse.y b/src/parse.y index 5925b9a5e..b22dd10f6 100644 --- a/src/parse.y +++ b/src/parse.y @@ -4228,6 +4228,7 @@ parser_yylex(parser_state *p) else if (term == '[') term = ']'; else if (term == '{') term = '}'; else if (term == '<') term = '>'; + p->sterm = term; #if 0 else paren = 0; #endif diff --git a/src/pool.c b/src/pool.c index 62e1a4d17..1a2bec642 100644 --- a/src/pool.c +++ b/src/pool.c @@ -68,7 +68,7 @@ mrb_pool_alloc(mrb_pool *pool, size_t len) if (page->offset + len <= page->len) { n = page->offset; page->offset += len; - page->last = (void*)page->page+n; + page->last = (char*)page->page+n; return page->last; } page = page->next; diff --git a/src/transcode.c b/src/transcode.c index cb2f86731..05d2b05b1 100644 --- a/src/transcode.c +++ b/src/transcode.c @@ -632,14 +632,14 @@ transcode_restartable0(mrb_state *mrb, } continue; case FUNii: - next_info = (mrb_value)(*tr->func_ii)(TRANSCODING_STATE(tc), next_info); + next_info = (*tr->func_ii)(TRANSCODING_STATE(tc), next_info); goto follow_info; case FUNsi: { const unsigned char *char_start; size_t char_len; char_start = transcode_char_start(tc, *in_pos, inchar_start, in_p, &char_len); - next_info = (mrb_value)(*tr->func_si)(TRANSCODING_STATE(tc), char_start, (size_t)char_len); + next_info = (*tr->func_si)(TRANSCODING_STATE(tc), char_start, (size_t)char_len); goto follow_info; } case FUNio: |