Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mruby
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
mruby
Commits
6cf42a82
Commit
6cf42a82
authored
Jan 31, 2014
by
Yukihiro "Matz" Matsumoto
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1671 from cremno/extern-cleanup
clean up external symbols
parents
4e2a9509
f2a62a74
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
85 additions
and
93 deletions
+85
-93
mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
+4
-4
src/class.c
src/class.c
+2
-2
src/codegen.c
src/codegen.c
+2
-2
src/error.c
src/error.c
+1
-8
src/error.h
src/error.h
+0
-2
src/kernel.c
src/kernel.c
+3
-3
src/parse.y
src/parse.y
+71
-70
src/range.c
src/range.c
+1
-1
src/string.c
src/string.c
+1
-1
No files found.
mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
View file @
6cf42a82
...
...
@@ -42,7 +42,7 @@ p(mrb_state *mrb, mrb_value obj, int prompt)
/* Guess if the user might want to enter more
* or if he wants an evaluation of his code now */
mrb_bool
static
mrb_bool
is_code_block_open
(
struct
mrb_parser_state
*
parser
)
{
int
code_block_open
=
FALSE
;
...
...
@@ -221,7 +221,7 @@ print_hint(void)
}
/* Print the command line prompt of the REPL */
void
static
void
print_cmdline
(
int
code_block_open
)
{
if
(
code_block_open
)
{
...
...
@@ -232,7 +232,7 @@ print_cmdline(int code_block_open)
}
}
void
codedump_all
(
mrb_state
*
,
struct
RProc
*
);
void
mrb_
codedump_all
(
mrb_state
*
,
struct
RProc
*
);
int
main
(
int
argc
,
char
**
argv
)
...
...
@@ -364,7 +364,7 @@ main(int argc, char **argv)
struct
RProc
*
proc
=
mrb_generate_code
(
mrb
,
parser
);
if
(
args
.
verbose
)
{
codedump_all
(
mrb
,
proc
);
mrb_
codedump_all
(
mrb
,
proc
);
}
/* pass a proc for evaulation */
nregs
=
first_command
?
0
:
proc
->
body
.
irep
->
nregs
;
...
...
src/class.c
View file @
6cf42a82
...
...
@@ -866,7 +866,7 @@ mrb_mod_included_modules(mrb_state *mrb, mrb_value self)
return
result
;
}
mrb_value
class_instance_method_list
(
mrb_state
*
,
mrb_bool
,
struct
RClass
*
,
int
);
mrb_value
mrb_
class_instance_method_list
(
mrb_state
*
,
mrb_bool
,
struct
RClass
*
,
int
);
/* 15.2.2.4.33 */
/*
...
...
@@ -902,7 +902,7 @@ mrb_mod_instance_methods(mrb_state *mrb, mrb_value mod)
struct
RClass
*
c
=
mrb_class_ptr
(
mod
);
mrb_bool
recur
=
TRUE
;
mrb_get_args
(
mrb
,
"|b"
,
&
recur
);
return
class_instance_method_list
(
mrb
,
recur
,
c
,
0
);
return
mrb_
class_instance_method_list
(
mrb
,
recur
,
c
,
0
);
}
mrb_value
mrb_yield_internal
(
mrb_state
*
mrb
,
mrb_value
b
,
int
argc
,
mrb_value
*
argv
,
mrb_value
self
,
struct
RClass
*
c
);
...
...
src/codegen.c
View file @
6cf42a82
...
...
@@ -26,7 +26,7 @@ enum looptype {
LOOP_FOR
,
LOOP_BEGIN
,
LOOP_RESCUE
,
}
type
;
};
struct
loopinfo
{
enum
looptype
type
;
...
...
@@ -2905,7 +2905,7 @@ codedump_recur(mrb_state *mrb, mrb_irep *irep)
}
void
codedump_all
(
mrb_state
*
mrb
,
struct
RProc
*
proc
)
mrb_
codedump_all
(
mrb_state
*
mrb
,
struct
RProc
*
proc
)
{
codedump_recur
(
mrb
,
proc
->
body
.
irep
);
}
...
...
src/error.c
View file @
6cf42a82
...
...
@@ -345,20 +345,13 @@ mrb_bug(mrb_state *mrb, const char *fmt, ...)
exit
(
EXIT_FAILURE
);
}
int
sysexit_status
(
mrb_state
*
mrb
,
mrb_value
err
)
{
mrb_value
st
=
mrb_iv_get
(
mrb
,
err
,
mrb_intern_lit
(
mrb
,
"status"
));
return
mrb_fixnum
(
st
);
}
static
void
set_backtrace
(
mrb_state
*
mrb
,
mrb_value
info
,
mrb_value
bt
)
{
mrb_funcall
(
mrb
,
info
,
"set_backtrace"
,
1
,
bt
);
}
mrb_value
static
mrb_value
make_exception
(
mrb_state
*
mrb
,
int
argc
,
mrb_value
*
argv
,
int
isstr
)
{
mrb_value
mesg
;
...
...
src/error.h
View file @
6cf42a82
...
...
@@ -8,9 +8,7 @@
#define MRUBY_ERROR_H
void
mrb_sys_fail
(
mrb_state
*
mrb
,
const
char
*
mesg
);
int
sysexit_status
(
mrb_state
*
mrb
,
mrb_value
err
);
mrb_value
mrb_exc_new_str
(
mrb_state
*
mrb
,
struct
RClass
*
c
,
mrb_value
str
);
mrb_value
make_exception
(
mrb_state
*
mrb
,
int
argc
,
mrb_value
*
argv
,
int
isstr
);
mrb_value
mrb_make_exception
(
mrb_state
*
mrb
,
int
argc
,
mrb_value
*
argv
);
mrb_value
mrb_format
(
mrb_state
*
mrb
,
const
char
*
format
,
...);
void
mrb_exc_print
(
mrb_state
*
mrb
,
struct
RObject
*
exc
);
...
...
src/kernel.c
View file @
6cf42a82
...
...
@@ -749,7 +749,7 @@ method_entry_loop(mrb_state *mrb, struct RClass* klass, khash_t(st)* set)
}
mrb_value
class_instance_method_list
(
mrb_state
*
mrb
,
mrb_bool
recur
,
struct
RClass
*
klass
,
int
obj
)
mrb_
class_instance_method_list
(
mrb_state
*
mrb
,
mrb_bool
recur
,
struct
RClass
*
klass
,
int
obj
)
{
khint_t
i
;
mrb_value
ary
;
...
...
@@ -816,7 +816,7 @@ mrb_value
mrb_obj_methods
(
mrb_state
*
mrb
,
mrb_bool
recur
,
mrb_value
obj
,
mrb_method_flag_t
flag
)
{
if
(
recur
)
return
class_instance_method_list
(
mrb
,
recur
,
mrb_class
(
mrb
,
obj
),
0
);
return
mrb_
class_instance_method_list
(
mrb
,
recur
,
mrb_class
(
mrb
,
obj
),
0
);
else
return
mrb_obj_singleton_methods
(
mrb
,
recur
,
obj
);
}
...
...
@@ -1019,7 +1019,7 @@ basic_obj_respond_to(mrb_state *mrb, mrb_value obj, mrb_sym id, int pub)
* If the method is not defined, <code>respond_to_missing?</code>
* method is called and the result is returned.
*/
mrb_value
static
mrb_value
obj_respond_to
(
mrb_state
*
mrb
,
mrb_value
self
)
{
mrb_value
*
argv
;
...
...
src/parse.y
View file @
6cf42a82
...
...
@@ -32,6 +32,7 @@ typedef mrb_ast_node node;
typedef struct mrb_parser_state parser_state;
typedef struct mrb_parser_heredoc_info parser_heredoc_info;
static int yyparse(parser_state *p);
static int yylex(void *lval, parser_state *p);
static void yyerror(parser_state *p, const char *s);
static void yywarn(parser_state *p, const char *s);
...
...
@@ -908,7 +909,7 @@ end_strterm(parser_state *p)
p->lex_strterm = NULL;
}
parser_heredoc_info *
static
parser_heredoc_info *
parsing_heredoc_inf(parser_state *p)
{
node *nd = p->parsing_heredoc;
...
...
@@ -5182,8 +5183,8 @@ parser_update_cxt(parser_state *p, mrbc_context *cxt)
}
}
void codedump_all(mrb_state*, struct RProc*);
void parser_dump(mrb_state *mrb, node *tree, int offset);
void
mrb_
codedump_all(mrb_state*, struct RProc*);
void
mrb_
parser_dump(mrb_state *mrb, node *tree, int offset);
void
mrb_parser_parse(parser_state *p, mrbc_context *c)
...
...
@@ -5207,7 +5208,7 @@ mrb_parser_parse(parser_state *p, mrbc_context *c)
}
parser_update_cxt(p, c);
if (c && c->dump_result) {
parser_dump(p->mrb, p->tree, 0);
mrb_
parser_dump(p->mrb, p->tree, 0);
}
}
...
...
@@ -5306,7 +5307,7 @@ mrb_parser_set_filename(struct mrb_parser_state *p, const char *f)
sym = mrb_intern_cstr(p->mrb, f);
p->filename = mrb_sym2name_len(p->mrb, sym, &len);
p->lineno = (p->filename_table_length > 0)? 0 : 1;
for(i = 0; i < p->filename_table_length; ++i) {
if(p->filename_table[i] == sym) {
p->current_filename_index = i;
...
...
@@ -5404,7 +5405,7 @@ load_exec(mrb_state *mrb, parser_state *p, mrbc_context *c)
return mrb_undef_value();
}
if (c) {
if (c->dump_result) codedump_all(mrb, proc);
if (c->dump_result)
mrb_
codedump_all(mrb, proc);
if (c->no_exec) return mrb_obj_value(proc);
if (c->target_class) {
target = c->target_class;
...
...
@@ -5472,7 +5473,7 @@ static void
dump_recur(mrb_state *mrb, node *tree, int offset)
{
while (tree) {
parser_dump(mrb, tree->car, offset);
mrb_
parser_dump(mrb, tree->car, offset);
tree = tree->cdr;
}
}
...
...
@@ -5480,7 +5481,7 @@ dump_recur(mrb_state *mrb, node *tree, int offset)
#endif
void
parser_dump(mrb_state *mrb, node *tree, int offset)
mrb_
parser_dump(mrb_state *mrb, node *tree, int offset)
{
#ifdef ENABLE_STDIO
int n;
...
...
@@ -5501,7 +5502,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
if (tree->car) {
dump_prefix(offset+1);
printf("body:\n");
parser_dump(mrb, tree->car, offset+2);
mrb_
parser_dump(mrb, tree->car, offset+2);
}
tree = tree->cdr;
if (tree->car) {
...
...
@@ -5519,12 +5520,12 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
if (n3->cdr->car) {
dump_prefix(offset+2);
printf("exc_var:\n");
parser_dump(mrb, n3->cdr->car, offset+3);
mrb_
parser_dump(mrb, n3->cdr->car, offset+3);
}
if (n3->cdr->cdr->car) {
dump_prefix(offset+2);
printf("rescue body:\n");
parser_dump(mrb, n3->cdr->cdr->car, offset+3);
mrb_
parser_dump(mrb, n3->cdr->cdr->car, offset+3);
}
n2 = n2->cdr;
}
...
...
@@ -5533,7 +5534,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
if (tree->car) {
dump_prefix(offset+1);
printf("else:\n");
parser_dump(mrb, tree->car, offset+2);
mrb_
parser_dump(mrb, tree->car, offset+2);
}
break;
...
...
@@ -5541,10 +5542,10 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
printf("NODE_ENSURE:\n");
dump_prefix(offset+1);
printf("body:\n");
parser_dump(mrb, tree->car, offset+2);
mrb_
parser_dump(mrb, tree->car, offset+2);
dump_prefix(offset+1);
printf("ensure:\n");
parser_dump(mrb, tree->cdr->cdr, offset+2);
mrb_
parser_dump(mrb, tree->cdr->cdr, offset+2);
break;
case NODE_LAMBDA:
...
...
@@ -5573,7 +5574,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
while (n2) {
dump_prefix(offset+2);
printf("%s=", mrb_sym2name(mrb, sym(n2->car->car)));
parser_dump(mrb, n2->car->cdr, 0);
mrb_
parser_dump(mrb, n2->car->cdr, 0);
n2 = n2->cdr;
}
}
...
...
@@ -5597,40 +5598,40 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
}
dump_prefix(offset+1);
printf("body:\n");
parser_dump(mrb, tree->cdr->car, offset+2);
mrb_
parser_dump(mrb, tree->cdr->car, offset+2);
break;
case NODE_IF:
printf("NODE_IF:\n");
dump_prefix(offset+1);
printf("cond:\n");
parser_dump(mrb, tree->car, offset+2);
mrb_
parser_dump(mrb, tree->car, offset+2);
dump_prefix(offset+1);
printf("then:\n");
parser_dump(mrb, tree->cdr->car, offset+2);
mrb_
parser_dump(mrb, tree->cdr->car, offset+2);
if (tree->cdr->cdr->car) {
dump_prefix(offset+1);
printf("else:\n");
parser_dump(mrb, tree->cdr->cdr->car, offset+2);
mrb_
parser_dump(mrb, tree->cdr->cdr->car, offset+2);
}
break;
case NODE_AND:
printf("NODE_AND:\n");
parser_dump(mrb, tree->car, offset+1);
parser_dump(mrb, tree->cdr, offset+1);
mrb_
parser_dump(mrb, tree->car, offset+1);
mrb_
parser_dump(mrb, tree->cdr, offset+1);
break;
case NODE_OR:
printf("NODE_OR:\n");
parser_dump(mrb, tree->car, offset+1);
parser_dump(mrb, tree->cdr, offset+1);
mrb_
parser_dump(mrb, tree->car, offset+1);
mrb_
parser_dump(mrb, tree->cdr, offset+1);
break;
case NODE_CASE:
printf("NODE_CASE:\n");
if (tree->car) {
parser_dump(mrb, tree->car, offset+1);
mrb_
parser_dump(mrb, tree->car, offset+1);
}
tree = tree->cdr;
while (tree) {
...
...
@@ -5639,7 +5640,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
dump_recur(mrb, tree->car->car, offset+2);
dump_prefix(offset+1);
printf("body:\n");
parser_dump(mrb, tree->car->cdr, offset+2);
mrb_
parser_dump(mrb, tree->car->cdr, offset+2);
tree = tree->cdr;
}
break;
...
...
@@ -5648,20 +5649,20 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
printf("NODE_WHILE:\n");
dump_prefix(offset+1);
printf("cond:\n");
parser_dump(mrb, tree->car, offset+2);
mrb_
parser_dump(mrb, tree->car, offset+2);
dump_prefix(offset+1);
printf("body:\n");
parser_dump(mrb, tree->cdr, offset+2);
mrb_
parser_dump(mrb, tree->cdr, offset+2);
break;
case NODE_UNTIL:
printf("NODE_UNTIL:\n");
dump_prefix(offset+1);
printf("cond:\n");
parser_dump(mrb, tree->car, offset+2);
mrb_
parser_dump(mrb, tree->car, offset+2);
dump_prefix(offset+1);
printf("body:\n");
parser_dump(mrb, tree->cdr, offset+2);
mrb_
parser_dump(mrb, tree->cdr, offset+2);
break;
case NODE_FOR:
...
...
@@ -5681,7 +5682,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
if (n2->car) {
dump_prefix(offset+2);
printf("rest:\n");
parser_dump(mrb, n2->car, offset+3);
mrb_
parser_dump(mrb, n2->car, offset+3);
}
n2 = n2->cdr;
if (n2) {
...
...
@@ -5696,11 +5697,11 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
tree = tree->cdr;
dump_prefix(offset+1);
printf("in:\n");
parser_dump(mrb, tree->car, offset+2);
mrb_
parser_dump(mrb, tree->car, offset+2);
tree = tree->cdr;
dump_prefix(offset+1);
printf("do:\n");
parser_dump(mrb, tree->car, offset+2);
mrb_
parser_dump(mrb, tree->car, offset+2);
break;
case NODE_SCOPE:
...
...
@@ -5729,7 +5730,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
case NODE_FCALL:
case NODE_CALL:
printf("NODE_CALL:\n");
parser_dump(mrb, tree->car, offset+1);
mrb_
parser_dump(mrb, tree->car, offset+1);
dump_prefix(offset+1);
printf("method='%s' (%d)\n",
mrb_sym2name(mrb, sym(tree->cdr->car)),
...
...
@@ -5742,26 +5743,26 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
if (tree->cdr) {
dump_prefix(offset+1);
printf("block:\n");
parser_dump(mrb, tree->cdr, offset+2);
mrb_
parser_dump(mrb, tree->cdr, offset+2);
}
}
break;
case NODE_DOT2:
printf("NODE_DOT2:\n");
parser_dump(mrb, tree->car, offset+1);
parser_dump(mrb, tree->cdr, offset+1);
mrb_
parser_dump(mrb, tree->car, offset+1);
mrb_
parser_dump(mrb, tree->cdr, offset+1);
break;
case NODE_DOT3:
printf("NODE_DOT3:\n");
parser_dump(mrb, tree->car, offset+1);
parser_dump(mrb, tree->cdr, offset+1);
mrb_
parser_dump(mrb, tree->car, offset+1);
mrb_
parser_dump(mrb, tree->cdr, offset+1);
break;
case NODE_COLON2:
printf("NODE_COLON2:\n");
parser_dump(mrb, tree->car, offset+1);
mrb_
parser_dump(mrb, tree->car, offset+1);
dump_prefix(offset+1);
printf("::%s\n", mrb_sym2name(mrb, sym(tree->cdr)));
break;
...
...
@@ -5782,27 +5783,27 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
while (tree) {
dump_prefix(offset+1);
printf("key:\n");
parser_dump(mrb, tree->car->car, offset+2);
mrb_
parser_dump(mrb, tree->car->car, offset+2);
dump_prefix(offset+1);
printf("value:\n");
parser_dump(mrb, tree->car->cdr, offset+2);
mrb_
parser_dump(mrb, tree->car->cdr, offset+2);
tree = tree->cdr;
}
break;
case NODE_SPLAT:
printf("NODE_SPLAT:\n");
parser_dump(mrb, tree, offset+1);
mrb_
parser_dump(mrb, tree, offset+1);
break;
case NODE_ASGN:
printf("NODE_ASGN:\n");
dump_prefix(offset+1);
printf("lhs:\n");
parser_dump(mrb, tree->car, offset+2);
mrb_
parser_dump(mrb, tree->car, offset+2);
dump_prefix(offset+1);
printf("rhs:\n");
parser_dump(mrb, tree->cdr, offset+2);
mrb_
parser_dump(mrb, tree->cdr, offset+2);
break;
case NODE_MASGN:
...
...
@@ -5827,7 +5828,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
printf("(empty)\n");
}
else {
parser_dump(mrb, n2->car, offset+3);
mrb_
parser_dump(mrb, n2->car, offset+3);
}
}
n2 = n2->cdr;
...
...
@@ -5842,19 +5843,19 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
}
dump_prefix(offset+1);
printf("rhs:\n");
parser_dump(mrb, tree->cdr, offset+2);
mrb_
parser_dump(mrb, tree->cdr, offset+2);
break;
case NODE_OP_ASGN:
printf("NODE_OP_ASGN:\n");
dump_prefix(offset+1);
printf("lhs:\n");
parser_dump(mrb, tree->car, offset+2);
mrb_
parser_dump(mrb, tree->car, offset+2);
tree = tree->cdr;
dump_prefix(offset+1);
printf("op='%s' (%d)\n", mrb_sym2name(mrb, sym(tree->car)), (int)(intptr_t)tree->car);
tree = tree->cdr;
parser_dump(mrb, tree->car, offset+1);
mrb_
parser_dump(mrb, tree->car, offset+1);
break;
case NODE_SUPER:
...
...
@@ -5866,7 +5867,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
if (tree->cdr) {
dump_prefix(offset+1);
printf("block:\n");
parser_dump(mrb, tree->cdr, offset+2);
mrb_
parser_dump(mrb, tree->cdr, offset+2);
}
}
break;
...
...
@@ -5877,7 +5878,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
case NODE_RETURN:
printf("NODE_RETURN:\n");
parser_dump(mrb, tree, offset+1);
mrb_
parser_dump(mrb, tree, offset+1);
break;
case NODE_YIELD:
...
...
@@ -5887,12 +5888,12 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
case NODE_BREAK:
printf("NODE_BREAK:\n");
parser_dump(mrb, tree, offset+1);
mrb_
parser_dump(mrb, tree, offset+1);
break;
case NODE_NEXT:
printf("NODE_NEXT:\n");
parser_dump(mrb, tree, offset+1);
mrb_
parser_dump(mrb, tree, offset+1);
break;
case NODE_REDO:
...
...
@@ -5927,10 +5928,10 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
printf("NODE_MATCH:\n");
dump_prefix(offset + 1);
printf("lhs:\n");
parser_dump(mrb, tree->car, offset + 2);
mrb_
parser_dump(mrb, tree->car, offset + 2);
dump_prefix(offset + 1);
printf("rhs:\n");
parser_dump(mrb, tree->cdr, offset + 2);
mrb_
parser_dump(mrb, tree->cdr, offset + 2);
break;
case NODE_BACK_REF:
...
...
@@ -5947,7 +5948,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
case NODE_BLOCK_ARG:
printf("NODE_BLOCK_ARG:\n");
parser_dump(mrb, tree, offset+1);
mrb_
parser_dump(mrb, tree, offset+1);
break;
case NODE_INT:
...
...
@@ -5960,7 +5961,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
case NODE_NEGATE:
printf("NODE_NEGATE\n");
parser_dump(mrb, tree, offset+1);
mrb_
parser_dump(mrb, tree, offset+1);
break;
case NODE_STR:
...
...
@@ -6043,18 +6044,18 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
printf("::%s\n", mrb_sym2name(mrb, sym(tree->car->cdr)));
}
else {
parser_dump(mrb, tree->car->car, offset+1);
mrb_
parser_dump(mrb, tree->car->car, offset+1);
dump_prefix(offset+1);
printf("::%s\n", mrb_sym2name(mrb, sym(tree->car->cdr)));
}
if (tree->cdr->car) {
dump_prefix(offset+1);
printf("super:\n");
parser_dump(mrb, tree->cdr->car, offset+2);
mrb_
parser_dump(mrb, tree->cdr->car, offset+2);
}
dump_prefix(offset+1);
printf("body:\n");
parser_dump(mrb, tree->cdr->cdr->car->cdr, offset+2);
mrb_
parser_dump(mrb, tree->cdr->cdr->car->cdr, offset+2);
break;
case NODE_MODULE:
...
...
@@ -6068,21 +6069,21 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
printf("::%s\n", mrb_sym2name(mrb, sym(tree->car->cdr)));
}
else {
parser_dump(mrb, tree->car->car, offset+1);
mrb_
parser_dump(mrb, tree->car->car, offset+1);
dump_prefix(offset+1);
printf("::%s\n", mrb_sym2name(mrb, sym(tree->car->cdr)));
}
dump_prefix(offset+1);
printf("body:\n");
parser_dump(mrb, tree->cdr->car->cdr, offset+2);
mrb_
parser_dump(mrb, tree->cdr->car->cdr, offset+2);
break;
case NODE_SCLASS:
printf("NODE_SCLASS:\n");
parser_dump(mrb, tree->car, offset+1);
mrb_
parser_dump(mrb, tree->car, offset+1);
dump_prefix(offset+1);
printf("body:\n");
parser_dump(mrb, tree->cdr->car->cdr, offset+2);
mrb_
parser_dump(mrb, tree->cdr->car->cdr, offset+2);
break;
case NODE_DEF:
...
...
@@ -6126,7 +6127,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
while (n2) {
dump_prefix(offset+2);
printf("%s=", mrb_sym2name(mrb, sym(n2->car->car)));
parser_dump(mrb, n2->car->cdr, 0);
mrb_
parser_dump(mrb, n2->car->cdr, 0);
n2 = n2->cdr;
}
}
...
...
@@ -6148,12 +6149,12 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
printf("blk=&%s\n", mrb_sym2name(mrb, sym(n)));
}
}
parser_dump(mrb, tree->cdr->car, offset+1);
mrb_
parser_dump(mrb, tree->cdr->car, offset+1);
break;
case NODE_SDEF:
printf("NODE_SDEF:\n");
parser_dump(mrb, tree->car, offset+1);
mrb_
parser_dump(mrb, tree->car, offset+1);
tree = tree->cdr;
dump_prefix(offset+1);
printf(":%s\n", mrb_sym2name(mrb, sym(tree->car)));
...
...
@@ -6176,7 +6177,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
while (n2) {
dump_prefix(offset+2);
printf("%s=", mrb_sym2name(mrb, sym(n2->car->car)));
parser_dump(mrb, n2->car->cdr, 0);
mrb_
parser_dump(mrb, n2->car->cdr, 0);
n2 = n2->cdr;
}
}
...
...
@@ -6199,17 +6200,17 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
}
}
tree = tree->cdr;
parser_dump(mrb, tree->car, offset+1);
mrb_
parser_dump(mrb, tree->car, offset+1);
break;
case NODE_POSTEXE:
printf("NODE_POSTEXE:\n");
parser_dump(mrb, tree, offset+1);
mrb_
parser_dump(mrb, tree, offset+1);
break;
case NODE_HEREDOC:
printf("NODE_HEREDOC:\n");
parser_dump(mrb, ((parser_heredoc_info*)tree)->doc, offset+1);
mrb_
parser_dump(mrb, ((parser_heredoc_info*)tree)->doc, offset+1);
break;
default:
...
...
src/range.c
View file @
6cf42a82
...
...
@@ -376,7 +376,7 @@ range_eql(mrb_state *mrb, mrb_value range)
}
/* 15.2.14.4.15(x) */
mrb_value
static
mrb_value
range_initialize_copy
(
mrb_state
*
mrb
,
mrb_value
copy
)
{
mrb_value
src
;
...
...
src/string.c
View file @
6cf42a82
...
...
@@ -132,7 +132,7 @@ str_new(mrb_state *mrb, const char *p, mrb_int len)
return
s
;
}
void
static
void
str_with_class
(
mrb_state
*
mrb
,
struct
RString
*
s
,
mrb_value
obj
)
{
s
->
c
=
mrb_str_ptr
(
obj
)
->
c
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment