summaryrefslogtreecommitdiff
path: root/ruby.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-07-13 13:44:21 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-07-13 13:44:21 +0000
commit032248d337bd683d2b77d972097a2f31688874cb (patch)
tree6e899062b79f5fdf054f48c9ffc1caca1e8d221e /ruby.c
parent1ee65ab7bb4d6cb78bfd28d63858afb02a7a6434 (diff)
* parse.y: remove static variables. [ruby-dev:26530]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.c')
-rw-r--r--ruby.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ruby.c b/ruby.c
index 2bf8e75f4d..2058efb5db 100644
--- a/ruby.c
+++ b/ruby.c
@@ -388,7 +388,7 @@ require_libraries()
int state;
ruby_current_node = 0;
- rb_protect((VALUE (*)(VALUE))rb_require, (VALUE)list->name, &state);
+ rb_protect((VALUE (*)_((VALUE)))rb_require, (VALUE)list->name, &state);
if (state) rb_jump_tag(state);
tmp = list->next;
free(list->name);
@@ -864,14 +864,13 @@ proc_options(argc, argv)
}
}
-extern int ruby__end__seen;
-
static void
load_file(fname, script)
const char *fname;
int script;
{
extern VALUE rb_stdin;
+ VALUE parser;
VALUE f;
int line_start = 1;
@@ -984,8 +983,9 @@ load_file(fname, script)
require_libraries(); /* Why here? unnatural */
if (NIL_P(c)) return;
}
- ruby_eval_tree = rb_compile_file(fname, f, line_start);
- if (script && ruby__end__seen) {
+ parser = rb_parser_new();
+ ruby_eval_tree = rb_parser_compile_file(parser, fname, f, line_start);
+ if (script && rb_parser_end_seen_p(parser)) {
rb_define_global_const("DATA", f);
}
else if (f != rb_stdin) {