summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ruby.c8
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f05cfbd82a..b327b5660b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Oct 29 09:23:01 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ruby.c (load_file_internal): cache common interned IDs.
+
Wed Oct 29 00:43:39 2008 Tadayoshi Funaba <tadf@dotrb.org>
* complex.c: uses macro in declarations.
diff --git a/ruby.c b/ruby.c
index 6f4e7c8301..556944ff81 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1223,6 +1223,7 @@ load_file_internal(VALUE arg)
int line_start = 1;
NODE *tree = 0;
rb_encoding *enc;
+ ID set_encoding;
if (!fname)
rb_load_fail(fname);
@@ -1245,6 +1246,7 @@ load_file_internal(VALUE arg)
f = rb_io_fdopen(fd, mode, fname);
}
+ CONST_ID(set_encoding, "set_encoding");
if (script) {
VALUE c = 1; /* something not nil */
VALUE line;
@@ -1254,7 +1256,7 @@ load_file_internal(VALUE arg)
int no_int_enc = !opt->intern.enc.name;
enc = rb_usascii_encoding();
- rb_funcall(f, rb_intern("set_encoding"), 1, rb_enc_from_encoding(enc));
+ rb_funcall(f, set_encoding, 1, rb_enc_from_encoding(enc));
if (opt->xflag) {
forbid_setid("-x");
@@ -1356,9 +1358,9 @@ load_file_internal(VALUE arg)
else {
enc = rb_usascii_encoding();
}
- rb_funcall(f, rb_intern("set_encoding"), 1, rb_enc_from_encoding(enc));
+ rb_funcall(f, set_encoding, 1, rb_enc_from_encoding(enc));
tree = (NODE *)rb_parser_compile_file(parser, fname, f, line_start);
- rb_funcall(f, rb_intern("set_encoding"), 1, rb_parser_encoding(parser));
+ rb_funcall(f, set_encoding, 1, rb_parser_encoding(parser));
if (script && rb_parser_end_seen_p(parser)) {
rb_define_global_const("DATA", f);
}