summaryrefslogtreecommitdiffstats
path: root/ext/tk/tkutil.c
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-09-29 15:54:32 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-09-29 15:54:32 +0000
commitc73eb341d289621235f1d91b962d6f45692e1158 (patch)
tree03f94411c11d556ddf463d4b4cb27a16fcbba3a1 /ext/tk/tkutil.c
parent2589e9f012c08e9aec7202686c9e888099aa6ab5 (diff)
downloadruby-c73eb341d289621235f1d91b962d6f45692e1158.tar.gz
ruby-c73eb341d289621235f1d91b962d6f45692e1158.tar.xz
ruby-c73eb341d289621235f1d91b962d6f45692e1158.zip
* ext/tcltklib/tcltklib.c (ip_init): bug fix
* ext/tk/tkutil.c (get_eval_string_core): accept a Regexp object * ext/tk/lib/multi-tk.rb: fix bug on 'exit' operation * ext/tk/lib/tk/text.rb: 'tksearch' accepts a Regexp object as a matting pattern argument git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/tkutil.c')
-rw-r--r--ext/tk/tkutil.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/tk/tkutil.c b/ext/tk/tkutil.c
index c0dc48e59..56f018b85 100644
--- a/ext/tk/tkutil.c
+++ b/ext/tk/tkutil.c
@@ -31,6 +31,7 @@ static ID ID_path;
static ID ID_at_path;
static ID ID_to_eval;
static ID ID_to_s;
+static ID ID_source;
static ID ID_downcase;
static ID ID_install_cmd;
static ID ID_merge_tklist;
@@ -681,6 +682,9 @@ get_eval_string_core(obj, enc_flag, self)
case T_NIL:
return rb_str_new2("");
+ case T_REGEXP:
+ return rb_funcall(obj, ID_source, 0, 0);
+
default:
if (rb_obj_is_kind_of(obj, cTkObject)) {
/* return rb_str_new3(rb_funcall(obj, ID_path, 0, 0)); */
@@ -1252,6 +1256,7 @@ Init_tkutil()
ID_at_path = rb_intern("@path");
ID_to_eval = rb_intern("to_eval");
ID_to_s = rb_intern("to_s");
+ ID_source = rb_intern("source");
ID_downcase = rb_intern("downcase");
ID_install_cmd = rb_intern("install_cmd");
ID_merge_tklist = rb_intern("_merge_tklist");