Skip to content

Commit

Permalink
* golf_prelude.rb: syntax formatting for whitespace [Fixes rubyGH-425]
Browse files Browse the repository at this point in the history
  Patch by @edward ruby#425


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43566 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
zzak committed Nov 7, 2013
1 parent d3dce7d commit 269f5e2
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 18 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Fri Nov 8 01:01:54 2013 Zachary Scott <e@zzak.io>

* 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@atdot.net>

* gc.c: modify malloc_limit strategy.
Expand Down
37 changes: 19 additions & 18 deletions golf_prelude.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
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 $~
Expand All @@ -12,27 +13,27 @@ def method_missing m, *a, &b
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
Expand All @@ -45,7 +46,7 @@ def callable_methods

private

def h(a='H', b='w', c='!')
def h(a = 'H', b = 'w', c = '!')
puts "#{a}ello, #{b}orld#{c}"
end

Expand Down Expand Up @@ -84,14 +85,14 @@ def to_a
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
Expand All @@ -103,8 +104,8 @@ def #{meth}(*args, &block)

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"
Expand Down

0 comments on commit 269f5e2

Please sign in to comment.