mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
consistent parentheses in assignment RHS.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4790 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
3ec0bc3828
commit
8ef5da3be1
26 changed files with 48 additions and 48 deletions
|
@ -14,7 +14,7 @@ def uname_s
|
|||
case Config::CONFIG['host_os']
|
||||
when 'cygwin'
|
||||
require 'Win32API'
|
||||
uname = Win32API.new 'cygwin1', 'uname', 'P', 'I'
|
||||
uname = Win32API.new('cygwin1', 'uname', 'P', 'I')
|
||||
utsname = ' ' * 100
|
||||
raise 'cannot get system name' if uname.call(utsname) == -1
|
||||
|
||||
|
|
|
@ -79,7 +79,7 @@ module DL
|
|||
symty = rty + ty
|
||||
|
||||
module_eval("module_function :#{func}")
|
||||
sym = module_eval [
|
||||
sym = module_eval([
|
||||
"DL::callback(\"#{symty}\"){|*args|",
|
||||
" sym,rdec,enc,dec = @SYM['#{func}']",
|
||||
" args = enc.call(args) if enc",
|
||||
|
@ -90,7 +90,7 @@ module DL
|
|||
" @args = rs",
|
||||
" @retval",
|
||||
"}",
|
||||
].join("\n")
|
||||
].join("\n"))
|
||||
|
||||
@SYM[func] = [sym,rdec,enc,dec]
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@ module LIBC
|
|||
def my_compare(ptr1, ptr2)
|
||||
ptr1.ptr.to_s <=> ptr2.ptr.to_s
|
||||
end
|
||||
COMPARE = callback "int my_compare(char**, char**)"
|
||||
COMPARE = callback("int my_compare(char**, char**)")
|
||||
end
|
||||
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@ def uname_s
|
|||
case Config::CONFIG['host_os']
|
||||
when 'cygwin'
|
||||
require 'Win32API'
|
||||
uname = Win32API.new 'cygwin1', 'uname', 'P', 'I'
|
||||
uname = Win32API.new('cygwin1', 'uname', 'P', 'I')
|
||||
utsname = ' ' * 100
|
||||
raise 'cannot get system name' if uname.call(utsname) == -1
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@ def uname_s
|
|||
case Config::CONFIG['host_os']
|
||||
when 'cygwin'
|
||||
require 'Win32API'
|
||||
uname = Win32API.new 'cygwin1', 'uname', 'P', 'I'
|
||||
uname = Win32API.new('cygwin1', 'uname', 'P', 'I')
|
||||
utsname = ' ' * 100
|
||||
raise 'cannot get system name' if uname.call(utsname) == -1
|
||||
|
||||
|
|
|
@ -1388,7 +1388,7 @@ module Tk
|
|||
end
|
||||
end
|
||||
def group(*args)
|
||||
w = tk_call 'wm', 'group', path, *args
|
||||
w = tk_call('wm', 'group', path, *args)
|
||||
if args.size == 0
|
||||
window(w)
|
||||
else
|
||||
|
@ -3303,7 +3303,7 @@ module TkOptionDB
|
|||
proc_str = '{' + proc_str + '}' unless /\A\{.*\}\Z/ =~ proc_str
|
||||
proc_str = __closed_block_check__(proc_str)
|
||||
proc_str = __check_proc_string__(proc_str)
|
||||
res_proc = eval 'Proc.new' + proc_str
|
||||
res_proc = eval('Proc.new' + proc_str)
|
||||
self::METHOD_TBL[id] = res_proc
|
||||
end
|
||||
proc{
|
||||
|
|
|
@ -5651,7 +5651,7 @@ class Microsoft_XMLDOM_1_0 # DOMDocument
|
|||
@clsid = "{2933BF90-7B36-11D2-B20E-00C04F983E60}"
|
||||
@progid = "Microsoft.XMLDOM.1.0"
|
||||
if obj.nil?
|
||||
@dispatch = WIN32OLE.new @progid
|
||||
@dispatch = WIN32OLE.new(@progid)
|
||||
else
|
||||
@dispatch = obj
|
||||
end
|
||||
|
@ -6258,7 +6258,7 @@ class Microsoft_FreeThreadedXMLDOM_1_0 # DOMFreeThreadedDocument
|
|||
@clsid = "{2933BF91-7B36-11D2-B20E-00C04F983E60}"
|
||||
@progid = "Microsoft.FreeThreadedXMLDOM.1.0"
|
||||
if obj.nil?
|
||||
@dispatch = WIN32OLE.new @progid
|
||||
@dispatch = WIN32OLE.new(@progid)
|
||||
else
|
||||
@dispatch = obj
|
||||
end
|
||||
|
@ -6992,7 +6992,7 @@ class Microsoft_XMLHTTP_1 # XMLHTTPRequest
|
|||
@clsid = "{ED8C108E-4349-11D2-91A4-00C04F7969E8}"
|
||||
@progid = "Microsoft.XMLHTTP.1"
|
||||
if obj.nil?
|
||||
@dispatch = WIN32OLE.new @progid
|
||||
@dispatch = WIN32OLE.new(@progid)
|
||||
else
|
||||
@dispatch = obj
|
||||
end
|
||||
|
@ -7136,7 +7136,7 @@ class Microsoft_XMLDSO_1_0 # XMLDSOControl
|
|||
@clsid = "{550DDA30-0541-11D2-9CA9-0060B0EC3D39}"
|
||||
@progid = "Microsoft.XMLDSO.1.0"
|
||||
if obj.nil?
|
||||
@dispatch = WIN32OLE.new @progid
|
||||
@dispatch = WIN32OLE.new(@progid)
|
||||
else
|
||||
@dispatch = obj
|
||||
end
|
||||
|
@ -7207,7 +7207,7 @@ class Msxml # XMLDocument
|
|||
@clsid = "{CFC399AF-D876-11D0-9C10-00C04FC99C8E}"
|
||||
@progid = "Msxml"
|
||||
if obj.nil?
|
||||
@dispatch = WIN32OLE.new @progid
|
||||
@dispatch = WIN32OLE.new(@progid)
|
||||
else
|
||||
@dispatch = obj
|
||||
end
|
||||
|
|
|
@ -2302,8 +2302,8 @@ class CGI
|
|||
else
|
||||
at_exit() do
|
||||
if defined?(CGI_PARAMS)
|
||||
self.class.class_eval("remove_const(:CGI_PARAMS)")
|
||||
self.class.class_eval("remove_const(:CGI_COOKIES)")
|
||||
CGI.class_eval("remove_const(:CGI_PARAMS)")
|
||||
CGI.class_eval("remove_const(:CGI_COOKIES)")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -69,7 +69,7 @@ class CGI
|
|||
unless File::exist? path
|
||||
@hash = {}
|
||||
end
|
||||
@p = ::PStore.new path
|
||||
@p = ::PStore.new(path)
|
||||
end
|
||||
|
||||
# Restore session state from the session's PStore file.
|
||||
|
@ -114,7 +114,7 @@ if $0 == __FILE__
|
|||
# :enddoc:
|
||||
STDIN.reopen("/dev/null")
|
||||
cgi = CGI.new
|
||||
session = CGI::Session.new cgi, 'database_manager' => CGI::Session::PStore
|
||||
session = CGI::Session.new(cgi, 'database_manager' => CGI::Session::PStore)
|
||||
session['key'] = {'k' => 'v'}
|
||||
puts session['key'].class
|
||||
fail unless Hash === session['key']
|
||||
|
|
|
@ -3,7 +3,7 @@ module IRB
|
|||
module ExtendCommand
|
||||
class Fork<Nop
|
||||
def execute(&block)
|
||||
pid = send ExtendCommand.irb_original_method_name("fork")
|
||||
pid = send(ExtendCommand.irb_original_method_name("fork"))
|
||||
unless pid
|
||||
class<<self
|
||||
alias_method :exit, ExtendCommand.irb_original_method_name('exit')
|
||||
|
|
|
@ -112,7 +112,7 @@ module IRB
|
|||
select_message(receiver, message, candidates)
|
||||
|
||||
when /^(\$[^.]*)$/
|
||||
candidates = global_variables.grep Regexp.new(Regexp.quote($1))
|
||||
candidates = global_variables.grep(Regexp.new(Regexp.quote($1)))
|
||||
|
||||
# when /^(\$?(\.?[^.]+)+)\.([^.]*)$/
|
||||
when /^((\.?[^.]+)+)\.([^.]*)$/
|
||||
|
@ -120,9 +120,9 @@ module IRB
|
|||
receiver = $1
|
||||
message = Regexp.quote($3)
|
||||
|
||||
gv = eval "global_variables", bind
|
||||
lv = eval "local_variables", bind
|
||||
cv = eval "self.class.constants", bind
|
||||
gv = eval("global_variables", bind)
|
||||
lv = eval("local_variables", bind)
|
||||
cv = eval("self.class.constants", bind)
|
||||
|
||||
if (gv | lv | cv).include?(receiver)
|
||||
# foo.func and foo is local var.
|
||||
|
|
|
@ -56,7 +56,7 @@ EOF
|
|||
end
|
||||
end
|
||||
if main.empty?
|
||||
@main = eval "self", @binding
|
||||
@main = eval("self", @binding)
|
||||
else
|
||||
@main = main[0]
|
||||
IRB.conf[:__MAIN__] = @main
|
||||
|
|
|
@ -797,7 +797,7 @@ def create_makefile(target, srcprefix = nil)
|
|||
deffile = EXPORT_PREFIX + origdef
|
||||
unless File.exist? deffile
|
||||
if File.exist? File.join(srcdir, deffile)
|
||||
deffile = File.join srcdir, deffile
|
||||
deffile = File.join(srcdir, deffile)
|
||||
elsif !EXPORT_PREFIX.empty? and File.exist?(origdef = File.join(srcdir, origdef))
|
||||
open(origdef) do |d|
|
||||
open(deffile, 'wb') do |f|
|
||||
|
|
|
@ -313,7 +313,7 @@ module Net # :nodoc:
|
|||
end
|
||||
hexvals = line.unpack('H*')[0]
|
||||
hexvals += ' ' * (32 - hexvals.length)
|
||||
hexvals = format "%s %s %s %s " * 4, *hexvals.unpack('a2' * 16)
|
||||
hexvals = format("%s %s %s %s " * 4, *hexvals.unpack('a2' * 16))
|
||||
line = line.gsub(/[\000-\037\177-\377]/n, '.')
|
||||
printf "%s 0x%5.5x: %s%s\n", dir, addr, hexvals, line
|
||||
addr += 16
|
||||
|
|
|
@ -1155,7 +1155,7 @@ class Resolv
|
|||
len, = self.get_unpack('n')
|
||||
save_limit = @limit
|
||||
@limit = @index + len
|
||||
d = yield len
|
||||
d = yield(len)
|
||||
if @index < @limit
|
||||
raise DecodeError.new("junk exist")
|
||||
elsif @limit < @index
|
||||
|
|
|
@ -48,7 +48,7 @@ module REXML
|
|||
|
||||
def EntityDecl.parse_source source, listener
|
||||
md = source.match( PATTERN_RE, true )
|
||||
thing = md[0].squeeze " \t\n\r"
|
||||
thing = md[0].squeeze(" \t\n\r")
|
||||
listener.send inspect.downcase, thing
|
||||
end
|
||||
end
|
||||
|
|
|
@ -31,7 +31,7 @@ module REXML
|
|||
|
||||
def NotationDecl.parse_source source, listener
|
||||
md = source.match( PATTERN_RE, true )
|
||||
thing = md[0].squeeze " \t\n\r"
|
||||
thing = md[0].squeeze(" \t\n\r")
|
||||
listener.send inspect.downcase, thing
|
||||
end
|
||||
end
|
||||
|
|
|
@ -52,8 +52,8 @@ module REXML
|
|||
def initialize( arg = UNDEFINED, parent=nil, context=nil )
|
||||
super(parent)
|
||||
|
||||
@elements = Elements.new self
|
||||
@attributes = Attributes.new self
|
||||
@elements = Elements.new(self)
|
||||
@attributes = Attributes.new(self)
|
||||
@context = context
|
||||
|
||||
if arg.kind_of? String
|
||||
|
@ -253,7 +253,7 @@ module REXML
|
|||
# el = Element.new 'my-tag'
|
||||
# doc.add_element el
|
||||
def add_element element=nil, attrs=nil
|
||||
el = @elements.add element
|
||||
el = @elements.add(element)
|
||||
if attrs.kind_of? Hash
|
||||
attrs.each do |key, value|
|
||||
el.attributes[key]=value if key =~ /^xmlns:/
|
||||
|
@ -412,7 +412,7 @@ module REXML
|
|||
# # The element 'p' has two text elements, "some text " and " more text".
|
||||
# doc.root.text #-> "some text "
|
||||
def text( path = nil )
|
||||
rv = get_text path
|
||||
rv = get_text(path)
|
||||
return rv.value unless rv.nil?
|
||||
nil
|
||||
end
|
||||
|
@ -724,7 +724,7 @@ module REXML
|
|||
def []( index, name=nil)
|
||||
if index.kind_of? Integer
|
||||
raise "index (#{index}) must be >= 1" if index < 1
|
||||
name = literalize name if name
|
||||
name = literalize(name) if name
|
||||
num = 0
|
||||
child = nil
|
||||
@element.find { |child|
|
||||
|
@ -1016,13 +1016,13 @@ module REXML
|
|||
# doc.root.attributes['x:foo'] = nil
|
||||
def []=( name, value )
|
||||
if value.nil? # Delete the named attribute
|
||||
attr = get_attribute name
|
||||
attr = get_attribute(name)
|
||||
delete attr
|
||||
return
|
||||
end
|
||||
value = Attribute.new(name, value) unless value.kind_of? Attribute
|
||||
value.element = @element
|
||||
old_attr = fetch value.name, nil
|
||||
old_attr = fetch(value.name, nil)
|
||||
if old_attr.nil?
|
||||
store(value.name, value)
|
||||
elsif old_attr.kind_of? Hash
|
||||
|
@ -1104,7 +1104,7 @@ module REXML
|
|||
prefix, name = $1, $2
|
||||
prefix = '' unless prefix
|
||||
end
|
||||
old = fetch name, nil
|
||||
old = fetch(name, nil)
|
||||
attr = nil
|
||||
if old.kind_of? Hash # the supplied attribute is one of many
|
||||
attr = old.delete(prefix)
|
||||
|
|
|
@ -135,8 +135,8 @@ module REXML
|
|||
end
|
||||
|
||||
def text=( foo )
|
||||
replace = at(4).kind_of? String ? 1 : 0
|
||||
self._old_put(4,replace, normalizefoo)
|
||||
replace = at(4).kind_of?(String) ? 1 : 0
|
||||
_old_put(4, replace, normalizefoo)
|
||||
end
|
||||
|
||||
def root
|
||||
|
|
|
@ -102,7 +102,7 @@ module REXML
|
|||
# @return the current line in the source
|
||||
def current_line
|
||||
lines = @orig.split
|
||||
res = lines.grep @buffer[0..30]
|
||||
res = lines.grep(@buffer[0..30])
|
||||
res = res[-1] if res.kind_of? Array
|
||||
lines.index( res ) if res
|
||||
end
|
||||
|
|
|
@ -245,7 +245,7 @@ module REXML
|
|||
def Text::unnormalize( string, doctype=nil, filter=nil, illegal=nil )
|
||||
rv = string.clone
|
||||
rv.gsub!( /\r\n?/, "\n" )
|
||||
matches = rv.scan REFERENCE
|
||||
matches = rv.scan(REFERENCE)
|
||||
return rv if matches.size == 0
|
||||
rv.gsub!( NUMERICENTITY ) {|m|
|
||||
m=$1
|
||||
|
|
|
@ -393,7 +393,7 @@ class Shell
|
|||
end]), nil, __FILE__, __LINE__ - 1)
|
||||
|
||||
else
|
||||
args = opts.collect{|opt| '"' + opt + '"'}.join ","
|
||||
args = opts.collect{|opt| '"' + opt + '"'}.join(",")
|
||||
eval((d = %Q[def #{ali}(*opts)
|
||||
@shell.__send__(:#{command}, #{args}, *opts)
|
||||
end]), nil, __FILE__, __LINE__ - 1)
|
||||
|
|
|
@ -165,7 +165,7 @@ class Shell
|
|||
return
|
||||
elsif @active_jobs.include?(command)
|
||||
begin
|
||||
r = command.kill sig
|
||||
r = command.kill(sig)
|
||||
ProcessController.inactivate(self)
|
||||
rescue
|
||||
print "Shell: Warn: $!\n" if @shell.verbose?
|
||||
|
|
|
@ -135,7 +135,7 @@ class Time
|
|||
#
|
||||
def parse(date, now=Time.now)
|
||||
year, mon, day, hour, min, sec, zone, _ = ParseDate.parsedate(date)
|
||||
year = yield year if year && block_given?
|
||||
year = yield(year) if year && block_given?
|
||||
|
||||
if now
|
||||
begin
|
||||
|
|
|
@ -111,7 +111,7 @@ module XMLRPC
|
|||
else
|
||||
begin
|
||||
mod = Module
|
||||
klass.split("::").each {|const| mod = mod.const_get const.strip }
|
||||
klass.split("::").each {|const| mod = mod.const_get(const.strip)}
|
||||
|
||||
Thread.critical = true
|
||||
# let initialize take 0 parameters
|
||||
|
|
|
@ -732,7 +732,7 @@ $x.sort!{|a,b| b-a} # reverse sort
|
|||
test_ok($x == [7,5,3,2,1])
|
||||
|
||||
# split test
|
||||
$x = "The Botest_ok of Mormon"
|
||||
$x = "The Book of Mormon"
|
||||
test_ok($x.split(//).reverse!.join == $x.reverse)
|
||||
test_ok($x.reverse == $x.reverse!)
|
||||
test_ok("1 byte string".split(//).reverse.join(":") == "g:n:i:r:t:s: :e:t:y:b: :1")
|
||||
|
@ -1233,14 +1233,14 @@ test_ok(2**32 - 5 == (2**32-3)-2)
|
|||
|
||||
$good = true;
|
||||
for i in 1000..1014
|
||||
$good = false if ((1<<i) != (2**i))
|
||||
$good = false if ((1 << i) != (2**i))
|
||||
end
|
||||
test_ok($good)
|
||||
|
||||
$good = true;
|
||||
n1=1<<1000
|
||||
n1= 1 << 1000
|
||||
for i in 1000..1014
|
||||
$good = false if ((1<<i) != n1)
|
||||
$good = false if ((1 << i) != n1)
|
||||
n1 *= 2
|
||||
end
|
||||
test_ok($good)
|
||||
|
|
Loading…
Reference in a new issue