Skip to content

M
mruby
Commit 6312a500 authored by Seeker's avatar Seeker
Browse files
Options

Fix operand types error

parent 6491d8dd
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
mrbgems/mruby-compiler/core/parse.y
View file @ 6312a500
...@@ -1358,10 +1358,10 @@ heredoc_end(parser_state *p) ...@@ -1358,10 +1358,10 @@ heredoc_end(parser_state *p)
node *list = info->doc; node *list = info->doc;
node *list2 = NULL; node *list2 = NULL;
while (list) { while (list) {
if (list->car->car == NODE_STR) { if (((enum node_type)(intptr_t)list->car->car) == NODE_STR) {
node *pair = list->car->cdr; node *pair = list->car->cdr;
const char *str = (char*) pair->car; const char *str = (char*)pair->car;
size_t len = (size_t) pair->cdr; size_t len = (size_t)pair->cdr;
if (counting) { if (counting) {
list2 = push(list2, pair); list2 = push(list2, pair);
} }
...@@ -1392,10 +1392,10 @@ heredoc_end(parser_state *p) ...@@ -1392,10 +1392,10 @@ heredoc_end(parser_state *p)
if (indent > 0) { if (indent > 0) {
while (list2) { while (list2) {
node *pair = list2->car; node *pair = list2->car;
const char *str = (char*) pair->car; const char *str = (char*)pair->car;
size_t len = (size_t) pair->cdr; size_t len = (size_t)pair->cdr;
pair->car = (node*) (str + indent); pair->car = (node*)(str + indent);
pair->cdr = (node*) (len - indent); pair->cdr = (node*)(len - indent);
list2 = list2->cdr; list2 = list2->cdr;
} }
} }
......
mrbgems/mruby-compiler/core/y.tab.c
View file @ 6312a500
...@@ -1422,10 +1422,10 @@ heredoc_end(parser_state *p) ...@@ -1422,10 +1422,10 @@ heredoc_end(parser_state *p)
node *list = info->doc; node *list = info->doc;
node *list2 = NULL; node *list2 = NULL;
while (list) { while (list) {
if (list->car->car == NODE_STR) { if (((enum node_type)(intptr_t)list->car->car) == NODE_STR) {
node *pair = list->car->cdr; node *pair = list->car->cdr;
const char *str = (char*) pair->car; const char *str = (char*)pair->car;
size_t len = (size_t) pair->cdr; size_t len = (size_t)pair->cdr;
if (counting) { if (counting) {
list2 = push(list2, pair); list2 = push(list2, pair);
} }
...@@ -1456,10 +1456,10 @@ heredoc_end(parser_state *p) ...@@ -1456,10 +1456,10 @@ heredoc_end(parser_state *p)
if (indent > 0) { if (indent > 0) {
while (list2) { while (list2) {
node *pair = list2->car; node *pair = list2->car;
const char *str = (char*) pair->car; const char *str = (char*)pair->car;
size_t len = (size_t) pair->cdr; size_t len = (size_t)pair->cdr;
pair->car = (node*) (str + indent); pair->car = (node*)(str + indent);
pair->cdr = (node*) (len - indent); pair->cdr = (node*)(len - indent);
list2 = list2->cdr; list2 = list2->cdr;
} }
} }
......
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