From 28412851825d1bc7c8e885387e1f1b257cf8a0cf Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 8 Nov 1999 03:57:01 +0000 Subject: 19991108 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 13 +++++++++++++ Makefile.in | 2 ++ config_h.dj | 8 ++++---- configure | 40 ++++++++++++++++++++++------------------ configure.in | 4 ++++ eval.c | 3 +++ lib/debug.rb | 1 + regex.c | 2 ++ ruby.1 | 2 +- win32/config.h | 8 ++++---- win32/config.status | 2 +- win32/win32.c | 27 --------------------------- 12 files changed, 57 insertions(+), 55 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49c15a5d85..5e3a423b7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Sun Nov 7 18:31:04 1999 Yasuhiro Fukuma + + * eval.c (is_defined): last_class may be 0. + +Sat Nov 6 19:26:55 1999 EGUCHI Osamu + + * Makefile.in: Added depend entry make parse.@OBJEXT@ from parse.c + for UCB make + +Thu Nov 4 17:41:18 1999 Yukihiro Matsumoto + + * regex.c (re_compile_pattern): \< (wordbeg), \> (wordend) disabled. + Wed Nov 3 08:52:57 1999 Masaki Fukushima * io.c (Init_IO): forgot to use INT2FIX() around SEEK_SET, etc. diff --git a/Makefile.in b/Makefile.in index e846d8d72f..5b66caa96b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -141,6 +141,8 @@ parse.c: parse.y $(YACC) $< mv -f y.tab.c parse.c +parse.@OBJEXT@: parse.c + alloca.@OBJEXT@: @srcdir@/missing/alloca.c $(CC) -I. $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/alloca.c diff --git a/config_h.dj b/config_h.dj index 36b80537fd..029da840c4 100644 --- a/config_h.dj +++ b/config_h.dj @@ -64,8 +64,8 @@ #define RSHIFT(x,y) ((x)>>y) #define FILE_COUNT _cnt #define DLEXT ".o" -#define RUBY_LIB "/usr/local/lib/ruby/1.4" -#define RUBY_SITE_LIB "/usr/local/lib/ruby/1.4/site_ruby" +#define RUBY_LIB "/usr/local/lib/ruby/1.5" +#define RUBY_SITE_LIB "/usr/local/lib/ruby/1.5/site_ruby" #define RUBY_PLATFORM "i386-djgpp" -#define RUBY_ARCHLIB "/usr/local/lib/ruby/1.4/i386-djgpp" -#define RUBY_SITE_ARCHLIB "/usr/local/lib/ruby/1.4/site_ruby/i386-djgpp" +#define RUBY_ARCHLIB "/usr/local/lib/ruby/1.5/i386-djgpp" +#define RUBY_SITE_ARCHLIB "/usr/local/lib/ruby/1.5/site_ruby/i386-djgpp" diff --git a/configure b/configure index 6399835110..8c97b5ba4c 100644 --- a/configure +++ b/configure @@ -4085,6 +4085,10 @@ echo "configure:4028: checking whether OS depend dynamic link works" >&5 fi rb_cv_dlopen=yes ;; netbsd*) LDSHARED="ld -shared" + case "$host_cpu" in + alpha) + LDFLAGS="-export-dynamic" ;; + esac rb_cv_dlopen=yes ;; openbsd*) LDSHARED="ld -Bforcearchive -Bshareable" rb_cv_dlopen=yes ;; @@ -4141,12 +4145,12 @@ if test "$ac_cv_header_a_out_h" = yes; then if test "$with_dln_a_out" = yes || test "$rb_cv_dlopen" = unknown; then cat confdefs.h > config.h echo $ac_n "checking whether matz's dln works""... $ac_c" 1>&6 -echo "configure:4145: checking whether matz's dln works" >&5 +echo "configure:4149: checking whether matz's dln works" >&5 if eval "test \"`echo '$''{'rb_cv_dln_a_out'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_dln_a_out=yes else @@ -4263,7 +4267,7 @@ fi case "$host_os" in human*) echo $ac_n "checking for _harderr in -lsignal""... $ac_c" 1>&6 -echo "configure:4267: checking for _harderr in -lsignal" >&5 +echo "configure:4271: checking for _harderr in -lsignal" >&5 ac_lib_var=`echo signal'_'_harderr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4271,7 +4275,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsignal $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4310,7 +4314,7 @@ else fi echo $ac_n "checking for hmemset in -lhmem""... $ac_c" 1>&6 -echo "configure:4314: checking for hmemset in -lhmem" >&5 +echo "configure:4318: checking for hmemset in -lhmem" >&5 ac_lib_var=`echo hmem'_'hmemset | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4318,7 +4322,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lhmem $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4359,12 +4363,12 @@ fi for ac_func in select do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4363: checking for $ac_func" >&5 +echo "configure:4367: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4412,7 +4416,7 @@ fi done echo $ac_n "checking whether PD libc _dtos18 fail to convert big number""... $ac_c" 1>&6 -echo "configure:4416: checking whether PD libc _dtos18 fail to convert big number" >&5 +echo "configure:4420: checking whether PD libc _dtos18 fail to convert big number" >&5 if eval "test \"`echo '$''{'rb_cv_missing__dtos18'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4420,7 +4424,7 @@ else rb_cv_missing__dtos18=no else cat > conftest.$ac_ext < @@ -4432,7 +4436,7 @@ main () } EOF -if { (eval echo configure:4436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rb_cv_missing__dtos18=yes else @@ -4454,7 +4458,7 @@ EOF fi echo $ac_n "checking whether PD libc fconvert fail to round""... $ac_c" 1>&6 -echo "configure:4458: checking whether PD libc fconvert fail to round" >&5 +echo "configure:4462: checking whether PD libc fconvert fail to round" >&5 if eval "test \"`echo '$''{'rb_cv_missing_fconvert'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4462,7 +4466,7 @@ else rb_cv_missing_fconvert=no else cat > conftest.$ac_ext < @@ -4475,7 +4479,7 @@ main () } EOF -if { (eval echo configure:4479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rb_cv_missing_fconvert=yes else diff --git a/configure.in b/configure.in index 9f3030b5c0..41d4fac0c7 100644 --- a/configure.in +++ b/configure.in @@ -429,6 +429,10 @@ if test "$with_dln_a_out" != yes; then fi rb_cv_dlopen=yes ;; netbsd*) LDSHARED="ld -shared" + case "$host_cpu" in + alpha) + LDFLAGS="-export-dynamic" ;; + esac rb_cv_dlopen=yes ;; openbsd*) LDSHARED="ld -Bforcearchive -Bshareable" rb_cv_dlopen=yes ;; diff --git a/eval.c b/eval.c index 6e9ad5e9fb..75a2ddaf30 100644 --- a/eval.c +++ b/eval.c @@ -1498,6 +1498,7 @@ is_defined(self, node, buf) case NODE_SUPER: case NODE_ZSUPER: if (ruby_frame->last_func == 0) return 0; + else if (ruby_frame->last_class == 0) return 0; else if (rb_method_boundp(RCLASS(ruby_frame->last_class)->super, ruby_frame->last_func, 0)) { if (nd_type(node) == NODE_SUPER) { @@ -5305,6 +5306,7 @@ Init_eval() rb_define_global_function("untrace_var", rb_f_untrace_var, -1); rb_define_global_function("set_trace_func", set_trace_func, 1); + rb_global_variable(&trace_func); rb_define_virtual_variable("$SAFE", safe_getter, safe_setter); } @@ -6087,6 +6089,7 @@ thread_mark(th) rb_gc_mark(th->errinfo); rb_gc_mark(th->last_line); rb_gc_mark(th->last_match); + rb_gc_mark(th->trace); rb_mark_tbl(th->locals); /* mark data in copied stack */ diff --git a/lib/debug.rb b/lib/debug.rb index 1209f60ee2..0a6699f174 100644 --- a/lib/debug.rb +++ b/lib/debug.rb @@ -26,6 +26,7 @@ class DEBUGGER__ @frames = [nil] @last_file = nil @last = [nil, nil] + @no_step = nil end DEBUG_LAST_CMD = [] diff --git a/regex.c b/regex.c index 8634dfe90c..1a1662a112 100644 --- a/regex.c +++ b/regex.c @@ -2063,6 +2063,7 @@ re_compile_pattern(pattern, size, bufp) BUFPUSH(notwordchar); break; +#ifndef RUBY case '<': BUFPUSH(wordbeg); break; @@ -2070,6 +2071,7 @@ re_compile_pattern(pattern, size, bufp) case '>': BUFPUSH(wordend); break; +#endif case 'b': BUFPUSH(wordbound); diff --git a/ruby.1 b/ruby.1 index 9fa429fbdd..3c71b9c0be 100644 --- a/ruby.1 +++ b/ruby.1 @@ -1,6 +1,6 @@ .\"Ruby is copyrighted by Yukihiro Matsumoto . .na -.TH RUBY 1 "ruby 1.4" "13/Aug/99" "Ruby Programmers Reference Guide" +.TH RUBY 1 "ruby 1.5" "5/Nov/99" "Ruby Programmers Reference Guide" .SH NAME ruby - Interpreted object-oriented scripting language .SH SYNOPSIS diff --git a/win32/config.h b/win32/config.h index 3ded77ebfd..fe550654c2 100644 --- a/win32/config.h +++ b/win32/config.h @@ -39,10 +39,10 @@ #define RSHIFT(x,y) ((x)>>y) #define FILE_COUNT _cnt #define DLEXT ".dll" -#define RUBY_LIB "/usr/local/lib/ruby/1.4" -#define RUBY_ARCHLIB "/usr/local/lib/ruby/1.4/i386-mswin32" -#define RUBY_SITE_LIB "/usr/local/lib/ruby/1.4/site_ruby" -#define RUBY_SITE_ARCHLIB "/usr/local/lib/ruby/1.4/site_ruby/i386-mswin32" +#define RUBY_LIB "/usr/local/lib/ruby/1.5" +#define RUBY_ARCHLIB "/usr/local/lib/ruby/1.5/i386-mswin32" +#define RUBY_SITE_LIB "/usr/local/lib/ruby/1.5/site_ruby" +#define RUBY_SITE_ARCHLIB "/usr/local/lib/ruby/1.5/site_ruby/i386-mswin32" #define RUBY_PLATFORM "i386-mswin32" #define SIZEOF_INT 4 diff --git a/win32/config.status b/win32/config.status index 9b959ff4bb..0ffddc901c 100644 --- a/win32/config.status +++ b/win32/config.status @@ -5,7 +5,7 @@ s%@CPPFLAGS@%%g s%@CXXFLAGS@%%g s%@FFLAGS@%%g s%@DEFS@% - -DUSE_THREAD -DSIZEOF_INT=4 -DSIZEOF_SHORT=2 -DSIZEOF_LONG=4 -DSIZEOF_VOIDP=4 -DSIZEOF_FLOAT=4 -DSIZEOF_DOUBLE=8 -DHAVE_PROTOTYPES=1 -DHAVE_STDARG_PROTOTYPES=1 -DHAVE_STDLIB_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_ST_RDEV=1 -DGETGROUPS_T=int -DRETSIGTYPE=void -DHAVE_ALLOCA=1 -DHAVE_FMOD=1 -DHAVE_WAITPID=1 -DHAVE_GETCWD=1 -DHAVE_CHSIZE=1 -DHAVE_GETGROUPS=1 -DHAVE_GETLOGIN=1 -DRSHIFT=\(x,y\)\ \(\(x\)\>\>y\) -DFILE_COUNT=_cnt -DDLEXT=\".dll\" -DRUBY_LIB=\"/usr/local/lib/ruby/1.4\" -DRUBY_ARCHLIB=\"/usr/local/lib/ruby/1.4/i386-mswin32\" -DRUBY_PLATFORM=\"i386-mswin32\" %g + -DUSE_THREAD -DSIZEOF_INT=4 -DSIZEOF_SHORT=2 -DSIZEOF_LONG=4 -DSIZEOF_VOIDP=4 -DSIZEOF_FLOAT=4 -DSIZEOF_DOUBLE=8 -DHAVE_PROTOTYPES=1 -DHAVE_STDARG_PROTOTYPES=1 -DHAVE_STDLIB_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_ST_RDEV=1 -DGETGROUPS_T=int -DRETSIGTYPE=void -DHAVE_ALLOCA=1 -DHAVE_FMOD=1 -DHAVE_WAITPID=1 -DHAVE_GETCWD=1 -DHAVE_CHSIZE=1 -DHAVE_GETGROUPS=1 -DHAVE_GETLOGIN=1 -DRSHIFT=\(x,y\)\ \(\(x\)\>\>y\) -DFILE_COUNT=_cnt -DDLEXT=\".dll\" -DRUBY_PLATFORM=\"i386-mswin32\" %g s%@LDFLAGS@%%g s%@LIBS@%advapi32.lib wsock32.lib%g s%@exec_prefix@%${prefix}%g diff --git a/win32/win32.c b/win32/win32.c index a28006ce86..864fbfb5df 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1218,12 +1218,6 @@ NtMakeCmdVector (char *cmdline, char ***vec, int InputCmd) // UNIX compatible directory access functions for NT // -// -// File names are converted to lowercase if the -// CONVERT_TO_LOWER_CASE variable is defined. -// - -#define CONVERT_TO_LOWER_CASE #define PATHLEN 1024 // @@ -1246,8 +1240,6 @@ opendir(char *filename) char root[PATHLEN]; char volname[PATHLEN]; DWORD serial, maxname, flags; - BOOL downcase; - char *dummy; // // check to see if we\'ve got a directory @@ -1258,21 +1250,6 @@ opendir(char *filename) return NULL; } - // - // check out the file system characteristics - // - if (GetFullPathName(filename, PATHLEN, root, &dummy)) { - if (dummy = strchr(root, '\\')) - *++dummy = '\0'; - if (GetVolumeInformation(root, volname, PATHLEN, - &serial, &maxname, &flags, 0, 0)) { - downcase = !(flags & FS_CASE_SENSITIVE); - } - } - else { - downcase = TRUE; - } - // // Get us a DIR structure // @@ -1309,8 +1286,6 @@ opendir(char *filename) idx = strlen(FindData.cFileName)+1; p->start = ALLOC_N(char, idx); strcpy (p->start, FindData.cFileName); - if (downcase) - strlwr(p->start); p->nfiles++; // @@ -1334,8 +1309,6 @@ opendir(char *filename) rb_fatal ("opendir: malloc failed!\n"); } strcpy(&p->start[idx], FindData.cFileName); - if (downcase) - strlwr(&p->start[idx]); p->nfiles++; idx += len+1; } -- cgit v1.2.3