Bug #5199 ยป bug-5199-tkutil.diff
| ext/tk/tkutil/tkutil.c | ||
|---|---|---|
|
}
|
||
|
}
|
||
|
rb_warning("fail to convert '%s' to string for Tk",
|
||
|
RSTRING_PTR(rb_funcall(obj, rb_intern("inspect"), 0, 0)));
|
||
|
rb_warning("fail to convert '%+"PRIsVALUE"' to string for Tk", obj);
|
||
|
return obj;
|
||
|
}
|
||
| ... | ... | |
|
switch(TYPE(key)) {
|
||
|
case T_STRING:
|
||
|
key_id = rb_intern(RSTRING_PTR(key));
|
||
|
key_id = rb_intern_str(key);
|
||
|
break;
|
||
|
case T_SYMBOL:
|
||
|
key_id = SYM2ID(key);
|
||
| ... | ... | |
|
switch(TYPE(value)) {
|
||
|
case T_STRING:
|
||
|
value_id = rb_intern(RSTRING_PTR(value));
|
||
|
value_id = rb_intern_str(value);
|
||
|
break;
|
||
|
case T_SYMBOL:
|
||
|
value_id = SYM2ID(value);
|
||
| ... | ... | |
|
VALUE sym;
|
||
|
{
|
||
|
struct cbsubst_info *inf;
|
||
|
const char *str;
|
||
|
VALUE str;
|
||
|
char *buf, *ptr;
|
||
|
int idx;
|
||
|
long len;
|
||
| ... | ... | |
|
struct cbsubst_info, inf);
|
||
|
if (!NIL_P(ret = rb_hash_aref(inf->aliases, sym))) {
|
||
|
str = rb_id2name(SYM2ID(ret));
|
||
|
str = rb_id2str(SYM2ID(ret));
|
||
|
} else {
|
||
|
str = rb_id2name(SYM2ID(sym));
|
||
|
str = rb_id2str(SYM2ID(sym));
|
||
|
}
|
||
|
id = rb_intern(RSTRING_PTR(rb_str_cat2(rb_str_new2("@"), str)));
|
||
|
id = rb_intern_str(rb_sprintf("@%"PRIsVALUE, str));
|
||
|
for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
|
||
|
if (inf->ivar[idx] == id) break;
|
||
| ... | ... | |
|
VALUE self;
|
||
|
{
|
||
|
struct cbsubst_info *inf;
|
||
|
const char *str;
|
||
|
VALUE str;
|
||
|
char *buf, *ptr;
|
||
|
int i, idx;
|
||
|
long len;
|
||
| ... | ... | |
|
for(i = 0; i < argc; i++) {
|
||
|
switch(TYPE(argv[i])) {
|
||
|
case T_STRING:
|
||
|
str = RSTRING_PTR(argv[i]);
|
||
|
arg_sym = ID2SYM(rb_intern(str));
|
||
|
str = argv[i];
|
||
|
arg_sym = ID2SYM(rb_intern_str(argv[i]));
|
||
|
break;
|
||
|
case T_SYMBOL:
|
||
|
arg_sym = argv[i];
|
||
|
str = rb_id2name(SYM2ID(arg_sym));
|
||
|
str = rb_id2str(SYM2ID(arg_sym));
|
||
|
break;
|
||
|
default:
|
||
|
rb_raise(rb_eArgError, "arg #%d is not a String or a Symbol", i);
|
||
|
}
|
||
|
if (!NIL_P(ret = rb_hash_aref(inf->aliases, arg_sym))) {
|
||
|
str = rb_id2name(SYM2ID(ret));
|
||
|
str = rb_id2str(SYM2ID(ret));
|
||
|
}
|
||
|
id = rb_intern(RSTRING_PTR(rb_str_cat2(rb_str_new2("@"), str)));
|
||
|
id = rb_intern_str(rb_sprintf("@%"PRIsVALUE, str));
|
||
|
for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
|
||
|
if (inf->ivar[idx] == id) break;
|
||
|
}
|
||
|
if (idx >= CBSUBST_TBL_MAX) {
|
||
|
rb_raise(rb_eArgError, "cannot find attribute :%s", str);
|
||
|
rb_raise(rb_eArgError, "cannot find attribute :%"PRIsVALUE, str);
|
||
|
}
|
||
|
*(ptr++) = '%';
|
||
| ... | ... | |
|
subst_inf->full_subst_length += 3;
|
||
|
id = SYM2ID(RARRAY_PTR(inf)[2]);
|
||
|
subst_inf->ivar[chr] = rb_intern(RSTRING_PTR(rb_str_cat2(rb_str_new2("@"), rb_id2name(id))));
|
||
|
subst_inf->ivar[chr] = rb_intern_str(rb_sprintf("@%"PRIsVALUE, rb_id2str(id)));
|
||
|
rb_attr(self, id, 1, 0, Qtrue);
|
||
|
}
|
||
| ... | ... | |
|
subst_inf->full_subst_length += (subst_inf->keylen[chr] + 2);
|
||
|
id = SYM2ID(RARRAY_PTR(inf)[2]);
|
||
|
subst_inf->ivar[chr] = rb_intern(RSTRING_PTR(rb_str_cat2(rb_str_new2("@"), rb_id2name(id))));
|
||
|
subst_inf->ivar[chr] = rb_intern_str(rb_sprintf("@%"PRIsVALUE, rb_id2str(id)));
|
||
|
rb_attr(self, id, 1, 0, Qtrue);
|
||
|
}
|
||