diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-03-13 05:45:13 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-03-13 05:45:13 +0000 |
| commit | e502549be1bea41406ccef0e819b0e9cb8cdb069 (patch) | |
| tree | 78a2fe9e8986665213222c60304e5682e0431303 /lib | |
| parent | 8fc5876485fb84bf9c93b569ff0cb57cf2b21f7d (diff) | |
* io.c (argf_seek_m): wrong calling sequence of rb_io_seek().
* parse.y (cond0): no special treatment of string literal in
condition.
* math.c: add acos, asin, atan, conh, sinh, tanh and hypot to Math.
* configure.in: check hypot availablility.
* missing/hypot.c: public domain rewrite of hypot.
* parse.y (warn_unless_e_option): warning condition was wrong.
* parse.y (warning_unless_e_option): ditto.
* enum.c (enum_all): new method 'all?', which returns true if
block returns true for all elements.
* enum.c (enum_any): new method 'any?', which returns true if
block retruns true for any of elements.
* marshal.c (marshal_load): do not give warning unless explicitly
set to verbose.
* eval.c (rb_exit): give string value "exit" to SystemExit.
* ruby.c (proc_options): -v should not print version if
proc_options called via moreswitches().
* parse.y (stmt): while/until modifier must work for empty body.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1241 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/delegate.rb | 2 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 | ||||
| -rw-r--r-- | lib/profile.rb | 9 |
3 files changed, 7 insertions, 6 deletions
diff --git a/lib/delegate.rb b/lib/delegate.rb index 480e1ef6b8..a72ea943ba 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -8,7 +8,7 @@ # Usage: # foo = Object.new # foo2 = SimpleDelegator.new(foo) -# foo.hash == foo2.hash # => true +# foo.hash == foo2.hash # => false # # Foo = DelegateClass(Array) # diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 4692ea73c1..eb3cb74e16 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -375,7 +375,7 @@ def create_makefile(target, srcdir = File.dirname($0)) $DLDFLAGS = CONFIG["DLDFLAGS"] $libs = CONFIG["LIBRUBYARG"] + " " + $libs - $configure_args['--enable-shared'] or $LIBPATH |= ["$(topdir)"] + $configure_args['--enable-shared'] or $LIBPATH |= [$topdir] $LIBPATH |= [CONFIG["libdir"]] defflag = '' diff --git a/lib/profile.rb b/lib/profile.rb index b00caac42e..6f772ee6d9 100644 --- a/lib/profile.rb +++ b/lib/profile.rb @@ -1,6 +1,7 @@ module Profiler__ - Start = Float(Time.times[0]) + Times = if defined? Process.times then Process else Time end + Start = Float(Times::times[0]) top = "toplevel".intern Stack = [[0, 0, top]] MAP = {"#toplevel" => [1, 0, 0, "#toplevel"]} @@ -8,10 +9,10 @@ module Profiler__ p = proc{|event, file, line, id, binding, klass| case event when "call", "c-call" - now = Float(Time.times[0]) + now = Float(Times::times[0]) Stack.push [now, 0.0, id] when "return", "c-return" - now = Float(Time.times[0]) + now = Float(Times::times[0]) tick = Stack.pop name = klass.to_s if name.nil? then name = '' end @@ -35,7 +36,7 @@ module Profiler__ } END { set_trace_func nil - total = Float(Time.times[0]) - Start + total = Float(Times::times[0]) - Start if total == 0 then total = 0.01 end MAP["#toplevel"][1] = total # f = open("./rmon.out", "w") |