From 6783f4c1b1d3536ca92421f0526c510cc3e1ab51 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 29 Nov 2016 16:06:54 +0000 Subject: get rid of ambiguous parentheses warnings git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56937 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- benchmark/bm_so_fasta.rb | 2 +- benchmark/bm_so_meteor_contest.rb | 2 +- benchmark/bm_so_pidigits.rb | 2 +- lib/matrix/lup_decomposition.rb | 2 +- lib/shell/filter.rb | 10 +++++----- sample/cbreak.rb | 6 +++--- test/ruby/enc/test_case_comprehensive.rb | 8 ++++---- test/ruby/enc/test_case_options.rb | 12 ++++++------ test/ruby/test_complex.rb | 2 +- test/ruby/test_complexrational.rb | 16 ++++++++-------- test/ruby/test_rational.rb | 2 +- tool/gen_ruby_tapset.rb | 2 +- 12 files changed, 33 insertions(+), 33 deletions(-) mode change 100644 => 100755 benchmark/bm_so_meteor_contest.rb diff --git a/benchmark/bm_so_fasta.rb b/benchmark/bm_so_fasta.rb index 3f759ba7ae..dcc6b39507 100644 --- a/benchmark/bm_so_fasta.rb +++ b/benchmark/bm_so_fasta.rb @@ -3,7 +3,7 @@ # 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 diff --git a/benchmark/bm_so_meteor_contest.rb b/benchmark/bm_so_meteor_contest.rb old mode 100644 new mode 100755 index 64a7d46afe..8c136baa6c --- a/benchmark/bm_so_meteor_contest.rb +++ b/benchmark/bm_so_meteor_contest.rb @@ -155,7 +155,7 @@ class Rotation # 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 | diff --git a/benchmark/bm_so_pidigits.rb b/benchmark/bm_so_pidigits.rb index c7d6fbfb4d..9a537b2d1c 100644 --- a/benchmark/bm_so_pidigits.rb +++ b/benchmark/bm_so_pidigits.rb @@ -38,7 +38,7 @@ end 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 diff --git a/lib/matrix/lup_decomposition.rb b/lib/matrix/lup_decomposition.rb index 9c1998fd36..c001770a12 100644 --- a/lib/matrix/lup_decomposition.rb +++ b/lib/matrix/lup_decomposition.rb @@ -64,7 +64,7 @@ class Matrix # 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 diff --git a/lib/shell/filter.rb b/lib/shell/filter.rb index c1f4b28a45..2c3ad40a48 100644 --- a/lib/shell/filter.rb +++ b/lib/shell/filter.rb @@ -47,7 +47,7 @@ class Shell #:nodoc: # # 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: # # 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: # # 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: # | 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: # filter1 + filter2 # # Outputs +filter1+, and then +filter2+ using Join.new - def + (filter) + def +(filter) Join.new(@shell, self, filter) end diff --git a/sample/cbreak.rb b/sample/cbreak.rb index 76b534a76a..c2246846b6 100644 --- a/sample/cbreak.rb +++ b/sample/cbreak.rb @@ -5,15 +5,15 @@ ECHO = 0x00000008 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") diff --git a/test/ruby/enc/test_case_comprehensive.rb b/test/ruby/enc/test_case_comprehensive.rb index 7176670881..2ee24f86c9 100644 --- a/test/ruby/enc/test_case_comprehensive.rb +++ b/test/ruby/enc/test_case_comprehensive.rb @@ -35,7 +35,7 @@ TestComprehensiveCaseFold.data_files_available? and class TestComprehensiveCase 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_available? and class TestComprehensiveCase @@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_available? and class TestComprehensiveCase 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_available? and class TestComprehensiveCase 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| diff --git a/test/ruby/enc/test_case_options.rb b/test/ruby/enc/test_case_options.rb index 761c92d51d..e9bf50fcfc 100644 --- a/test/ruby/enc/test_case_options.rb +++ b/test/ruby/enc/test_case_options.rb @@ -3,21 +3,21 @@ 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::TestCase 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 diff --git a/test/ruby/test_complex.rb b/test/ruby/test_complex.rb index a510a07dfa..5707047338 100644 --- a/test/ruby/test_complex.rb +++ b/test/ruby/test_complex.rb @@ -434,7 +434,7 @@ class Complex_Test < Test::Unit::TestCase end class ObjectX - def + (x) Rational(1) end + def +(x) Rational(1) end alias - + alias * + alias / + diff --git a/test/ruby/test_complexrational.rb b/test/ruby/test_complexrational.rb index 1e7622a351..0360f5ee42 100644 --- a/test/ruby/test_complexrational.rb +++ b/test/ruby/test_complexrational.rb @@ -214,10 +214,10 @@ class SimpleRat < Numeric 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 end end - def - (o) + def -(o) case o when SimpleRat, Rational a = @num * o.denominator @@ -249,7 +249,7 @@ class SimpleRat < Numeric end end - def * (o) + def *(o) case o when SimpleRat, Rational a = @num * o.numerator @@ -334,7 +334,7 @@ class SimpleRat < Numeric 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 end end - def <=> (o) + def <=>(o) case o when SimpleRat, Rational a = @num * o.denominator @@ -373,7 +373,7 @@ class SimpleRat < Numeric end end - def == (o) + def ==(o) begin (self <=> o) == 0 rescue diff --git a/test/ruby/test_rational.rb b/test/ruby/test_rational.rb index cf870ad3a2..168383a106 100644 --- a/test/ruby/test_rational.rb +++ b/test/ruby/test_rational.rb @@ -567,7 +567,7 @@ class Rational_Test < Test::Unit::TestCase end class ObjectX - def + (x) Rational(1) end + def +(x) Rational(1) end alias - + alias * + alias / + diff --git a/tool/gen_ruby_tapset.rb b/tool/gen_ruby_tapset.rb index ca4b09905a..ec8650204f 100755 --- a/tool/gen_ruby_tapset.rb +++ b/tool/gen_ruby_tapset.rb @@ -5,7 +5,7 @@ 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 -- cgit v1.2.3