summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSeeker <[email protected]>2020-12-27 00:20:02 -0800
committerSeeker <[email protected]>2020-12-27 00:20:02 -0800
commit6312a50045f95e4730e24506da34b49b67d52a86 (patch)
tree6e945747e8706bca4db04e6b4fe7c6740bd9e89d
parent6491d8dd28423141442ffefef5d368d947f9e8da (diff)
downloadmruby-6312a50045f95e4730e24506da34b49b67d52a86.tar.gz
mruby-6312a50045f95e4730e24506da34b49b67d52a86.zip
Fix operand types error
-rw-r--r--mrbgems/mruby-compiler/core/parse.y14
-rw-r--r--mrbgems/mruby-compiler/core/y.tab.c14
2 files changed, 14 insertions, 14 deletions
diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y
index 77279b8a8..9615ea7ca 100644
--- a/mrbgems/mruby-compiler/core/parse.y
+++ b/mrbgems/mruby-compiler/core/parse.y
@@ -1358,10 +1358,10 @@ heredoc_end(parser_state *p)
node *list = info->doc;
node *list2 = NULL;
while (list) {
- if (list->car->car == NODE_STR) {
+ if (((enum node_type)(intptr_t)list->car->car) == NODE_STR) {
node *pair = list->car->cdr;
- const char *str = (char*) pair->car;
- size_t len = (size_t) pair->cdr;
+ const char *str = (char*)pair->car;
+ size_t len = (size_t)pair->cdr;
if (counting) {
list2 = push(list2, pair);
}
@@ -1392,10 +1392,10 @@ heredoc_end(parser_state *p)
if (indent > 0) {
while (list2) {
node *pair = list2->car;
- const char *str = (char*) pair->car;
- size_t len = (size_t) pair->cdr;
- pair->car = (node*) (str + indent);
- pair->cdr = (node*) (len - indent);
+ const char *str = (char*)pair->car;
+ size_t len = (size_t)pair->cdr;
+ pair->car = (node*)(str + indent);
+ pair->cdr = (node*)(len - indent);
list2 = list2->cdr;
}
}
diff --git a/mrbgems/mruby-compiler/core/y.tab.c b/mrbgems/mruby-compiler/core/y.tab.c
index 8189d5de2..dafff6ed2 100644
--- a/mrbgems/mruby-compiler/core/y.tab.c
+++ b/mrbgems/mruby-compiler/core/y.tab.c
@@ -1422,10 +1422,10 @@ heredoc_end(parser_state *p)
node *list = info->doc;
node *list2 = NULL;
while (list) {
- if (list->car->car == NODE_STR) {
+ if (((enum node_type)(intptr_t)list->car->car) == NODE_STR) {
node *pair = list->car->cdr;
- const char *str = (char*) pair->car;
- size_t len = (size_t) pair->cdr;
+ const char *str = (char*)pair->car;
+ size_t len = (size_t)pair->cdr;
if (counting) {
list2 = push(list2, pair);
}
@@ -1456,10 +1456,10 @@ heredoc_end(parser_state *p)
if (indent > 0) {
while (list2) {
node *pair = list2->car;
- const char *str = (char*) pair->car;
- size_t len = (size_t) pair->cdr;
- pair->car = (node*) (str + indent);
- pair->cdr = (node*) (len - indent);
+ const char *str = (char*)pair->car;
+ size_t len = (size_t)pair->cdr;
+ pair->car = (node*)(str + indent);
+ pair->cdr = (node*)(len - indent);
list2 = list2->cdr;
}
}