diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-04-28 16:06:14 -0700 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-04-28 16:06:14 -0700 |
| commit | 7a6f9c9f69d32bce6d8825c075d599c58cc510d3 (patch) | |
| tree | 66fd0c7821f5f8300883f228dffe8ff13f313e22 /src/parse.y | |
| parent | 443b2c2a2b86e368862407cb44804303ccf39c10 (diff) | |
| parent | 513bce35f686aae6e05b92ebbd44dffc8540ea75 (diff) | |
| download | mruby-7a6f9c9f69d32bce6d8825c075d599c58cc510d3.tar.gz mruby-7a6f9c9f69d32bce6d8825c075d599c58cc510d3.zip | |
Merge pull request #1220 from arton/master
add extern funcs declaration and casts for cimpiling C++ compiler
Diffstat (limited to 'src/parse.y')
| -rwxr-xr-x[-rw-r--r--] | src/parse.y | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/parse.y b/src/parse.y index 816b4cec9..5eaa61b2a 100644..100755 --- a/src/parse.y +++ b/src/parse.y @@ -763,7 +763,7 @@ new_nth_ref(parser_state *p, int n) static node* new_heredoc(parser_state *p) { - parser_heredoc_info *inf = parser_palloc(p, sizeof(parser_heredoc_info)); + parser_heredoc_info *inf = (parser_heredoc_info *)parser_palloc(p, sizeof(parser_heredoc_info)); return cons((node*)NODE_HEREDOC, (node*)inf); } @@ -3415,7 +3415,7 @@ scan_hex(const int *start, int len, int *retlen) char *tmp; /* assert(len <= 2) */ - while (len-- && *s && (tmp = strchr(hexdigit, *s))) { + while (len-- && *s && (tmp = (char*)strchr(hexdigit, *s))) { retval <<= 4; retval |= (tmp - hexdigit) & 15; s++; @@ -3773,7 +3773,7 @@ heredoc_identifier(parser_state *p) info->term_len = toklen(p); if (! quote) type |= STR_FUNC_EXPAND; - info->type = type; + info->type = (string_type)type; info->allow_indent = indent; info->line_head = TRUE; info->doc = NULL; |