ruby-changes:13820
From: yugui <ko1@a...>
Date: Mon, 2 Nov 2009 00:48:31 +0900 (JST)
Subject: [ruby-changes:13820] Ruby:r25618 (ruby_1_9_1): merges r24884 from trunk into ruby_1_9_1.
yugui 2009-11-02 00:48:16 +0900 (Mon, 02 Nov 2009) New Revision: 25618 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25618 Log: merges r24884 from trunk into ruby_1_9_1. -- * lib/prime.rb (EratosthenesGenerator#initialize): call super. (TrialDivisionGenerator, Generator23): ditto. [ruby-core:25539] Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/lib/prime.rb branches/ruby_1_9_1/version.h Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 25617) +++ ruby_1_9_1/ChangeLog (revision 25618) @@ -1,3 +1,8 @@ +Sun Sep 13 09:38:06 2009 Nobuyoshi Nakada <nobu@r...> + + * lib/prime.rb (EratosthenesGenerator#initialize): call super. + (TrialDivisionGenerator, Generator23): ditto. [ruby-core:25539] + Sun Sep 13 08:30:30 2009 Masaki Suketa <masaki.suketa@n...> * ext/win32ole/win32ole.c: fix WIN32OLE_TYPELIB.new when the 1st Index: ruby_1_9_1/lib/prime.rb =================================================================== --- ruby_1_9_1/lib/prime.rb (revision 25617) +++ ruby_1_9_1/lib/prime.rb (revision 25618) @@ -91,14 +91,14 @@ warn "Prime::new is obsolete. use Prime::instance or class methods of Prime." end - class<<self + class << self extend Forwardable include Enumerable # Returns the default instance of Prime. def instance; @the_instance end def method_added(method) # :nodoc: - (class<<self;self;end).def_delegator :instance, method + (class<< self;self;end).def_delegator :instance, method end end @@ -290,6 +290,7 @@ class EratosthenesGenerator < PseudoPrimeGenerator def initialize @last_prime = nil + super end def succ @@ -306,6 +307,7 @@ class TrialDivisionGenerator<PseudoPrimeGenerator def initialize @index = -1 + super end def succ @@ -327,6 +329,7 @@ def initialize @prime = 1 @step = nil + super end def succ Index: ruby_1_9_1/version.h =================================================================== --- ruby_1_9_1/version.h (revision 25617) +++ ruby_1_9_1/version.h (revision 25618) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 328 +#define RUBY_PATCHLEVEL 329 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/