ruby-changes:31487
From: zzak <ko1@a...>
Date: Fri, 8 Nov 2013 01:03:55 +0900 (JST)
Subject: [ruby-changes:31487] zzak:r43566 (trunk): * golf_prelude.rb: syntax formatting for whitespace [Fixes GH-425]
zzak 2013-11-08 01:03:48 +0900 (Fri, 08 Nov 2013) New Revision: 43566 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=43566 Log: * golf_prelude.rb: syntax formatting for whitespace [Fixes GH-425] Patch by @edward https://github.com/ruby/ruby/pull/425 Modified files: trunk/ChangeLog trunk/golf_prelude.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 43565) +++ ChangeLog (revision 43566) @@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Fri Nov 8 01:01:54 2013 Zachary Scott <e@z...> + + * golf_prelude.rb: syntax formatting for whitespace [Fixes GH-425] + Patch by @edward https://github.com/ruby/ruby/pull/425 + Thu Nov 7 19:36:09 2013 Koichi Sasada <ko1@a...> * gc.c: modify malloc_limit strategy. Index: golf_prelude.rb =================================================================== --- golf_prelude.rb (revision 43565) +++ golf_prelude.rb (revision 43566) @@ -1,7 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/golf_prelude.rb#L1 class Object @@golf_hash = {} + def method_missing m, *a, &b - t = @@golf_hash[ [m,self.class] ] ||= matching_methods(m)[0] + t = @@golf_hash[ [m, self.class] ] ||= matching_methods(m)[0] if t && b __send__(t, *a) {|*args| b.binding.eval("proc{|golf_matchdata| $~ = golf_matchdata }").call($~) if $~ @@ -12,27 +13,27 @@ class Object https://github.com/ruby/ruby/blob/trunk/golf_prelude.rb#L13 end end - def matching_methods(s='', m=callable_methods) - r=/^#{s.to_s.gsub(/./){"(.*?)"+Regexp.escape($&)}}/ + def matching_methods(s = '', m = callable_methods) + r = /^#{s.to_s.gsub(/./){"(.*?)" + Regexp.escape($&)}}/ m.grep(r).sort_by do |i| i.to_s.match(r).captures.map(&:size) << i end end def self.const_missing c - t = @@golf_hash[ [c,self.class] ] ||= matching_methods(c,constants)[0] + t = @@golf_hash[ [c,self.class] ] ||= matching_methods(c, constants)[0] t and return const_get(t) raise NameError, "uninitialized constant #{c}", caller(1) end - def shortest_abbreviation(s='', m=callable_methods) - s=s.to_s - our_case = (?A..?Z)===s[0] + def shortest_abbreviation(s = '', m = callable_methods) + s = s.to_s + our_case = (?A..?Z) === s[0] if m.index(s.to_sym) - 1.upto(s.size){|z|s.scan(/./).combination(z).map{|trial| - next unless ((?A..?Z)===trial[0]) == our_case - trial*='' - return trial if matching_methods(trial,m)[0].to_s==s + 1.upto(s.size){|z| s.scan(/./).combination(z).map{|trial| + next unless ((?A..?Z) === trial[0]) == our_case + trial *= '' + return trial if matching_methods(trial, m)[0].to_s == s }} else nil @@ -45,7 +46,7 @@ class Object https://github.com/ruby/ruby/blob/trunk/golf_prelude.rb#L46 private - def h(a='H', b='w', c='!') + def h(a = 'H', b = 'w', c = '!') puts "#{a}ello, #{b}orld#{c}" end @@ -84,14 +85,14 @@ class String https://github.com/ruby/ruby/blob/trunk/golf_prelude.rb#L85 split('') end - (Array.instance_methods-instance_methods-[:to_ary,:transpose,:flatten,:flatten!,:compact,:compact!,:assoc,:rassoc]).each{|meth| - eval" + (Array.instance_methods - instance_methods - [:to_ary, :transpose, :flatten, :flatten!, :compact, :compact!, :assoc, :rassoc]).each{|meth| + eval " def #{meth}(*args, &block) - a=to_a + a = to_a result = a.#{meth}(*args, &block) replace(a.join) if result.class == Array - Integer===result[0] ? result.pack('c*') : result.join + Integer === result[0] ? result.pack('c*') : result.join elsif result.class == Enumerator result.map(&:join).to_enum else @@ -103,8 +104,8 @@ end https://github.com/ruby/ruby/blob/trunk/golf_prelude.rb#L104 class Enumerator alias old_to_s to_s - (Array.instance_methods-instance_methods-[:replace]+[:to_s]).each{|meth| - eval" + (Array.instance_methods - instance_methods - [:replace] + [:to_s]).each{|meth| + eval " def #{meth}(*args, &block) to_a.#{meth}(*args, &block) end" -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/