ruby-changes:44864
From: nobu <ko1@a...>
Date: Wed, 30 Nov 2016 01:07:00 +0900 (JST)
Subject: [ruby-changes:44864] nobu:r56937 (trunk): get rid of ambiguous parentheses warnings
nobu 2016-11-30 01:06:54 +0900 (Wed, 30 Nov 2016) New Revision: 56937 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=56937 Log: get rid of ambiguous parentheses warnings Modified files: trunk/benchmark/bm_so_fasta.rb trunk/benchmark/bm_so_meteor_contest.rb trunk/benchmark/bm_so_pidigits.rb trunk/lib/matrix/lup_decomposition.rb trunk/lib/shell/filter.rb trunk/sample/cbreak.rb trunk/test/ruby/enc/test_case_comprehensive.rb trunk/test/ruby/enc/test_case_options.rb trunk/test/ruby/test_complex.rb trunk/test/ruby/test_complexrational.rb trunk/test/ruby/test_rational.rb trunk/tool/gen_ruby_tapset.rb Index: benchmark/bm_so_meteor_contest.rb =================================================================== --- benchmark/bm_so_meteor_contest.rb (revision 56936) +++ benchmark/bm_so_meteor_contest.rb (revision 56937) @@ -155,7 +155,7 @@ class Rotation https://github.com/ruby/ruby/blob/trunk/benchmark/bm_so_meteor_contest.rb#L155 # given a set of directions places the piece (as defined by a set of directions) on the board at # a location that will not take it off the edge - def get_values ( directions ) + def get_values( directions ) start = start_adjust(directions) values = [ start ] directions.each do | direction | Property changes on: benchmark/bm_so_meteor_contest.rb ___________________________________________________________________ Added: svn:executable + * Index: benchmark/bm_so_pidigits.rb =================================================================== --- benchmark/bm_so_pidigits.rb (revision 56936) +++ benchmark/bm_so_pidigits.rb (revision 56937) @@ -38,7 +38,7 @@ end https://github.com/ruby/ruby/blob/trunk/benchmark/bm_so_pidigits.rb#L38 class Transformation attr_reader :q, :r, :s, :t - def initialize (q, r, s, t) + def initialize(q, r, s, t) @q,@r,@s,@t,@k = q,r,s,t,0 end Index: benchmark/bm_so_fasta.rb =================================================================== --- benchmark/bm_so_fasta.rb (revision 56936) +++ benchmark/bm_so_fasta.rb (revision 56937) @@ -3,7 +3,7 @@ https://github.com/ruby/ruby/blob/trunk/benchmark/bm_so_fasta.rb#L3 # Contributed by Sokolov Yura $last = 42.0 -def gen_random (max,im=139968,ia=3877,ic=29573) +def gen_random(max, im=139968, ia=3877, ic=29573) (max * ($last = ($last * ia + ic) % im)) / im end Index: lib/matrix/lup_decomposition.rb =================================================================== --- lib/matrix/lup_decomposition.rb (revision 56936) +++ lib/matrix/lup_decomposition.rb (revision 56937) @@ -64,7 +64,7 @@ class Matrix https://github.com/ruby/ruby/blob/trunk/lib/matrix/lup_decomposition.rb#L64 # Returns +true+ if +U+, and hence +A+, is singular. - def singular? () + def singular? @column_count.times do |j| if (@lu[j][j] == 0) return true Index: lib/shell/filter.rb =================================================================== --- lib/shell/filter.rb (revision 56936) +++ lib/shell/filter.rb (revision 56937) @@ -47,7 +47,7 @@ class Shell #:nodoc: https://github.com/ruby/ruby/blob/trunk/lib/shell/filter.rb#L47 # # Inputs from +source+, which is either a string of a file name or an IO # object. - def < (src) + def <(src) case src when String cat = Cat.new(@shell, src) @@ -65,7 +65,7 @@ class Shell #:nodoc: https://github.com/ruby/ruby/blob/trunk/lib/shell/filter.rb#L65 # # Outputs from +source+, which is either a string of a file name or an IO # object. - def > (to) + def >(to) case to when String dst = @shell.open(to, "w") @@ -87,7 +87,7 @@ class Shell #:nodoc: https://github.com/ruby/ruby/blob/trunk/lib/shell/filter.rb#L87 # # Appends the output to +source+, which is either a string of a file name # or an IO object. - def >> (to) + def >>(to) begin Shell.cd(@shell.pwd).append(to, self) rescue CantApplyMethod @@ -99,7 +99,7 @@ class Shell #:nodoc: https://github.com/ruby/ruby/blob/trunk/lib/shell/filter.rb#L99 # | filter # # Processes a pipeline. - def | (filter) + def |(filter) filter.input = self if active? @shell.process_controller.start_job filter @@ -111,7 +111,7 @@ class Shell #:nodoc: https://github.com/ruby/ruby/blob/trunk/lib/shell/filter.rb#L111 # filter1 + filter2 # # Outputs +filter1+, and then +filter2+ using Join.new - def + (filter) + def +(filter) Join.new(@shell, self, filter) end Index: sample/cbreak.rb =================================================================== --- sample/cbreak.rb (revision 56936) +++ sample/cbreak.rb (revision 56937) @@ -5,15 +5,15 @@ ECHO = 0x00000008 https://github.com/ruby/ruby/blob/trunk/sample/cbreak.rb#L5 TIOCGETP = 0x40067408 TIOCSETP = 0x80067409 -def cbreak () +def cbreak set_cbreak(true) end -def cooked () +def cooked set_cbreak(false) end -def set_cbreak (on) +def set_cbreak(on) tty = "\0" * 256 STDIN.ioctl(TIOCGETP, tty) ttys = tty.unpack("C4 S") Index: tool/gen_ruby_tapset.rb =================================================================== --- tool/gen_ruby_tapset.rb (revision 56936) +++ tool/gen_ruby_tapset.rb (revision 56937) @@ -5,7 +5,7 @@ https://github.com/ruby/ruby/blob/trunk/tool/gen_ruby_tapset.rb#L5 require "optparse" -def set_argument (argname, nth) +def set_argument(argname, nth) # remove C style type info argname.gsub!(/.+ (.+)/, '\1') # e.g. char *hoge -> *hoge argname.gsub!(/^\*/, '') # e.g. *filename -> filename Index: test/ruby/enc/test_case_comprehensive.rb =================================================================== --- test/ruby/enc/test_case_comprehensive.rb (revision 56936) +++ test/ruby/enc/test_case_comprehensive.rb (revision 56937) @@ -35,7 +35,7 @@ TestComprehensiveCaseFold.data_files_ava https://github.com/ruby/ruby/blob/trunk/test/ruby/enc/test_case_comprehensive.rb#L35 end end - def self.read_data_file (filename) + def self.read_data_file(filename) IO.foreach(expand_filename(filename), encoding: Encoding::ASCII_8BIT) do |line| if $. == 1 if filename == 'UnicodeData' @@ -140,7 +140,7 @@ TestComprehensiveCaseFold.data_files_ava https://github.com/ruby/ruby/blob/trunk/test/ruby/enc/test_case_comprehensive.rb#L140 @@tests ||= [] end - def self.generate_unicode_case_mapping_tests (encoding) + def self.generate_unicode_case_mapping_tests(encoding) all_tests.each do |test| attributes = test.attributes.map(&:to_s).join '-' attributes.prepend '_' unless attributes.empty? @@ -158,7 +158,7 @@ TestComprehensiveCaseFold.data_files_ava https://github.com/ruby/ruby/blob/trunk/test/ruby/enc/test_case_comprehensive.rb#L158 end end - def self.generate_case_mapping_tests (encoding) + def self.generate_case_mapping_tests(encoding) all_tests # preselect codepoints to speed up testing for small encodings codepoints = @@codepoints.select do |code| @@ -200,7 +200,7 @@ TestComprehensiveCaseFold.data_files_ava https://github.com/ruby/ruby/blob/trunk/test/ruby/enc/test_case_comprehensive.rb#L200 end # test for encodings that don't yet (or will never) deal with non-ASCII characters - def self.generate_ascii_only_case_mapping_tests (encoding) + def self.generate_ascii_only_case_mapping_tests(encoding) all_tests # preselect codepoints to speed up testing for small encodings codepoints = @@codepoints.select do |code| Index: test/ruby/enc/test_case_options.rb =================================================================== --- test/ruby/enc/test_case_options.rb (revision 56936) +++ test/ruby/enc/test_case_options.rb (revision 56937) @@ -3,21 +3,21 @@ https://github.com/ruby/ruby/blob/trunk/test/ruby/enc/test_case_options.rb#L3 require "test/unit" class TestCaseOptions < Test::Unit::TestCase - def assert_raise_functional_operations (arg, *options) + def assert_raise_functional_operations(arg, *options) assert_raise(ArgumentError) { arg.upcase(*options) } assert_raise(ArgumentError) { arg.downcase(*options) } assert_raise(ArgumentError) { arg.capitalize(*options) } assert_raise(ArgumentError) { arg.swapcase(*options) } end - def assert_raise_bang_operations (arg, *options) + def assert_raise_bang_operations(arg, *options) assert_raise(ArgumentError) { arg.upcase!(*options) } assert_raise(ArgumentError) { arg.downcase!(*options) } assert_raise(ArgumentError) { arg.capitalize!(*options) } assert_raise(ArgumentError) { arg.swapcase!(*options) } end - def assert_raise_both_types (*options) + def assert_raise_both_types(*options) assert_raise_functional_operations 'a', *options assert_raise_bang_operations 'a', *options assert_raise_functional_operations :a, *options @@ -35,21 +35,21 @@ class TestCaseOptions < Test::Unit::Test https://github.com/ruby/ruby/blob/trunk/test/ruby/enc/test_case_options.rb#L35 assert_raise_both_types :lithuanian, :ascii end - def assert_okay_functional_operations (arg, *options) + def assert_okay_functional_operations(arg, *options) assert_nothing_raised { arg.upcase(*options) } assert_nothing_raised { arg.downcase(*options) } assert_nothing_raised { arg.capitalize(*options) } assert_nothing_raised { arg.swapcase(*options) } end - def assert_okay_bang_operations (arg, *options) + def assert_okay_bang_operations(arg, *options) assert_nothing_raised { arg.upcase!(*options) } assert_nothing_raised { arg.downcase!(*options) } assert_nothing_raised { arg.capitalize!(*options) } assert_nothing_raised { arg.swapcase!(*options) } end - def assert_okay_both_types (*options) + def assert_okay_both_types(*options) assert_okay_functional_operations 'a', *options assert_okay_bang_operations 'a', *options assert_okay_functional_operations :a, *options Index: test/ruby/test_complexrational.rb =================================================================== --- test/ruby/test_complexrational.rb (revision 56936) +++ test/ruby/test_complexrational.rb (revision 56937) @@ -214,10 +214,10 @@ class SimpleRat < Numeric https://github.com/ruby/ruby/blob/trunk/test/ruby/test_complexrational.rb#L214 def numerator() @num end def denominator() @den end - def +@ () self end - def -@ () self.class.new(-@num, @den) end + def +@() self end + def -@() self.class.new(-@num, @den) end - def + (o) + def +(o) case o when SimpleRat, Rational a = @num * o.denominator @@ -233,7 +233,7 @@ class SimpleRat < Numeric https://github.com/ruby/ruby/blob/trunk/test/ruby/test_complexrational.rb#L233 end end - def - (o) + def -(o) case o when SimpleRat, Rational a = @num * o.denominator @@ -249,7 +249,7 @@ class SimpleRat < Numeric https://github.com/ruby/ruby/blob/trunk/test/ruby/test_complexrational.rb#L249 end end - def * (o) + def *(o) case o when SimpleRat, Rational a = @num * o.numerator @@ -334,7 +334,7 @@ class SimpleRat < Numeric https://github.com/ruby/ruby/blob/trunk/test/ruby/test_complexrational.rb#L334 def divmod(o) [div(o), modulo(o)] end def quotrem(o) [quot(o), remainder(o)] end - def ** (o) + def **(o) case o when SimpleRat, Rational Float(self) ** o @@ -357,7 +357,7 @@ class SimpleRat < Numeric https://github.com/ruby/ruby/blob/trunk/test/ruby/test_complexrational.rb#L357 end end - def <=> (o) + def <=>(o) case o when SimpleRat, Rational a = @num * o.denominator @@ -373,7 +373,7 @@ class SimpleRat < Numeric https://github.com/ruby/ruby/blob/trunk/test/ruby/test_complexrational.rb#L373 end end - def == (o) + def ==(o) begin (self <=> o) == 0 rescue Index: test/ruby/test_rational.rb =================================================================== --- test/ruby/test_rational.rb (revision 56936) +++ test/ruby/test_rational.rb (revision 56937) @@ -567,7 +567,7 @@ class Rational_Test < Test::Unit::TestCa https://github.com/ruby/ruby/blob/trunk/test/ruby/test_rational.rb#L567 end class ObjectX - def + (x) Rational(1) end + def +(x) Rational(1) end alias - + alias * + alias / + Index: test/ruby/test_complex.rb =================================================================== --- test/ruby/test_complex.rb (revision 56936) +++ test/ruby/test_complex.rb (revision 56937) @@ -434,7 +434,7 @@ class Complex_Test < Test::Unit::TestCas https://github.com/ruby/ruby/blob/trunk/test/ruby/test_complex.rb#L434 end class ObjectX - def + (x) Rational(1) end + def +(x) Rational(1) end alias - + alias * + alias / + -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/