ruby-changes:44298
From: hsbt <ko1@a...>
Date: Fri, 7 Oct 2016 14:19:05 +0900 (JST)
Subject: [ruby-changes:44298] hsbt:r56371 (trunk): * basictest/test.rb: Adjust spaces in class declarations
hsbt 2016-10-07 14:18:57 +0900 (Fri, 07 Oct 2016) New Revision: 56371 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=56371 Log: * basictest/test.rb: Adjust spaces in class declarations with inheritance. [fix GH-1227] Patch by @adrfer * lib/irb/*: ditto. * lib/prime.rb: ditto. * lib/shell/builtin-command.rb: ditto. * object.c: ditto. * sample/*.rb: ditto. * test/-ext-/method/test_arity.rb: ditto. Modified files: trunk/ChangeLog trunk/basictest/test.rb trunk/lib/irb/cmd/chws.rb trunk/lib/irb/cmd/fork.rb trunk/lib/irb/cmd/help.rb trunk/lib/irb/cmd/load.rb trunk/lib/irb/cmd/pushws.rb trunk/lib/irb/cmd/subirb.rb trunk/lib/irb/notifier.rb trunk/lib/irb/output-method.rb trunk/lib/prime.rb trunk/lib/shell/builtin-command.rb trunk/object.c trunk/sample/delegate.rb trunk/sample/export.rb trunk/test/-ext-/method/test_arity.rb Index: test/-ext-/method/test_arity.rb =================================================================== --- test/-ext-/method/test_arity.rb (revision 56370) +++ test/-ext-/method/test_arity.rb (revision 56371) @@ -17,7 +17,7 @@ class TestMethod < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/-ext-/method/test_arity.rb#L17 end end - class B<A + class B < A private :foo1, :foo2 end Index: basictest/test.rb =================================================================== --- basictest/test.rb (revision 56370) +++ basictest/test.rb (revision 56371) @@ -2242,11 +2242,11 @@ test_check "alias" https://github.com/ruby/ruby/blob/trunk/basictest/test.rb#L2242 class Alias0 def foo; "foo" end end -class Alias1<Alias0 +class Alias1 < Alias0 alias bar foo def foo; "foo+" + super end end -class Alias2<Alias1 +class Alias2 < Alias1 alias baz foo undef foo end @@ -2258,7 +2258,7 @@ test_ok(x.baz == "foo+foo") https://github.com/ruby/ruby/blob/trunk/basictest/test.rb#L2258 # test_check for cache test_ok(x.baz == "foo+foo") -class Alias3<Alias2 +class Alias3 < Alias2 def foo defined? super end Index: ChangeLog =================================================================== --- ChangeLog (revision 56370) +++ ChangeLog (revision 56371) @@ -1,3 +1,14 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Fri Oct 7 14:18:40 2016 SHIBATA Hiroshi <hsbt@r...> + + * basictest/test.rb: Adjust spaces in class declarations + with inheritance. [fix GH-1227] Patch by @adrfer + * lib/irb/*: ditto. + * lib/prime.rb: ditto. + * lib/shell/builtin-command.rb: ditto. + * object.c: ditto. + * sample/*.rb: ditto. + * test/-ext-/method/test_arity.rb: ditto. + Thu Oct 6 17:29:44 2016 Nobuyoshi Nakada <nobu@r...> * load.c (rb_require_safe): SyntaxError created by the parser just Index: sample/delegate.rb =================================================================== --- sample/delegate.rb (revision 56370) +++ sample/delegate.rb (revision 56371) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/sample/delegate.rb#L1 require 'delegate' -class ExtArray<DelegateClass(Array) +class ExtArray < DelegateClass(Array) def initialize() super([]) end Index: sample/export.rb =================================================================== --- sample/export.rb (revision 56370) +++ sample/export.rb (revision 56371) @@ -30,7 +30,7 @@ f.printf "%s\n", Foo https://github.com/ruby/ruby/blob/trunk/sample/export.rb#L30 f.quux -class Bar<Foo +class Bar < Foo def quux super baz() Index: object.c =================================================================== --- object.c (revision 56370) +++ object.c (revision 56371) @@ -1569,7 +1569,7 @@ rb_mod_eqq(VALUE mod, VALUE arg) https://github.com/ruby/ruby/blob/trunk/object.c#L1569 * is the same as <i>other</i>. Returns * <code>nil</code> if there's no relationship between the two. * (Think of the relationship in terms of the class definition: - * "class A<B" implies "A<B".) + * "class A < B" implies "A < B".) * */ @@ -1597,7 +1597,7 @@ rb_class_inherited_p(VALUE mod, VALUE ar https://github.com/ruby/ruby/blob/trunk/object.c#L1597 * Returns true if <i>mod</i> is a subclass of <i>other</i>. Returns * <code>nil</code> if there's no relationship between the two. * (Think of the relationship in terms of the class definition: - * "class A<B" implies "A<B".) + * "class A < B" implies "A < B".) * */ @@ -1617,7 +1617,7 @@ rb_mod_lt(VALUE mod, VALUE arg) https://github.com/ruby/ruby/blob/trunk/object.c#L1617 * two modules are the same. Returns * <code>nil</code> if there's no relationship between the two. * (Think of the relationship in terms of the class definition: - * "class A<B" implies "B>A".) + * "class A < B" implies "B > A".) * */ @@ -1638,7 +1638,7 @@ rb_mod_ge(VALUE mod, VALUE arg) https://github.com/ruby/ruby/blob/trunk/object.c#L1638 * Returns true if <i>mod</i> is an ancestor of <i>other</i>. Returns * <code>nil</code> if there's no relationship between the two. * (Think of the relationship in terms of the class definition: - * "class A<B" implies "B>A".) + * "class A < B" implies "B > A".) * */ Index: lib/irb/cmd/subirb.rb =================================================================== --- lib/irb/cmd/subirb.rb (revision 56370) +++ lib/irb/cmd/subirb.rb (revision 56371) @@ -15,25 +15,25 @@ require "irb/ext/multi-irb" https://github.com/ruby/ruby/blob/trunk/lib/irb/cmd/subirb.rb#L15 # :stopdoc: module IRB module ExtendCommand - class IrbCommand<Nop + class IrbCommand < Nop def execute(*obj) IRB.irb(nil, *obj) end end - class Jobs<Nop + class Jobs < Nop def execute IRB.JobManager end end - class Foreground<Nop + class Foreground < Nop def execute(key) IRB.JobManager.switch(key) end end - class Kill<Nop + class Kill < Nop def execute(*keys) IRB.JobManager.kill(*keys) end Index: lib/irb/cmd/help.rb =================================================================== --- lib/irb/cmd/help.rb (revision 56370) +++ lib/irb/cmd/help.rb (revision 56371) @@ -16,7 +16,7 @@ require "irb/cmd/nop.rb" https://github.com/ruby/ruby/blob/trunk/lib/irb/cmd/help.rb#L16 # :stopdoc: module IRB module ExtendCommand - class Help<Nop + class Help < Nop begin Ri = RDoc::RI::Driver.new rescue SystemExit Index: lib/irb/cmd/pushws.rb =================================================================== --- lib/irb/cmd/pushws.rb (revision 56370) +++ lib/irb/cmd/pushws.rb (revision 56371) @@ -16,20 +16,20 @@ require "irb/ext/workspaces.rb" https://github.com/ruby/ruby/blob/trunk/lib/irb/cmd/pushws.rb#L16 # :stopdoc: module IRB module ExtendCommand - class Workspaces<Nop + class Workspaces < Nop def execute(*obj) irb_context.workspaces.collect{|ws| ws.main} end end - class PushWorkspace<Workspaces + class PushWorkspace < Workspaces def execute(*obj) irb_context.push_workspace(*obj) super end end - class PopWorkspace<Workspaces + class PopWorkspace < Workspaces def execute(*obj) irb_context.pop_workspace(*obj) super Index: lib/irb/cmd/load.rb =================================================================== --- lib/irb/cmd/load.rb (revision 56370) +++ lib/irb/cmd/load.rb (revision 56371) @@ -16,7 +16,7 @@ require "irb/ext/loader" https://github.com/ruby/ruby/blob/trunk/lib/irb/cmd/load.rb#L16 # :stopdoc: module IRB module ExtendCommand - class Load<Nop + class Load < Nop include IrbLoader def execute(file_name, priv = nil) @@ -24,7 +24,7 @@ module IRB https://github.com/ruby/ruby/blob/trunk/lib/irb/cmd/load.rb#L24 end end - class Require<Nop + class Require < Nop include IrbLoader def execute(file_name) @@ -55,7 +55,7 @@ module IRB https://github.com/ruby/ruby/blob/trunk/lib/irb/cmd/load.rb#L55 end end - class Source<Nop + class Source < Nop include IrbLoader def execute(file_name) source_file(file_name) Index: lib/irb/cmd/fork.rb =================================================================== --- lib/irb/cmd/fork.rb (revision 56370) +++ lib/irb/cmd/fork.rb (revision 56371) @@ -14,7 +14,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/irb/cmd/fork.rb#L14 # :stopdoc: module IRB module ExtendCommand - class Fork<Nop + class Fork < Nop def execute pid = send ExtendCommand.irb_original_method_name("fork") unless pid Index: lib/irb/cmd/chws.rb =================================================================== --- lib/irb/cmd/chws.rb (revision 56370) +++ lib/irb/cmd/chws.rb (revision 56371) @@ -17,13 +17,13 @@ require "irb/ext/change-ws.rb" https://github.com/ruby/ruby/blob/trunk/lib/irb/cmd/chws.rb#L17 module IRB module ExtendCommand - class CurrentWorkingWorkspace<Nop + class CurrentWorkingWorkspace < Nop def execute(*obj) irb_context.main end end - class ChangeWorkspace<Nop + class ChangeWorkspace < Nop def execute(*obj) irb_context.change_workspace(*obj) irb_context.main Index: lib/irb/output-method.rb =================================================================== --- lib/irb/output-method.rb (revision 56370) +++ lib/irb/output-method.rb (revision 56371) @@ -82,7 +82,7 @@ module IRB https://github.com/ruby/ruby/blob/trunk/lib/irb/output-method.rb#L82 end # A standard output printer - class StdioOutputMethod<OutputMethod + class StdioOutputMethod < OutputMethod # Prints the given +opts+ to standard output, see IO#print for more # information. def print(*opts) Index: lib/irb/notifier.rb =================================================================== --- lib/irb/notifier.rb (revision 56370) +++ lib/irb/notifier.rb (revision 56371) @@ -113,7 +113,7 @@ module IRB https://github.com/ruby/ruby/blob/trunk/lib/irb/notifier.rb#L113 # create a new composite notifier. Using the first composite notifier # object you create, sibling notifiers can be initialized with # #def_notifier. - class CompositeNotifier<AbstractNotifier + class CompositeNotifier < AbstractNotifier # Create a new composite notifier object with the given +prefix+, and # +base_notifier+ to use for output. def initialize(prefix, base_notifier) @@ -174,7 +174,7 @@ module IRB https://github.com/ruby/ruby/blob/trunk/lib/irb/notifier.rb#L174 # A leveled notifier is comparable to the composite group from # CompositeNotifier#notifiers. - class LeveledNotifier<AbstractNotifier + class LeveledNotifier < AbstractNotifier include Comparable # Create a new leveled notifier with the given +base+, and +prefix+ to @@ -212,7 +212,7 @@ module IRB https://github.com/ruby/ruby/blob/trunk/lib/irb/notifier.rb#L212 # # This notifier is used as the +zero+ index, or level +0+, for # CompositeNotifier#notifiers, and will not output messages of any sort. - class NoMsgNotifier<LeveledNotifier + class NoMsgNotifier < LeveledNotifier # Creates a new notifier that should not be used to output messages. def initialize @base_notifier = nil Index: lib/shell/builtin-command.rb =================================================================== --- lib/shell/builtin-command.rb (revision 56370) +++ lib/shell/builtin-command.rb (revision 56371) @@ -13,7 +13,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/shell/builtin-command.rb#L13 require "shell/filter" class Shell - class BuiltInCommand<Filter + class BuiltInCommand < Filter def wait? false end Index: lib/prime.rb =================================================================== --- lib/prime.rb (revision 56370) +++ lib/prime.rb (revision 56371) @@ -324,7 +324,7 @@ class Prime https://github.com/ruby/ruby/blob/trunk/lib/prime.rb#L324 # An implementation of +PseudoPrimeGenerator+ which uses # a prime table generated by trial division. - class TrialDivisionGenerator<PseudoPrimeGenerator + class TrialDivisionGenerator < PseudoPrimeGenerator def initialize @index = -1 super @@ -345,7 +345,7 @@ class Prime https://github.com/ruby/ruby/blob/trunk/lib/prime.rb#L345 # This is a pseudo-prime generator, suitable on # checking primality of an integer by brute force # method. - class Generator23<PseudoPrimeGenerator + class Generator23 < PseudoPrimeGenerator def initialize @prime = 1 @step = nil -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/