diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1999-06-24 04:24:09 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1999-06-24 04:24:09 +0000 |
| commit | 031d2e84df58ed54948671931544c41cf32da1ca (patch) | |
| tree | 1118362b178f55bf14d142752b8d61976191b991 /lib | |
| parent | 37bcc42c983987ec504efd9556f0cb884f0b424d (diff) | |
990624
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_3@490 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/debug.rb | 3 | ||||
| -rw-r--r-- | lib/mkmf.rb | 5 | ||||
| -rw-r--r-- | lib/parsedate.rb | 2 | ||||
| -rw-r--r-- | lib/tracer.rb | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/lib/debug.rb b/lib/debug.rb index ada7170e62..e5c305db77 100644 --- a/lib/debug.rb +++ b/lib/debug.rb @@ -130,6 +130,9 @@ class DEBUGGER__ else lev = 1 end + unless @frame_pos + @frame_pos = @frames.size - 1 + end if lev >= @frames.size or @frame_pos and @frame_pos+lev >= @frames.size STDOUT.print "at stack bottom\n" @frame_pos = nil diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 98ab7e4670..b1f431c7e1 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -34,9 +34,11 @@ $srcdir = CONFIG["srcdir"] $libdir = CONFIG["libdir"]+"/ruby/"+CONFIG["MAJOR"]+"."+CONFIG["MINOR"] $archdir = $libdir+"/"+CONFIG["arch"] $install = CONFIG["INSTALL_PROGRAM"] +$install_dllib = CONFIG["INSTALL_DLLIB"] $install_data = CONFIG["INSTALL_DATA"] if $install =~ %r!^[^\s/]+/! then $install = CONFIG["compile_dir"]+"/"+$install + $install_dllib = CONFIG["compile_dir"]+"/"+$install_dllib $install_data = CONFIG["compile_dir"]+"/"+$install_data end @@ -371,6 +373,7 @@ TARGET = #{target} DLLIB = $(TARGET).#{CONFIG["DLEXT"]} INSTALL = #{$install} +INSTALL_DLLIB = #{$install_dllib} INSTALL_DATA = #{$install_data} binsuffix = #{CONFIG["binsuffix"]} @@ -388,7 +391,7 @@ install: $(archdir)/$(DLLIB) $(archdir)/$(DLLIB): $(DLLIB) @test -d $(libdir) || mkdir $(libdir) @test -d $(archdir) || mkdir $(archdir) - $(INSTALL) $(DLLIB) $(archdir)/$(DLLIB) + $(INSTALL_DLLIB) $(DLLIB) $(archdir)/$(DLLIB) EOMF install_rb(mfile) mfile.printf "\n" diff --git a/lib/parsedate.rb b/lib/parsedate.rb index e27735b755..6afec0ff06 100644 --- a/lib/parsedate.rb +++ b/lib/parsedate.rb @@ -46,7 +46,7 @@ module ParseDate if $3 year = $3.to_i end - elsif date.sub!(/(#{MONTHPAT})\S*\s+(\d+)\S*\s*,?(?:\s+(\d+))?/i, ' ') + elsif date.sub!(/(#{MONTHPAT})\S*\s+(\d+)\S*,?(?:\s+(\d+))?/i, ' ') mon = MONTHS[$1.downcase] mday = $2.to_i if $3 diff --git a/lib/tracer.rb b/lib/tracer.rb index fbfca24fe5..a8dc2a104d 100644 --- a/lib/tracer.rb +++ b/lib/tracer.rb @@ -54,7 +54,7 @@ class Tracer off end else - set_trace_func proc{|event, file, line, id, binding| + set_trace_func proc{|event, file, line, id, binding, klass| trace_func event, file, line, id, binding } print "Trace on\n" if Tracer.verbose? |