aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-09 03:25:38 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-09 03:25:38 +0000
commitb4ab650e1ab3b1961a8aea8bc510cc041045a7db (patch)
treed1b8eb4e5c67e3224f0946b88472efe0330ab62e
parent334294d0e2d42ba233672a66b8c670d6f933da2f (diff)
downloadruby-b4ab650e1ab3b1961a8aea8bc510cc041045a7db.tar.gz
variable.c: rb_class_path_cached
* variable.c (rb_class_path_cached): returns cached class path only, without searching and allocating new class path string. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44087 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/intern.h1
-rw-r--r--variable.c12
3 files changed, 18 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 14d48cafac..f9dc87de0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 9 12:25:32 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * variable.c (rb_class_path_cached): returns cached class path
+ only, without searching and allocating new class path string.
+
Mon Dec 9 11:14:26 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/date/date_parse.c (parse_time): unset case-insensitive flag
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index e6829c2be2..6200e77a63 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -888,6 +888,7 @@ struct timespec rb_time_timespec(VALUE time);
/* variable.c */
VALUE rb_mod_name(VALUE);
VALUE rb_class_path(VALUE);
+VALUE rb_class_path_cached(VALUE);
void rb_set_class_path(VALUE, VALUE, const char*);
void rb_set_class_path_string(VALUE, VALUE, VALUE);
VALUE rb_path_to_class(VALUE);
diff --git a/variable.c b/variable.c
index ded150e30c..5d200bb992 100644
--- a/variable.c
+++ b/variable.c
@@ -277,6 +277,18 @@ rb_class_path_no_cache(VALUE klass)
return path;
}
+VALUE
+rb_class_path_cached(VALUE klass)
+{
+ st_table *ivtbl = RCLASS_IV_TBL(klass);
+ st_data_t n;
+
+ if (!ivtbl) return Qnil;
+ if (st_lookup(ivtbl, (st_data_t)classpath, &n)) return (VALUE)n;
+ if (st_lookup(ivtbl, (st_data_t)tmp_classpath, &n)) return (VALUE)n;
+ return Qnil;
+}
+
void
rb_set_class_path_string(VALUE klass, VALUE under, VALUE name)
{