Skip to content

M
mruby
Commit f2a62a74 authored by cremno's avatar cremno
Browse files
Options

clean up external symbols 

remove unused and unneeded:
- sysexit_status
- type (a global variable)

add mrb_ prefix to:
- codedump_all
- class_instance_method_list
- parser_dump

make various functions static, incl.:
- yyparse
- make_exception
parent a68a5170
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 93 deletions
mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
View file @ f2a62a74
...@@ -42,7 +42,7 @@ p(mrb_state *mrb, mrb_value obj, int prompt) ...@@ -42,7 +42,7 @@ p(mrb_state *mrb, mrb_value obj, int prompt)
/* Guess if the user might want to enter more /* Guess if the user might want to enter more
* or if he wants an evaluation of his code now */ * or if he wants an evaluation of his code now */
mrb_bool static mrb_bool
is_code_block_open(struct mrb_parser_state *parser) is_code_block_open(struct mrb_parser_state *parser)
{ {
int code_block_open = FALSE; int code_block_open = FALSE;
...@@ -221,7 +221,7 @@ print_hint(void) ...@@ -221,7 +221,7 @@ print_hint(void)
} }
/* Print the command line prompt of the REPL */ /* Print the command line prompt of the REPL */
void static void
print_cmdline(int code_block_open) print_cmdline(int code_block_open)
{ {
if (code_block_open) { if (code_block_open) {
...@@ -232,7 +232,7 @@ print_cmdline(int 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 int
main(int argc, char **argv) main(int argc, char **argv)
...@@ -364,7 +364,7 @@ main(int argc, char **argv) ...@@ -364,7 +364,7 @@ main(int argc, char **argv)
struct RProc *proc = mrb_generate_code(mrb, parser); struct RProc *proc = mrb_generate_code(mrb, parser);
if (args.verbose) { if (args.verbose) {
codedump_all(mrb, proc); mrb_codedump_all(mrb, proc);
} }
/* pass a proc for evaulation */ /* pass a proc for evaulation */
nregs = first_command ? 0: proc->body.irep->nregs; nregs = first_command ? 0: proc->body.irep->nregs;
......
src/class.c
View file @ f2a62a74
...@@ -866,7 +866,7 @@ mrb_mod_included_modules(mrb_state *mrb, mrb_value self) ...@@ -866,7 +866,7 @@ mrb_mod_included_modules(mrb_state *mrb, mrb_value self)
return result; 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 */ /* 15.2.2.4.33 */
/* /*
...@@ -902,7 +902,7 @@ mrb_mod_instance_methods(mrb_state *mrb, mrb_value mod) ...@@ -902,7 +902,7 @@ mrb_mod_instance_methods(mrb_state *mrb, mrb_value mod)
struct RClass *c = mrb_class_ptr(mod); struct RClass *c = mrb_class_ptr(mod);
mrb_bool recur = TRUE; mrb_bool recur = TRUE;
mrb_get_args(mrb, "|b", &recur); 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); 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 @ f2a62a74
...@@ -26,7 +26,7 @@ enum looptype { ...@@ -26,7 +26,7 @@ enum looptype {
LOOP_FOR, LOOP_FOR,
LOOP_BEGIN, LOOP_BEGIN,
LOOP_RESCUE, LOOP_RESCUE,
} type; };
struct loopinfo { struct loopinfo {
enum looptype type; enum looptype type;
...@@ -2905,7 +2905,7 @@ codedump_recur(mrb_state *mrb, mrb_irep *irep) ...@@ -2905,7 +2905,7 @@ codedump_recur(mrb_state *mrb, mrb_irep *irep)
} }
void void
codedump_all(mrb_state *mrb, struct RProc *proc) mrb_codedump_all(mrb_state *mrb, struct RProc *proc)
{ {
codedump_recur(mrb, proc->body.irep); codedump_recur(mrb, proc->body.irep);
} }
......
src/error.c
View file @ f2a62a74
...@@ -345,20 +345,13 @@ mrb_bug(mrb_state *mrb, const char *fmt, ...) ...@@ -345,20 +345,13 @@ mrb_bug(mrb_state *mrb, const char *fmt, ...)
exit(EXIT_FAILURE); 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 static void
set_backtrace(mrb_state *mrb, mrb_value info, mrb_value bt) set_backtrace(mrb_state *mrb, mrb_value info, mrb_value bt)
{ {
mrb_funcall(mrb, info, "set_backtrace", 1, 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) make_exception(mrb_state *mrb, int argc, mrb_value *argv, int isstr)
{ {
mrb_value mesg; mrb_value mesg;
......
src/error.h
View file @ f2a62a74
...@@ -8,9 +8,7 @@ ...@@ -8,9 +8,7 @@
#define MRUBY_ERROR_H #define MRUBY_ERROR_H
void mrb_sys_fail(mrb_state *mrb, const char *mesg); 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 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_make_exception(mrb_state *mrb, int argc, mrb_value *argv);
mrb_value mrb_format(mrb_state *mrb, const char *format, ...); mrb_value mrb_format(mrb_state *mrb, const char *format, ...);
void mrb_exc_print(mrb_state *mrb, struct RObject *exc); void mrb_exc_print(mrb_state *mrb, struct RObject *exc);
......
src/kernel.c
View file @ f2a62a74
...@@ -749,7 +749,7 @@ method_entry_loop(mrb_state *mrb, struct RClass* klass, khash_t(st)* set) ...@@ -749,7 +749,7 @@ method_entry_loop(mrb_state *mrb, struct RClass* klass, khash_t(st)* set)
} }
mrb_value 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; khint_t i;
mrb_value ary; mrb_value ary;
...@@ -816,7 +816,7 @@ mrb_value ...@@ -816,7 +816,7 @@ mrb_value
mrb_obj_methods(mrb_state *mrb, mrb_bool recur, mrb_value obj, mrb_method_flag_t flag) mrb_obj_methods(mrb_state *mrb, mrb_bool recur, mrb_value obj, mrb_method_flag_t flag)
{ {
if (recur) 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 else
return mrb_obj_singleton_methods(mrb, recur, obj); 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) ...@@ -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> * If the method is not defined, <code>respond_to_missing?</code>
* method is called and the result is returned. * method is called and the result is returned.
*/ */
mrb_value static mrb_value
obj_respond_to(mrb_state *mrb, mrb_value self) obj_respond_to(mrb_state *mrb, mrb_value self)
{ {
mrb_value *argv; mrb_value *argv;
......
src/parse.y
View file @ f2a62a74
...@@ -32,6 +32,7 @@ typedef mrb_ast_node node; ...@@ -32,6 +32,7 @@ typedef mrb_ast_node node;
typedef struct mrb_parser_state parser_state; typedef struct mrb_parser_state parser_state;
typedef struct mrb_parser_heredoc_info parser_heredoc_info; typedef struct mrb_parser_heredoc_info parser_heredoc_info;
static int yyparse(parser_state *p);
static int yylex(void *lval, parser_state *p); static int yylex(void *lval, parser_state *p);
static void yyerror(parser_state *p, const char *s); static void yyerror(parser_state *p, const char *s);
static void yywarn(parser_state *p, const char *s); static void yywarn(parser_state *p, const char *s);
...@@ -908,7 +909,7 @@ end_strterm(parser_state *p) ...@@ -908,7 +909,7 @@ end_strterm(parser_state *p)
p->lex_strterm = NULL; p->lex_strterm = NULL;
} }
parser_heredoc_info * static parser_heredoc_info *
parsing_heredoc_inf(parser_state *p) parsing_heredoc_inf(parser_state *p)
{ {
node *nd = p->parsing_heredoc; node *nd = p->parsing_heredoc;
...@@ -5182,8 +5183,8 @@ parser_update_cxt(parser_state *p, mrbc_context *cxt) ...@@ -5182,8 +5183,8 @@ parser_update_cxt(parser_state *p, mrbc_context *cxt)
} }
} }
void codedump_all(mrb_state*, struct RProc*); void mrb_codedump_all(mrb_state*, struct RProc*);
void parser_dump(mrb_state *mrb, node *tree, int offset); void mrb_parser_dump(mrb_state *mrb, node *tree, int offset);
void void
mrb_parser_parse(parser_state *p, mrbc_context *c) mrb_parser_parse(parser_state *p, mrbc_context *c)
...@@ -5207,7 +5208,7 @@ 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); parser_update_cxt(p, c);
if (c && c->dump_result) { 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) ...@@ -5306,7 +5307,7 @@ mrb_parser_set_filename(struct mrb_parser_state *p, const char *f)
sym = mrb_intern_cstr(p->mrb, f); sym = mrb_intern_cstr(p->mrb, f);
p->filename = mrb_sym2name_len(p->mrb, sym, &len); p->filename = mrb_sym2name_len(p->mrb, sym, &len);
p->lineno = (p->filename_table_length > 0)? 0 : 1; p->lineno = (p->filename_table_length > 0)? 0 : 1;
for(i = 0; i < p->filename_table_length; ++i) { for(i = 0; i < p->filename_table_length; ++i) {
if(p->filename_table[i] == sym) { if(p->filename_table[i] == sym) {
p->current_filename_index = i; p->current_filename_index = i;
...@@ -5404,7 +5405,7 @@ load_exec(mrb_state *mrb, parser_state *p, mrbc_context *c) ...@@ -5404,7 +5405,7 @@ load_exec(mrb_state *mrb, parser_state *p, mrbc_context *c)
return mrb_undef_value(); return mrb_undef_value();
} }
if (c) { 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->no_exec) return mrb_obj_value(proc);
if (c->target_class) { if (c->target_class) {
target = c->target_class; target = c->target_class;
...@@ -5472,7 +5473,7 @@ static void ...@@ -5472,7 +5473,7 @@ static void
dump_recur(mrb_state *mrb, node *tree, int offset) dump_recur(mrb_state *mrb, node *tree, int offset)
{ {
while (tree) { while (tree) {
parser_dump(mrb, tree->car, offset); mrb_parser_dump(mrb, tree->car, offset);
tree = tree->cdr; tree = tree->cdr;
} }
} }
...@@ -5480,7 +5481,7 @@ dump_recur(mrb_state *mrb, node *tree, int offset) ...@@ -5480,7 +5481,7 @@ dump_recur(mrb_state *mrb, node *tree, int offset)
#endif #endif
void void
parser_dump(mrb_state *mrb, node *tree, int offset) mrb_parser_dump(mrb_state *mrb, node *tree, int offset)
{ {
#ifdef ENABLE_STDIO #ifdef ENABLE_STDIO
int n; int n;
...@@ -5501,7 +5502,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5501,7 +5502,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
if (tree->car) { if (tree->car) {
dump_prefix(offset+1); dump_prefix(offset+1);
printf("body:\n"); printf("body:\n");
parser_dump(mrb, tree->car, offset+2); mrb_parser_dump(mrb, tree->car, offset+2);
} }
tree = tree->cdr; tree = tree->cdr;
if (tree->car) { if (tree->car) {
...@@ -5519,12 +5520,12 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5519,12 +5520,12 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
if (n3->cdr->car) { if (n3->cdr->car) {
dump_prefix(offset+2); dump_prefix(offset+2);
printf("exc_var:\n"); 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) { if (n3->cdr->cdr->car) {
dump_prefix(offset+2); dump_prefix(offset+2);
printf("rescue body:\n"); 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; n2 = n2->cdr;
} }
...@@ -5533,7 +5534,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5533,7 +5534,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
if (tree->car) { if (tree->car) {
dump_prefix(offset+1); dump_prefix(offset+1);
printf("else:\n"); printf("else:\n");
parser_dump(mrb, tree->car, offset+2); mrb_parser_dump(mrb, tree->car, offset+2);
} }
break; break;
...@@ -5541,10 +5542,10 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5541,10 +5542,10 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
printf("NODE_ENSURE:\n"); printf("NODE_ENSURE:\n");
dump_prefix(offset+1); dump_prefix(offset+1);
printf("body:\n"); printf("body:\n");
parser_dump(mrb, tree->car, offset+2); mrb_parser_dump(mrb, tree->car, offset+2);
dump_prefix(offset+1); dump_prefix(offset+1);
printf("ensure:\n"); printf("ensure:\n");
parser_dump(mrb, tree->cdr->cdr, offset+2); mrb_parser_dump(mrb, tree->cdr->cdr, offset+2);
break; break;
case NODE_LAMBDA: case NODE_LAMBDA:
...@@ -5573,7 +5574,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5573,7 +5574,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
while (n2) { while (n2) {
dump_prefix(offset+2); dump_prefix(offset+2);
printf("%s=", mrb_sym2name(mrb, sym(n2->car->car))); 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; n2 = n2->cdr;
} }
} }
...@@ -5597,40 +5598,40 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5597,40 +5598,40 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
} }
dump_prefix(offset+1); dump_prefix(offset+1);
printf("body:\n"); printf("body:\n");
parser_dump(mrb, tree->cdr->car, offset+2); mrb_parser_dump(mrb, tree->cdr->car, offset+2);
break; break;
case NODE_IF: case NODE_IF:
printf("NODE_IF:\n"); printf("NODE_IF:\n");
dump_prefix(offset+1); dump_prefix(offset+1);
printf("cond:\n"); printf("cond:\n");
parser_dump(mrb, tree->car, offset+2); mrb_parser_dump(mrb, tree->car, offset+2);
dump_prefix(offset+1); dump_prefix(offset+1);
printf("then:\n"); 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) { if (tree->cdr->cdr->car) {
dump_prefix(offset+1); dump_prefix(offset+1);
printf("else:\n"); printf("else:\n");
parser_dump(mrb, tree->cdr->cdr->car, offset+2); mrb_parser_dump(mrb, tree->cdr->cdr->car, offset+2);
} }
break; break;
case NODE_AND: case NODE_AND:
printf("NODE_AND:\n"); printf("NODE_AND:\n");
parser_dump(mrb, tree->car, offset+1); mrb_parser_dump(mrb, tree->car, offset+1);
parser_dump(mrb, tree->cdr, offset+1); mrb_parser_dump(mrb, tree->cdr, offset+1);
break; break;
case NODE_OR: case NODE_OR:
printf("NODE_OR:\n"); printf("NODE_OR:\n");
parser_dump(mrb, tree->car, offset+1); mrb_parser_dump(mrb, tree->car, offset+1);
parser_dump(mrb, tree->cdr, offset+1); mrb_parser_dump(mrb, tree->cdr, offset+1);
break; break;
case NODE_CASE: case NODE_CASE:
printf("NODE_CASE:\n"); printf("NODE_CASE:\n");
if (tree->car) { if (tree->car) {
parser_dump(mrb, tree->car, offset+1); mrb_parser_dump(mrb, tree->car, offset+1);
} }
tree = tree->cdr; tree = tree->cdr;
while (tree) { while (tree) {
...@@ -5639,7 +5640,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5639,7 +5640,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
dump_recur(mrb, tree->car->car, offset+2); dump_recur(mrb, tree->car->car, offset+2);
dump_prefix(offset+1); dump_prefix(offset+1);
printf("body:\n"); printf("body:\n");
parser_dump(mrb, tree->car->cdr, offset+2); mrb_parser_dump(mrb, tree->car->cdr, offset+2);
tree = tree->cdr; tree = tree->cdr;
} }
break; break;
...@@ -5648,20 +5649,20 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5648,20 +5649,20 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
printf("NODE_WHILE:\n"); printf("NODE_WHILE:\n");
dump_prefix(offset+1); dump_prefix(offset+1);
printf("cond:\n"); printf("cond:\n");
parser_dump(mrb, tree->car, offset+2); mrb_parser_dump(mrb, tree->car, offset+2);
dump_prefix(offset+1); dump_prefix(offset+1);
printf("body:\n"); printf("body:\n");
parser_dump(mrb, tree->cdr, offset+2); mrb_parser_dump(mrb, tree->cdr, offset+2);
break; break;
case NODE_UNTIL: case NODE_UNTIL:
printf("NODE_UNTIL:\n"); printf("NODE_UNTIL:\n");
dump_prefix(offset+1); dump_prefix(offset+1);
printf("cond:\n"); printf("cond:\n");
parser_dump(mrb, tree->car, offset+2); mrb_parser_dump(mrb, tree->car, offset+2);
dump_prefix(offset+1); dump_prefix(offset+1);
printf("body:\n"); printf("body:\n");
parser_dump(mrb, tree->cdr, offset+2); mrb_parser_dump(mrb, tree->cdr, offset+2);
break; break;
case NODE_FOR: case NODE_FOR:
...@@ -5681,7 +5682,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5681,7 +5682,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
if (n2->car) { if (n2->car) {
dump_prefix(offset+2); dump_prefix(offset+2);
printf("rest:\n"); printf("rest:\n");
parser_dump(mrb, n2->car, offset+3); mrb_parser_dump(mrb, n2->car, offset+3);
} }
n2 = n2->cdr; n2 = n2->cdr;
if (n2) { if (n2) {
...@@ -5696,11 +5697,11 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5696,11 +5697,11 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
tree = tree->cdr; tree = tree->cdr;
dump_prefix(offset+1); dump_prefix(offset+1);
printf("in:\n"); printf("in:\n");
parser_dump(mrb, tree->car, offset+2); mrb_parser_dump(mrb, tree->car, offset+2);
tree = tree->cdr; tree = tree->cdr;
dump_prefix(offset+1); dump_prefix(offset+1);
printf("do:\n"); printf("do:\n");
parser_dump(mrb, tree->car, offset+2); mrb_parser_dump(mrb, tree->car, offset+2);
break; break;
case NODE_SCOPE: case NODE_SCOPE:
...@@ -5729,7 +5730,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5729,7 +5730,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
case NODE_FCALL: case NODE_FCALL:
case NODE_CALL: case NODE_CALL:
printf("NODE_CALL:\n"); printf("NODE_CALL:\n");
parser_dump(mrb, tree->car, offset+1); mrb_parser_dump(mrb, tree->car, offset+1);
dump_prefix(offset+1); dump_prefix(offset+1);
printf("method='%s' (%d)\n", printf("method='%s' (%d)\n",
mrb_sym2name(mrb, sym(tree->cdr->car)), mrb_sym2name(mrb, sym(tree->cdr->car)),
...@@ -5742,26 +5743,26 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5742,26 +5743,26 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
if (tree->cdr) { if (tree->cdr) {
dump_prefix(offset+1); dump_prefix(offset+1);
printf("block:\n"); printf("block:\n");
parser_dump(mrb, tree->cdr, offset+2); mrb_parser_dump(mrb, tree->cdr, offset+2);
} }
} }
break; break;
case NODE_DOT2: case NODE_DOT2:
printf("NODE_DOT2:\n"); printf("NODE_DOT2:\n");
parser_dump(mrb, tree->car, offset+1); mrb_parser_dump(mrb, tree->car, offset+1);
parser_dump(mrb, tree->cdr, offset+1); mrb_parser_dump(mrb, tree->cdr, offset+1);
break; break;
case NODE_DOT3: case NODE_DOT3:
printf("NODE_DOT3:\n"); printf("NODE_DOT3:\n");
parser_dump(mrb, tree->car, offset+1); mrb_parser_dump(mrb, tree->car, offset+1);
parser_dump(mrb, tree->cdr, offset+1); mrb_parser_dump(mrb, tree->cdr, offset+1);
break; break;
case NODE_COLON2: case NODE_COLON2:
printf("NODE_COLON2:\n"); printf("NODE_COLON2:\n");
parser_dump(mrb, tree->car, offset+1); mrb_parser_dump(mrb, tree->car, offset+1);
dump_prefix(offset+1); dump_prefix(offset+1);
printf("::%s\n", mrb_sym2name(mrb, sym(tree->cdr))); printf("::%s\n", mrb_sym2name(mrb, sym(tree->cdr)));
break; break;
...@@ -5782,27 +5783,27 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5782,27 +5783,27 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
while (tree) { while (tree) {
dump_prefix(offset+1); dump_prefix(offset+1);
printf("key:\n"); printf("key:\n");
parser_dump(mrb, tree->car->car, offset+2); mrb_parser_dump(mrb, tree->car->car, offset+2);
dump_prefix(offset+1); dump_prefix(offset+1);
printf("value:\n"); printf("value:\n");
parser_dump(mrb, tree->car->cdr, offset+2); mrb_parser_dump(mrb, tree->car->cdr, offset+2);
tree = tree->cdr; tree = tree->cdr;
} }
break; break;
case NODE_SPLAT: case NODE_SPLAT:
printf("NODE_SPLAT:\n"); printf("NODE_SPLAT:\n");
parser_dump(mrb, tree, offset+1); mrb_parser_dump(mrb, tree, offset+1);
break; break;
case NODE_ASGN: case NODE_ASGN:
printf("NODE_ASGN:\n"); printf("NODE_ASGN:\n");
dump_prefix(offset+1); dump_prefix(offset+1);
printf("lhs:\n"); printf("lhs:\n");
parser_dump(mrb, tree->car, offset+2); mrb_parser_dump(mrb, tree->car, offset+2);
dump_prefix(offset+1); dump_prefix(offset+1);
printf("rhs:\n"); printf("rhs:\n");
parser_dump(mrb, tree->cdr, offset+2); mrb_parser_dump(mrb, tree->cdr, offset+2);
break; break;
case NODE_MASGN: case NODE_MASGN:
...@@ -5827,7 +5828,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5827,7 +5828,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
printf("(empty)\n"); printf("(empty)\n");
} }
else { else {
parser_dump(mrb, n2->car, offset+3); mrb_parser_dump(mrb, n2->car, offset+3);
} }
} }
n2 = n2->cdr; n2 = n2->cdr;
...@@ -5842,19 +5843,19 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5842,19 +5843,19 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
} }
dump_prefix(offset+1); dump_prefix(offset+1);
printf("rhs:\n"); printf("rhs:\n");
parser_dump(mrb, tree->cdr, offset+2); mrb_parser_dump(mrb, tree->cdr, offset+2);
break; break;
case NODE_OP_ASGN: case NODE_OP_ASGN:
printf("NODE_OP_ASGN:\n"); printf("NODE_OP_ASGN:\n");
dump_prefix(offset+1); dump_prefix(offset+1);
printf("lhs:\n"); printf("lhs:\n");
parser_dump(mrb, tree->car, offset+2); mrb_parser_dump(mrb, tree->car, offset+2);
tree = tree->cdr; tree = tree->cdr;
dump_prefix(offset+1); dump_prefix(offset+1);
printf("op='%s' (%d)\n", mrb_sym2name(mrb, sym(tree->car)), (int)(intptr_t)tree->car); printf("op='%s' (%d)\n", mrb_sym2name(mrb, sym(tree->car)), (int)(intptr_t)tree->car);
tree = tree->cdr; tree = tree->cdr;
parser_dump(mrb, tree->car, offset+1); mrb_parser_dump(mrb, tree->car, offset+1);
break; break;
case NODE_SUPER: case NODE_SUPER:
...@@ -5866,7 +5867,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5866,7 +5867,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
if (tree->cdr) { if (tree->cdr) {
dump_prefix(offset+1); dump_prefix(offset+1);
printf("block:\n"); printf("block:\n");
parser_dump(mrb, tree->cdr, offset+2); mrb_parser_dump(mrb, tree->cdr, offset+2);
} }
} }
break; break;
...@@ -5877,7 +5878,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5877,7 +5878,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
case NODE_RETURN: case NODE_RETURN:
printf("NODE_RETURN:\n"); printf("NODE_RETURN:\n");
parser_dump(mrb, tree, offset+1); mrb_parser_dump(mrb, tree, offset+1);
break; break;
case NODE_YIELD: case NODE_YIELD:
...@@ -5887,12 +5888,12 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5887,12 +5888,12 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
case NODE_BREAK: case NODE_BREAK:
printf("NODE_BREAK:\n"); printf("NODE_BREAK:\n");
parser_dump(mrb, tree, offset+1); mrb_parser_dump(mrb, tree, offset+1);
break; break;
case NODE_NEXT: case NODE_NEXT:
printf("NODE_NEXT:\n"); printf("NODE_NEXT:\n");
parser_dump(mrb, tree, offset+1); mrb_parser_dump(mrb, tree, offset+1);
break; break;
case NODE_REDO: case NODE_REDO:
...@@ -5927,10 +5928,10 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5927,10 +5928,10 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
printf("NODE_MATCH:\n"); printf("NODE_MATCH:\n");
dump_prefix(offset + 1); dump_prefix(offset + 1);
printf("lhs:\n"); printf("lhs:\n");
parser_dump(mrb, tree->car, offset + 2); mrb_parser_dump(mrb, tree->car, offset + 2);
dump_prefix(offset + 1); dump_prefix(offset + 1);
printf("rhs:\n"); printf("rhs:\n");
parser_dump(mrb, tree->cdr, offset + 2); mrb_parser_dump(mrb, tree->cdr, offset + 2);
break; break;
case NODE_BACK_REF: case NODE_BACK_REF:
...@@ -5947,7 +5948,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5947,7 +5948,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
case NODE_BLOCK_ARG: case NODE_BLOCK_ARG:
printf("NODE_BLOCK_ARG:\n"); printf("NODE_BLOCK_ARG:\n");
parser_dump(mrb, tree, offset+1); mrb_parser_dump(mrb, tree, offset+1);
break; break;
case NODE_INT: case NODE_INT:
...@@ -5960,7 +5961,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -5960,7 +5961,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
case NODE_NEGATE: case NODE_NEGATE:
printf("NODE_NEGATE\n"); printf("NODE_NEGATE\n");
parser_dump(mrb, tree, offset+1); mrb_parser_dump(mrb, tree, offset+1);
break; break;
case NODE_STR: case NODE_STR:
...@@ -6043,18 +6044,18 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -6043,18 +6044,18 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
printf("::%s\n", mrb_sym2name(mrb, sym(tree->car->cdr))); printf("::%s\n", mrb_sym2name(mrb, sym(tree->car->cdr)));
} }
else { else {
parser_dump(mrb, tree->car->car, offset+1); mrb_parser_dump(mrb, tree->car->car, offset+1);
dump_prefix(offset+1); dump_prefix(offset+1);
printf("::%s\n", mrb_sym2name(mrb, sym(tree->car->cdr))); printf("::%s\n", mrb_sym2name(mrb, sym(tree->car->cdr)));
} }
if (tree->cdr->car) { if (tree->cdr->car) {
dump_prefix(offset+1); dump_prefix(offset+1);
printf("super:\n"); printf("super:\n");
parser_dump(mrb, tree->cdr->car, offset+2); mrb_parser_dump(mrb, tree->cdr->car, offset+2);
} }
dump_prefix(offset+1); dump_prefix(offset+1);
printf("body:\n"); 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; break;
case NODE_MODULE: case NODE_MODULE:
...@@ -6068,21 +6069,21 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -6068,21 +6069,21 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
printf("::%s\n", mrb_sym2name(mrb, sym(tree->car->cdr))); printf("::%s\n", mrb_sym2name(mrb, sym(tree->car->cdr)));
} }
else { else {
parser_dump(mrb, tree->car->car, offset+1); mrb_parser_dump(mrb, tree->car->car, offset+1);
dump_prefix(offset+1); dump_prefix(offset+1);
printf("::%s\n", mrb_sym2name(mrb, sym(tree->car->cdr))); printf("::%s\n", mrb_sym2name(mrb, sym(tree->car->cdr)));
} }
dump_prefix(offset+1); dump_prefix(offset+1);
printf("body:\n"); printf("body:\n");
parser_dump(mrb, tree->cdr->car->cdr, offset+2); mrb_parser_dump(mrb, tree->cdr->car->cdr, offset+2);
break; break;
case NODE_SCLASS: case NODE_SCLASS:
printf("NODE_SCLASS:\n"); printf("NODE_SCLASS:\n");
parser_dump(mrb, tree->car, offset+1); mrb_parser_dump(mrb, tree->car, offset+1);
dump_prefix(offset+1); dump_prefix(offset+1);
printf("body:\n"); printf("body:\n");
parser_dump(mrb, tree->cdr->car->cdr, offset+2); mrb_parser_dump(mrb, tree->cdr->car->cdr, offset+2);
break; break;
case NODE_DEF: case NODE_DEF:
...@@ -6126,7 +6127,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -6126,7 +6127,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
while (n2) { while (n2) {
dump_prefix(offset+2); dump_prefix(offset+2);
printf("%s=", mrb_sym2name(mrb, sym(n2->car->car))); 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; n2 = n2->cdr;
} }
} }
...@@ -6148,12 +6149,12 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -6148,12 +6149,12 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
printf("blk=&%s\n", mrb_sym2name(mrb, sym(n))); 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; break;
case NODE_SDEF: case NODE_SDEF:
printf("NODE_SDEF:\n"); printf("NODE_SDEF:\n");
parser_dump(mrb, tree->car, offset+1); mrb_parser_dump(mrb, tree->car, offset+1);
tree = tree->cdr; tree = tree->cdr;
dump_prefix(offset+1); dump_prefix(offset+1);
printf(":%s\n", mrb_sym2name(mrb, sym(tree->car))); printf(":%s\n", mrb_sym2name(mrb, sym(tree->car)));
...@@ -6176,7 +6177,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -6176,7 +6177,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
while (n2) { while (n2) {
dump_prefix(offset+2); dump_prefix(offset+2);
printf("%s=", mrb_sym2name(mrb, sym(n2->car->car))); 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; n2 = n2->cdr;
} }
} }
...@@ -6199,17 +6200,17 @@ parser_dump(mrb_state *mrb, node *tree, int offset) ...@@ -6199,17 +6200,17 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
} }
} }
tree = tree->cdr; tree = tree->cdr;
parser_dump(mrb, tree->car, offset+1); mrb_parser_dump(mrb, tree->car, offset+1);
break; break;
case NODE_POSTEXE: case NODE_POSTEXE:
printf("NODE_POSTEXE:\n"); printf("NODE_POSTEXE:\n");
parser_dump(mrb, tree, offset+1); mrb_parser_dump(mrb, tree, offset+1);
break; break;
case NODE_HEREDOC: case NODE_HEREDOC:
printf("NODE_HEREDOC:\n"); 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; break;
default: default:
......
src/range.c
View file @ f2a62a74
...@@ -376,7 +376,7 @@ range_eql(mrb_state *mrb, mrb_value range) ...@@ -376,7 +376,7 @@ range_eql(mrb_state *mrb, mrb_value range)
} }
/* 15.2.14.4.15(x) */ /* 15.2.14.4.15(x) */
mrb_value static mrb_value
range_initialize_copy(mrb_state *mrb, mrb_value copy) range_initialize_copy(mrb_state *mrb, mrb_value copy)
{ {
mrb_value src; mrb_value src;
......
src/string.c
View file @ f2a62a74
...@@ -132,7 +132,7 @@ str_new(mrb_state *mrb, const char *p, mrb_int len) ...@@ -132,7 +132,7 @@ str_new(mrb_state *mrb, const char *p, mrb_int len)
return s; return s;
} }
void static void
str_with_class(mrb_state *mrb, struct RString *s, mrb_value obj) str_with_class(mrb_state *mrb, struct RString *s, mrb_value obj)
{ {
s->c = mrb_str_ptr(obj)->c; s->c = mrb_str_ptr(obj)->c;
......
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