mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* eval.c (rb_mod_define_method): should have clear method cache.
* eval.c (rb_mod_define_method): should have raised exception for type error. * ruby.h: changed "extern INLINE" to "static inline". git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1286 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
97101e1a65
commit
b0cc7e80a6
10 changed files with 140 additions and 42 deletions
16
ChangeLog
16
ChangeLog
|
@ -1,7 +1,23 @@
|
|||
Tue Mar 27 15:00:54 2001 K.Kosako <kosako@sofnec.co.jp>
|
||||
|
||||
* eval.c (rb_mod_define_method): should have clear method cache.
|
||||
|
||||
* eval.c (rb_mod_define_method): should have raised exception for
|
||||
type error.
|
||||
|
||||
Tue Mar 27 14:48:17 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* ruby.h: changed "extern INLINE" to "static inline".
|
||||
|
||||
Mon Mar 26 23:19:33 2001 WATANABE Hirofumi <eban@ruby-lang.org>
|
||||
|
||||
* time.c (rb_strftime): check whether strftime returns empty string.
|
||||
|
||||
Mon Mar 26 18:14:47 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* dir.c (rb_glob_helper): part of 1.7 globber backported to proper
|
||||
following of symlinks.
|
||||
|
||||
Mon Mar 26 17:21:07 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* eval.c: remove TMP_PROTECT_END to prevent C_ALLOCA crash.
|
||||
|
|
|
@ -325,9 +325,6 @@ AC_C_BIGENDIAN
|
|||
AC_C_CONST
|
||||
AC_C_CHAR_UNSIGNED
|
||||
AC_C_INLINE
|
||||
if test "$ac_cv_c_inline" = no; then
|
||||
AC_DEFINE(NO_C_INLINE)
|
||||
fi
|
||||
|
||||
AC_CACHE_CHECK(whether right shift preserve sign bit, rb_cv_rshift_sign,
|
||||
[AC_TRY_RUN([
|
||||
|
|
14
dir.c
14
dir.c
|
@ -609,7 +609,7 @@ rb_glob_helper(path, flag, func, arg)
|
|||
rb_glob_helper(buf, flag, func, arg);
|
||||
free(buf);
|
||||
}
|
||||
if (lstat(dir, &st) < 0) {
|
||||
if (stat(dir, &st) < 0) {
|
||||
free(base);
|
||||
break;
|
||||
}
|
||||
|
@ -637,7 +637,15 @@ rb_glob_helper(path, flag, func, arg)
|
|||
continue;
|
||||
buf = ALLOC_N(char, strlen(base)+NAMLEN(dp)+strlen(m)+6);
|
||||
sprintf(buf, "%s%s%s/**%s", base, (BASE)?"/":"", dp->d_name, m);
|
||||
rb_glob_helper(buf, flag, func, arg);
|
||||
sprintf(buf, "%s%s%s", base, (BASE)?"/":"", dp->d_name);
|
||||
if (lstat(buf, &st) < 0) {
|
||||
continue;
|
||||
}
|
||||
if (S_ISDIR(st.st_mode)) {
|
||||
strcat(buf, "/**");
|
||||
strcat(buf, m);
|
||||
rb_glob_helper(buf, flag, func, arg);
|
||||
}
|
||||
free(buf);
|
||||
continue;
|
||||
}
|
||||
|
@ -659,7 +667,7 @@ rb_glob_helper(path, flag, func, arg)
|
|||
free(base);
|
||||
free(magic);
|
||||
while (link) {
|
||||
lstat(link->path, &st); /* should success */
|
||||
stat(link->path, &st); /* should success */
|
||||
if (S_ISDIR(st.st_mode)) {
|
||||
int len = strlen(link->path);
|
||||
int mlen = strlen(m);
|
||||
|
|
3
eval.c
3
eval.c
|
@ -6736,6 +6736,7 @@ rb_mod_define_method(argc, argv, mod)
|
|||
}
|
||||
if (TYPE(body) != T_DATA) {
|
||||
/* type error */
|
||||
rb_raise(rb_eTypeError, "wrong argument type (expected Proc)");
|
||||
}
|
||||
if (RDATA(body)->dmark == (RUBY_DATA_FUNC)bm_mark) {
|
||||
rb_add_method(mod, id, NEW_DMETHOD(method_unbind(body)), NOEX_PUBLIC);
|
||||
|
@ -6745,8 +6746,10 @@ rb_mod_define_method(argc, argv, mod)
|
|||
}
|
||||
else {
|
||||
/* type error */
|
||||
rb_raise(rb_eTypeError, "wrong argument type (expected Proc)");
|
||||
}
|
||||
|
||||
rb_clear_cache_by_id(id);
|
||||
return body;
|
||||
}
|
||||
|
||||
|
|
104
ext/tk/lib/tk.rb
104
ext/tk/lib/tk.rb
|
@ -651,12 +651,76 @@ module TkCore
|
|||
end
|
||||
end
|
||||
|
||||
module TkPackage
|
||||
include TkCore
|
||||
extend TkPackage
|
||||
|
||||
def forget(package)
|
||||
tk_call('package', 'forget', package)
|
||||
nil
|
||||
end
|
||||
|
||||
def names
|
||||
tk_split_simplelist(tk_call('package', 'names'))
|
||||
end
|
||||
|
||||
def provide(package, version=nil)
|
||||
if version
|
||||
tk_call('package', 'provide', package, version)
|
||||
nil
|
||||
else
|
||||
tk_call('package', 'provide', package)
|
||||
end
|
||||
end
|
||||
|
||||
def present(package, version=None)
|
||||
tk_call('package', 'present', package, version)
|
||||
end
|
||||
|
||||
def present_exact(package, version)
|
||||
tk_call('package', 'present', '-exact', package, version)
|
||||
end
|
||||
|
||||
def require(package, version=None)
|
||||
tk_call('package', 'require', package, version)
|
||||
end
|
||||
|
||||
def require_exact(package, version)
|
||||
tk_call('package', 'require', '-exact', package, version)
|
||||
end
|
||||
|
||||
def versions(package)
|
||||
tk_split_simplelist(tk_call('package', 'versions', package))
|
||||
end
|
||||
|
||||
def vcompare(version1, version2)
|
||||
Integer(tk_call('package', 'vcompare', version1, version2))
|
||||
end
|
||||
|
||||
def vsatisfies(version1, version2)
|
||||
bool(tk_call('package', 'vsatisfies', version1, version2))
|
||||
end
|
||||
end
|
||||
|
||||
module Tk
|
||||
include TkCore
|
||||
extend Tk
|
||||
|
||||
TCL_VERSION = INTERP._invoke("info", "tclversion")
|
||||
TK_VERSION = INTERP._invoke("set", "tk_version")
|
||||
|
||||
TCL_PATCHLEVEL = INTERP._invoke("info", "patchlevel")
|
||||
TK_PATCHLEVEL = INTERP._invoke("set", "tk_patchLevel")
|
||||
|
||||
TCL_LIBRARY = INTERP._invoke("set", "tcl_library")
|
||||
TK_LIBRARY = INTERP._invoke("set", "tk_library")
|
||||
LIBRARY = INTERP._invoke("info", "library")
|
||||
|
||||
TCL_PACKAGE_PATH = INTERP._invoke("set", "tcl_pkgPath")
|
||||
AUTO_PATH = tk_split_simplelist(INTERP._invoke("set", "auto_path"))
|
||||
|
||||
PLATFORM = Hash[*tk_split_simplelist(INTERP._eval('array get tcl_platform'))]
|
||||
|
||||
JAPANIZED_TK = (INTERP._invoke("info", "commands", "kanji") != "")
|
||||
|
||||
def root
|
||||
|
@ -680,6 +744,10 @@ module Tk
|
|||
tk_tcl2ruby(tk_call('focus', '-lastfor', win))
|
||||
end
|
||||
|
||||
def Tk.strictMotif(bool=None)
|
||||
bool(tk_call('set', 'tk_strictMotif', bool))
|
||||
end
|
||||
|
||||
def Tk.show_kinsoku(mode='both')
|
||||
begin
|
||||
if /^8\.*/ === TK_VERSION && JAPANIZED_TK
|
||||
|
@ -710,11 +778,11 @@ module Tk
|
|||
end
|
||||
end
|
||||
|
||||
def toUTF8(str,encoding)
|
||||
def Tk.toUTF8(str,encoding)
|
||||
INTERP._toUTF8(str,encoding)
|
||||
end
|
||||
|
||||
def fromUTF8(str,encoding)
|
||||
def Tk.fromUTF8(str,encoding)
|
||||
INTERP._fromUTF8(str,encoding)
|
||||
end
|
||||
|
||||
|
@ -1446,7 +1514,7 @@ module TkXIM
|
|||
end
|
||||
|
||||
def useinputmethods(value=nil)
|
||||
TkXIM.useinputmethods(self, value=nil)
|
||||
TkXIM.useinputmethods(self, value)
|
||||
end
|
||||
|
||||
def imconfigure(window, slot, value=None)
|
||||
|
@ -2370,7 +2438,7 @@ class TkWindow<TkObject
|
|||
|
||||
def grid_propagate(mode=nil)
|
||||
if mode
|
||||
tk_call('grid', 'propagate', epath, bool)
|
||||
tk_call('grid', 'propagate', epath, mode)
|
||||
else
|
||||
bool(tk_call('grid', 'propagate', epath))
|
||||
end
|
||||
|
@ -2708,8 +2776,16 @@ class TkScale<TkWindow
|
|||
tk_call 'scale', path
|
||||
end
|
||||
|
||||
def get
|
||||
number(tk_send('get'))
|
||||
def get(x=None, y=None)
|
||||
number(tk_send('get', x, y))
|
||||
end
|
||||
|
||||
def coords(val=None)
|
||||
tk_split_list(tk_send('coords', val))
|
||||
end
|
||||
|
||||
def identify(x, y)
|
||||
tk_send('identify', x, y)
|
||||
end
|
||||
|
||||
def set(val)
|
||||
|
@ -2744,8 +2820,8 @@ class TkScrollbar<TkWindow
|
|||
number(tk_send('fraction', x, y))
|
||||
end
|
||||
|
||||
def identify(x=None, y=None)
|
||||
tk_send('fraction', x, y)
|
||||
def identify(x, y)
|
||||
tk_send('identify', x, y)
|
||||
end
|
||||
|
||||
def get
|
||||
|
@ -2760,6 +2836,10 @@ class TkScrollbar<TkWindow
|
|||
def set(first, last)
|
||||
tk_send "set", first, last
|
||||
end
|
||||
|
||||
def activate(element=None)
|
||||
tk_send('activate', element)
|
||||
end
|
||||
end
|
||||
|
||||
class TkTextWin<TkWindow
|
||||
|
@ -3033,12 +3113,12 @@ class TkMenu<TkWindow
|
|||
tk_send 'invoke', index
|
||||
end
|
||||
def insert(index, type, keys=nil)
|
||||
tk_send 'add', index, type, *hash_kv(keys)
|
||||
tk_send 'insert', index, type, *hash_kv(keys)
|
||||
end
|
||||
def delete(index, last=None)
|
||||
tk_send 'delete', index, last
|
||||
end
|
||||
def popup(x, y, index=nil)
|
||||
def popup(x, y, index=None)
|
||||
tk_call 'tk_popup', path, x, y, index
|
||||
end
|
||||
def post(x, y)
|
||||
|
@ -3128,12 +3208,12 @@ class TkMenu<TkWindow
|
|||
end
|
||||
|
||||
class TkMenuClone<TkMenu
|
||||
def initialize(parent, type=nil)
|
||||
def initialize(parent, type=None)
|
||||
unless parent.kind_of?(TkMenu)
|
||||
fail ArgumentError, "parent must be TkMenu"
|
||||
end
|
||||
@parent = parent
|
||||
install_win(@parent)
|
||||
install_win(@parent.path)
|
||||
tk_call @parent.path, 'clone', @path, type
|
||||
end
|
||||
end
|
||||
|
|
|
@ -172,7 +172,7 @@ class TkCanvas<TkWindow
|
|||
end
|
||||
|
||||
def bbox(tagOrId, *tags)
|
||||
list(tk_send('bbox', tagid(tagOrId), *tags))
|
||||
list(tk_send('bbox', tagid(tagOrId), *tags.collect{|t| tagid(t)}))
|
||||
end
|
||||
|
||||
def itembind(tag, context, cmd=Proc.new, args=nil)
|
||||
|
@ -207,7 +207,7 @@ class TkCanvas<TkWindow
|
|||
end
|
||||
|
||||
def delete(*args)
|
||||
tk_send 'delete', *args
|
||||
tk_send 'delete', *args.collect{|t| tagid(t)}
|
||||
end
|
||||
alias remove delete
|
||||
|
||||
|
@ -375,7 +375,7 @@ class TkCanvas<TkWindow
|
|||
end
|
||||
|
||||
def lower(tag, below=None)
|
||||
tk_send 'lower', tagid(tag), below
|
||||
tk_send 'lower', tagid(tag), tagid(below)
|
||||
end
|
||||
|
||||
def move(tag, x, y)
|
||||
|
@ -387,7 +387,7 @@ class TkCanvas<TkWindow
|
|||
end
|
||||
|
||||
def raise(tag, above=None)
|
||||
tk_send 'raise', tagid(tag), above
|
||||
tk_send 'raise', tagid(tag), tagid(above)
|
||||
end
|
||||
|
||||
def scale(tag, x, y, xs, ys)
|
||||
|
|
|
@ -136,7 +136,7 @@ class TkEntry<TkLabel
|
|||
tk_send 'selection', 'from', index
|
||||
end
|
||||
def selection_present()
|
||||
tk_send('selection', 'present') == 1
|
||||
bool(tk_send('selection', 'present'))
|
||||
end
|
||||
def selection_range(s, e)
|
||||
tk_send 'selection', 'range', s, e
|
||||
|
|
|
@ -189,6 +189,14 @@ class TkText<TkTextWin
|
|||
}
|
||||
end
|
||||
|
||||
def mark_next(index)
|
||||
tagid2obj(tk_send('mark', 'next', index))
|
||||
end
|
||||
|
||||
def mark_previous(index)
|
||||
tagid2obj(tk_send('mark', 'previous', index))
|
||||
end
|
||||
|
||||
def window_names
|
||||
tk_send('window', 'names').collect{|elt|
|
||||
tagid2obj(elt)
|
||||
|
|
20
ruby.h
20
ruby.h
|
@ -542,18 +542,7 @@ EXTERN VALUE rb_eNameError;
|
|||
EXTERN VALUE rb_eSyntaxError;
|
||||
EXTERN VALUE rb_eLoadError;
|
||||
|
||||
#ifdef INLINE_DEFINE
|
||||
#define INLINE
|
||||
#else
|
||||
#define INLINE inline
|
||||
#endif
|
||||
|
||||
extern INLINE VALUE rb_class_of _((VALUE));
|
||||
extern INLINE int rb_type _((VALUE));
|
||||
extern INLINE int rb_special_const_p _((VALUE));
|
||||
|
||||
#if !defined(NO_C_INLINE) || defined(INLINE_DEFINE)
|
||||
extern INLINE VALUE
|
||||
static inline VALUE
|
||||
#if defined(__cplusplus)
|
||||
rb_class_of(VALUE obj)
|
||||
#else
|
||||
|
@ -570,7 +559,7 @@ rb_class_of(obj)
|
|||
return RBASIC(obj)->klass;
|
||||
}
|
||||
|
||||
extern INLINE int
|
||||
static inline int
|
||||
#if defined(__cplusplus)
|
||||
rb_type(VALUE obj)
|
||||
#else
|
||||
|
@ -587,7 +576,7 @@ rb_type(obj)
|
|||
return BUILTIN_TYPE(obj);
|
||||
}
|
||||
|
||||
extern INLINE int
|
||||
static inline int
|
||||
#if defined(__cplusplus)
|
||||
rb_special_const_p(VALUE obj)
|
||||
#else
|
||||
|
@ -598,9 +587,6 @@ rb_special_const_p(obj)
|
|||
if (SPECIAL_CONST_P(obj)) return Qtrue;
|
||||
return Qfalse;
|
||||
}
|
||||
#endif
|
||||
|
||||
#undef INLINE
|
||||
|
||||
#include "intern.h"
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#define RUBY_VERSION "1.6.3"
|
||||
#define RUBY_RELEASE_DATE "2001-03-26"
|
||||
#define RUBY_RELEASE_DATE "2001-03-27"
|
||||
#define RUBY_VERSION_CODE 163
|
||||
#define RUBY_RELEASE_CODE 20010326
|
||||
#define RUBY_RELEASE_CODE 20010327
|
||||
|
|
Loading…
Add table
Reference in a new issue