1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/tk/tcltklib.c: refactoring - extract ruby string <->

Browse Source 
tcl object conversion as get_str_from_obj and get_obj_from_str.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ocean 2005-08-04 15:26:05 +00:00
parent 7c2dad9c1f
commit 6c8633ab99
2 changed files with 82 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Aug 5 00:25:12 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/tk/tcltklib.c: refactoring - extract ruby string <->
tcl object conversion as get_str_from_obj and get_obj_from_str.
Fri Aug 5 00:19:33 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Aug 5 00:19:33 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* enumerator.c (Init_Enumerator): provided features should have * enumerator.c (Init_Enumerator): provided features should have

288
ext/tk/tcltklib.c
View File

@ -5613,64 +5613,76 @@ ip_has_mainwindow_p(self)
} }
} }
/*** ruby string <=> tcl object ***/
#if TCL_MAJOR_VERSION >= 8
static VALUE
get_str_from_obj(obj)
Tcl_Obj *obj;
{
int len, binary = 0;
const char *s;
volatile VALUE str;
#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0
s = Tcl_GetStringFromObj(obj, &len);
#else /* TCL_VERSION >= 8.1 */
if (Tcl_GetCharLength(obj) != Tcl_UniCharLen(Tcl_GetUnicode(obj))) {
/* possibly binary string */
s = Tcl_GetByteArrayFromObj(obj, &len);
binary = 1;
} else {
/* possibly text string */
s = Tcl_GetStringFromObj(obj, &len);
}
#endif
str = s ? rb_str_new(s, len) : rb_str_new2("");
if (binary) rb_ivar_set(str, ID_at_enc, rb_str_new2("binary"));
return str;
}
static Tcl_Obj *
get_obj_from_str(str)
VALUE str;
{
const char *s = StringValuePtr(str);
#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0
return Tcl_NewStringObj(s, RSTRING(str)->len);
#else /* TCL_VERSION >= 8.1 */
VALUE enc = rb_attr_get(str, ID_at_enc);
if (!NIL_P(enc) && strcmp(StringValuePtr(enc), "binary") == 0) {
/* binary string */
return Tcl_NewByteArrayObj(s, RSTRING(str)->len);
} else if (strlen(s) != RSTRING(str)->len) {
/* probably binary string */
return Tcl_NewByteArrayObj(s, RSTRING(str)->len);
} else {
/* probably text string */
return Tcl_NewStringObj(s, RSTRING(str)->len);
}
#endif
}
#endif /* ruby string <=> tcl object */
static VALUE static VALUE
ip_get_result_string_obj(interp) ip_get_result_string_obj(interp)
Tcl_Interp *interp; Tcl_Interp *interp;
{ {
#if TCL_MAJOR_VERSION >= 8 #if TCL_MAJOR_VERSION >= 8
int len; Tcl_Obj *retObj;
char *s;
# if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0
s = Tcl_GetStringFromObj(Tcl_GetObjResult(interp), &len);
if (s == (char*)NULL) {
return rb_tainted_str_new2("");
} else {
return(rb_tainted_str_new(s, len));
}
# else /* TCL_VERSION >= 8.1 */
volatile VALUE strval; volatile VALUE strval;
Tcl_Obj *retobj = Tcl_GetObjResult(interp);
int thr_crit_bup;
Tcl_IncrRefCount(retobj); retObj = Tcl_GetObjResult(interp);
Tcl_IncrRefCount(retObj);
thr_crit_bup = rb_thread_critical; strval = get_str_from_obj(retObj);
rb_thread_critical = Qtrue; OBJ_TAINT(strval);
Tcl_DecrRefCount(retObj);
if (Tcl_GetCharLength(retobj) != Tcl_UniCharLen(Tcl_GetUnicode(retobj))) { return strval;
/* possibly binary string */ #else
s = Tcl_GetByteArrayFromObj(retobj, &len); return rb_tainted_str_new2(interp->result);
if (s == (char*)NULL) {
strval = rb_tainted_str_new2("");
} else {
strval = rb_tainted_str_new(s, len);
}
rb_ivar_set(strval, ID_at_enc, rb_str_new2("binary"));
} else {
/* possibly text string */
s = Tcl_GetStringFromObj(retobj, &len);
if (s == (char*)NULL) {
strval = rb_tainted_str_new2("");
} else {
strval = rb_tainted_str_new(s, len);
}
}
rb_thread_critical = thr_crit_bup;
Tcl_DecrRefCount(retobj);
return(strval);
# endif
#else /* TCL_MAJOR_VERSION < 8 */
return(rb_tainted_str_new2(interp->result));
#endif #endif
} }
/* call Tcl/Tk functions on the eventloop thread */ /* call Tcl/Tk functions on the eventloop thread */
static VALUE static VALUE
callq_safelevel_handler(arg, callq) callq_safelevel_handler(arg, callq)
@ -6971,15 +6983,12 @@ alloc_invoke_arguments(argc, argv)
VALUE *argv; VALUE *argv;
{ {
int i; int i;
VALUE v;
char *s;
int thr_crit_bup; int thr_crit_bup;
#if TCL_MAJOR_VERSION >= 8 #if TCL_MAJOR_VERSION >= 8
Tcl_Obj **av = (Tcl_Obj **)NULL; Tcl_Obj **av;
Tcl_Obj *resultPtr;
#else /* TCL_MAJOR_VERSION < 8 */ #else /* TCL_MAJOR_VERSION < 8 */
char **av = (char **)NULL; char **av;
#endif #endif
thr_crit_bup = rb_thread_critical; thr_crit_bup = rb_thread_critical;
@ -6987,42 +6996,20 @@ alloc_invoke_arguments(argc, argv)
/* memory allocation */ /* memory allocation */
#if TCL_MAJOR_VERSION >= 8 #if TCL_MAJOR_VERSION >= 8
av = (Tcl_Obj **)ALLOC_N(Tcl_Obj *, argc+1); av = ALLOC_N(Tcl_Obj *, argc+1);
for (i = 0; i < argc; ++i) { for (i = 0; i < argc; ++i) {
VALUE enc; av[i] = get_obj_from_str(argv[i]);
v = argv[i];
s = StringValuePtr(v);
# if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0
av[i] = Tcl_NewStringObj(s, RSTRING(v)->len);
# else /* TCL_VERSION >= 8.1 */
enc = rb_attr_get(v, ID_at_enc);
if (!NIL_P(enc) && strcmp(StringValuePtr(enc), "binary") == 0) {
/* binary string */
av[i] = Tcl_NewByteArrayObj(s, RSTRING(v)->len);
} else if (strlen(s) != RSTRING(v)->len) {
/* probably binary string */
av[i] = Tcl_NewByteArrayObj(s, RSTRING(v)->len);
} else {
/* probably text string */
av[i] = Tcl_NewStringObj(s, RSTRING(v)->len);
}
# endif
Tcl_IncrRefCount(av[i]); Tcl_IncrRefCount(av[i]);
} }
av[argc] = (Tcl_Obj *)NULL; av[argc] = NULL;
#else /* TCL_MAJOR_VERSION < 8 */ #else /* TCL_MAJOR_VERSION < 8 */
/* string interface */ /* string interface */
av = (char **)ALLOC_N(char *, argc+1); av = ALLOC_N(char *, argc+1);
for (i = 0; i < argc; ++i) { for (i = 0; i < argc; ++i) {
v = argv[i]; av[i] = strdup(StringValuePtr(argv[i]));
s = StringValuePtr(v);
av[i] = ALLOC_N(char, strlen(s)+1);
strcpy(av[i], s);
} }
av[argc] = (char *)NULL; av[argc] = NULL;
#endif #endif
rb_thread_critical = thr_crit_bup; rb_thread_critical = thr_crit_bup;
@ -7325,8 +7312,6 @@ ip_get_variable2_core(interp, argc, argv)
#if TCL_MAJOR_VERSION >= 8 #if TCL_MAJOR_VERSION >= 8
{ {
Tcl_Obj *ret; Tcl_Obj *ret;
char *s;
int len;
volatile VALUE strval; volatile VALUE strval;
thr_crit_bup = rb_thread_critical; thr_crit_bup = rb_thread_critical;
@ -7354,36 +7339,14 @@ ip_get_variable2_core(interp, argc, argv)
} }
Tcl_IncrRefCount(ret); Tcl_IncrRefCount(ret);
strval = get_str_from_obj(ret);
# if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0 OBJ_TAINT(strval);
s = Tcl_GetStringFromObj(ret, &len);
strval = rb_tainted_str_new(s, len);
Tcl_DecrRefCount(ret); Tcl_DecrRefCount(ret);
/* Tcl_Release(ptr->ip); */ /* Tcl_Release(ptr->ip); */
rbtk_release_ip(ptr); rbtk_release_ip(ptr);
rb_thread_critical = thr_crit_bup; rb_thread_critical = thr_crit_bup;
return(strval); return(strval);
# else /* TCL_VERSION >= 8.1 */
if (Tcl_GetCharLength(ret)
!= Tcl_UniCharLen(Tcl_GetUnicode(ret))) {
/* possibly binary string */
s = Tcl_GetByteArrayFromObj(ret, &len);
strval = rb_tainted_str_new(s, len);
rb_ivar_set(strval, ID_at_enc, rb_tainted_str_new2("binary"));
} else {
/* possibly text string */
s = Tcl_GetStringFromObj(ret, &len);
strval = rb_tainted_str_new(s, len);
}
Tcl_DecrRefCount(ret);
/* Tcl_Release(ptr->ip); */
rbtk_release_ip(ptr);
rb_thread_critical = thr_crit_bup;
return(strval);
# endif
} }
#else /* TCL_MAJOR_VERSION < 8 */ #else /* TCL_MAJOR_VERSION < 8 */
{ {
@ -7482,36 +7445,12 @@ ip_set_variable2_core(interp, argc, argv)
#if TCL_MAJOR_VERSION >= 8 #if TCL_MAJOR_VERSION >= 8
{ {
Tcl_Obj *valobj, *ret; Tcl_Obj *valobj, *ret;
char *s;
int len;
volatile VALUE strval; volatile VALUE strval;
thr_crit_bup = rb_thread_critical; thr_crit_bup = rb_thread_critical;
rb_thread_critical = Qtrue; rb_thread_critical = Qtrue;
# if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0 valobj = get_obj_from_str(value);
valobj = Tcl_NewStringObj(RSTRING(value)->ptr,
RSTRING(value)->len);
# else /* TCL_VERSION >= 8.1 */
{
VALUE enc = rb_attr_get(value, ID_at_enc);
if (!NIL_P(enc) && strcmp(StringValuePtr(enc), "binary") == 0) {
/* binary string */
valobj = Tcl_NewByteArrayObj(RSTRING(value)->ptr,
RSTRING(value)->len);
} else if (strlen(RSTRING(value)->ptr) != RSTRING(value)->len) {
/* probably binary string */
valobj = Tcl_NewByteArrayObj(RSTRING(value)->ptr,
RSTRING(value)->len);
} else {
/* probably text string */
valobj = Tcl_NewStringObj(RSTRING(value)->ptr,
RSTRING(value)->len);
}
}
# endif
Tcl_IncrRefCount(valobj); Tcl_IncrRefCount(valobj);
/* ip is deleted? */ /* ip is deleted? */
@ -7539,24 +7478,10 @@ ip_set_variable2_core(interp, argc, argv)
} }
Tcl_IncrRefCount(ret); Tcl_IncrRefCount(ret);
strval = get_str_from_obj(ret);
# if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0 OBJ_TAINT(strval);
s = Tcl_GetStringFromObj(ret, &len);
strval = rb_tainted_str_new(s, len);
# else /* TCL_VERSION >= 8.1 */
if (Tcl_GetCharLength(ret) != Tcl_UniCharLen(Tcl_GetUnicode(ret))) {
/* possibly binary string */
s = Tcl_GetByteArrayFromObj(ret, &len);
strval = rb_tainted_str_new(s, len);
rb_ivar_set(strval, ID_at_enc, rb_str_new2("binary"));
} else {
/* possibly text string */
s = Tcl_GetStringFromObj(ret, &len);
strval = rb_tainted_str_new(s, len);
}
# endif
Tcl_DecrRefCount(ret); Tcl_DecrRefCount(ret);
/* Tcl_Release(ptr->ip); */ /* Tcl_Release(ptr->ip); */
rbtk_release_ip(ptr); rbtk_release_ip(ptr);
rb_thread_critical = thr_crit_bup; rb_thread_critical = thr_crit_bup;
@ -7583,11 +7508,8 @@ ip_set_variable2_core(interp, argc, argv)
return rb_exc_new2(rb_eRuntimeError, ptr->ip->result); return rb_exc_new2(rb_eRuntimeError, ptr->ip->result);
} }
Tcl_IncrRefCount(ret);
strval = rb_tainted_str_new2(ret); strval = rb_tainted_str_new2(ret);
Tcl_DecrRefCount(ret);
/* Tcl_Release(ptr->ip); */ /* Tcl_Release(ptr->ip); */
rbtk_release_ip(ptr); rbtk_release_ip(ptr);
rb_thread_critical = thr_crit_bup; rb_thread_critical = thr_crit_bup;
@ -7806,39 +7728,7 @@ lib_split_tklist_core(ip_obj, list_str)
Tcl_Obj **objv; Tcl_Obj **objv;
int thr_crit_bup; int thr_crit_bup;
# if 1 listobj = get_obj_from_str(list_str);
# if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0
listobj = Tcl_NewStringObj(RSTRING(list_str)->ptr,
RSTRING(list_str)->len);
# else /* TCL_VERSION >= 8.1 */
thr_crit_bup = rb_thread_critical;
rb_thread_critical = Qtrue;
{
VALUE enc = rb_attr_get(list_str, ID_at_enc);
if (!NIL_P(enc) && strcmp(StringValuePtr(enc), "binary") == 0) {
/* binary string */
listobj = Tcl_NewByteArrayObj(RSTRING(list_str)->ptr,
RSTRING(list_str)->len);
} else if (strlen(RSTRING(list_str)->ptr)
!= RSTRING(list_str)->len) {
/* probably binary string */
listobj = Tcl_NewByteArrayObj(RSTRING(list_str)->ptr,
RSTRING(list_str)->len);
} else {
/* probably text string */
listobj = Tcl_NewStringObj(RSTRING(list_str)->ptr,
RSTRING(list_str)->len);
}
}
rb_thread_critical = thr_crit_bup;
# endif
# else
listobj = Tcl_NewStringObj(RSTRING(list_str)->ptr,
RSTRING(list_str)->len);
# endif
Tcl_IncrRefCount(listobj); Tcl_IncrRefCount(listobj);
@ -7866,31 +7756,7 @@ lib_split_tklist_core(ip_obj, list_str)
old_gc = rb_gc_disable(); old_gc = rb_gc_disable();
for(idx = 0; idx < objc; idx++) { for(idx = 0; idx < objc; idx++) {
char *str; elem = get_str_from_obj(objv[idx]);
int len;
# if 1
# if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0
str = Tcl_GetStringFromObj(objv[idx], &len);
elem = rb_str_new(str, len);
# else /* TCL_VERSION >= 8.1 */
if (Tcl_GetCharLength(objv[idx])
!= Tcl_UniCharLen(Tcl_GetUnicode(objv[idx]))) {
/* possibly binary string */
str = Tcl_GetByteArrayFromObj(objv[idx], &len);
elem = rb_str_new(str, len);
rb_ivar_set(elem, ID_at_enc, rb_tainted_str_new2("binary"));
} else {
/* possibly text string */
str = Tcl_GetStringFromObj(objv[idx], &len);
elem = rb_str_new(str, len);
}
# endif
# else
str = Tcl_GetStringFromObj(objv[idx], &len);
elem = rb_str_new(str, len);
# endif
if (taint_flag) OBJ_TAINT(elem); if (taint_flag) OBJ_TAINT(elem);
RARRAY(ary)->ptr[idx] = elem; RARRAY(ary)->ptr[idx] = elem;
} }