e$B$J$+$@$G$9!#e(B
At Sat, 15 Sep 2007 14:27:14 +0900,
eklerni wrote in [ruby-dev:31787]:
1.9e$B$GJ8;zNs$Ne(Binspecte$B$,J8;z2=$1$7$?46$8$K$J$j$^$9!#!Je(BWindowse$B!Ke(B
$ruby -v -Ks -e “print ‘e$B$k$S$#e(B’ , ‘e$B$k$S$#e(B’.inspect”
ruby 1.9.0 (2007-09-14 patchlevel 0) [i386-mswin32_80]
e$B$k$S$#e(B"\202\351\202\321\202\241"
encoding pragmae$B$,$J$$$H%j%F%i%k$N%(%s%3!<%G%#%s%0$O$9$Y$Fe(B
US-ASCIIe$B$K$J$C$F$^$9$M!#e(B
Index: parse.y
— parse.y (revision 13443)
+++ parse.y (working copy)
@@ -8687,5 +8790,5 @@ parser_initialize(struct parser_params *
parser->heap = NULL;
#endif
- parser->enc = rb_enc_from_index(0);
- parser->enc = onigenc_get_default_encoding();
}
Index: ruby.c
— ruby.c (revision 13443)
+++ ruby.c (working copy)
@@ -65,5 +65,5 @@ char *getenv();
char *ruby_inplace_mode = 0;
-static NODE *load_file(VALUE, const char *, int);
+static NODE *load_file(VALUE *, const char *, int);
static void forbid_setid(const char *);
@@ -881,14 +881,14 @@ proc_options(int argc, char **argv)
ruby_init_loadpath();
- parser = rb_parser_new();
if (e_script) {
require_libraries();
- parser = rb_parser_new();
tree = rb_parser_compile_string(parser, script, e_script, 1);
}
else {
if (script[0] == ‘-’ && !script[1]) {
forbid_setid(“program input from stdin”);
}
- tree = load_file(parser, script, 1);
- tree = load_file(&parser, script, 1);
}
@@ -912,5 +912,5 @@ proc_options(int argc, char **argv)
static NODE *
-load_file(VALUE parser, const char *fname, int script)
+load_file(VALUE *parser, const char *fname, int script)
{
extern VALUE rb_stdin;
@@ -1028,6 +1028,7 @@ load_file(VALUE parser, const char fnam
require_libraries(); / Why here? unnatural */
}
- tree = (NODE *)rb_parser_compile_file(parser, fname, f,
line_start);
- if (script && rb_parser_end_seen_p(parser)) {
- *parser = rb_parser_new();
- tree = (NODE *)rb_parser_compile_file(*parser, fname, f,
line_start);
- if (script && rb_parser_end_seen_p(*parser)) {
rb_define_global_const(“DATA”, f);
}
@@ -1041,5 +1042,7 @@ void *
rb_load_file(const char *fname)
{
- return load_file(rb_parser_new(), fname, 0);
- VALUE parser;
-
- return load_file(&parser, fname, 0);
}