зеркало из https://github.com/github/ruby.git
* benchmark/bm_so_meteor_contest.rb: [DOC] Fix a few typos
* ext/fiddle/lib/fiddle/import.rb: ditto * ext/psych/lib/psych.rb: ditto * ext/psych/lib/psych/nodes/sequence.rb: ditto * ext/tk/lib/multi-tk.rb: ditto * ext/tk/lib/tcltk.rb: ditto Closes GH-490 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44451 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
8ed9994cc9
Коммит
75f4731f90
|
@ -1,3 +1,12 @@
|
||||||
|
Sat Dec 28 17:24:00 2013 DV Suresh <e@dvsuresh.me>
|
||||||
|
|
||||||
|
* benchmark/bm_so_meteor_contest.rb: [DOC] Fix a few typos
|
||||||
|
* ext/fiddle/lib/fiddle/import.rb: ditto
|
||||||
|
* ext/psych/lib/psych.rb: ditto
|
||||||
|
* ext/psych/lib/psych/nodes/sequence.rb: ditto
|
||||||
|
* ext/tk/lib/multi-tk.rb: ditto
|
||||||
|
* ext/tk/lib/tcltk.rb: ditto
|
||||||
|
|
||||||
Sat Dec 28 00:42:37 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Sat Dec 28 00:42:37 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* parse.y (local_push_gen, local_pop_gen): save cmdarg_stack to
|
* parse.y (local_push_gen, local_pop_gen): save cmdarg_stack to
|
||||||
|
|
|
@ -32,7 +32,7 @@ class Rotation
|
||||||
@start_masks = Array.new(60)
|
@start_masks = Array.new(60)
|
||||||
|
|
||||||
# create the rotational masks by placing the base mask at the location and seeing if
|
# create the rotational masks by placing the base mask at the location and seeing if
|
||||||
# 1) it overlaps the boundries and 2) it produces a prunable board. if either of these
|
# 1) it overlaps the boundaries and 2) it produces a prunable board. if either of these
|
||||||
# is true the piece cannot be placed
|
# is true the piece cannot be placed
|
||||||
0.upto(59) do | offset |
|
0.upto(59) do | offset |
|
||||||
mask = is_even(offset) ? (@even_mask << offset) : (@odd_mask << offset)
|
mask = is_even(offset) ? (@even_mask << offset) : (@odd_mask << offset)
|
||||||
|
@ -328,7 +328,7 @@ def prunable( board, location, slotting = false)
|
||||||
collectors = []
|
collectors = []
|
||||||
# loop across the rows
|
# loop across the rows
|
||||||
(location / 6).to_i.upto(9) do | row_on |
|
(location / 6).to_i.upto(9) do | row_on |
|
||||||
# obtain a set of regions representing the bits of the curent row.
|
# obtain a set of regions representing the bits of the current row.
|
||||||
regions = $regions[(board >> (row_on * 6)) & 0b11111]
|
regions = $regions[(board >> (row_on * 6)) & 0b11111]
|
||||||
converter = $converter[row_on]
|
converter = $converter[row_on]
|
||||||
|
|
||||||
|
@ -370,7 +370,7 @@ def prunable( board, location, slotting = false)
|
||||||
end
|
end
|
||||||
|
|
||||||
# check the existing collectors, if any collector overlapped no bits in the region its [2] value will
|
# check the existing collectors, if any collector overlapped no bits in the region its [2] value will
|
||||||
# be zero. The size of any such reaason is tested if it is not a muliple of five true is returned since
|
# be zero. The size of any such reaason is tested if it is not a multiple of five true is returned since
|
||||||
# the board is prunable. if it is a multiple of five it is removed.
|
# the board is prunable. if it is a multiple of five it is removed.
|
||||||
# Collector that are still active have a new adjacent value [0] set based n the matched bits
|
# Collector that are still active have a new adjacent value [0] set based n the matched bits
|
||||||
# and have [2] cleared out for the next cycle.
|
# and have [2] cleared out for the next cycle.
|
||||||
|
@ -382,7 +382,7 @@ def prunable( board, location, slotting = false)
|
||||||
collectors[collector_num] = nil
|
collectors[collector_num] = nil
|
||||||
else
|
else
|
||||||
# if a collector matches all bits in the row then we can return unprunable early for the
|
# if a collector matches all bits in the row then we can return unprunable early for the
|
||||||
# follwing reasons:
|
# following reasons:
|
||||||
# 1) there can be no more unavailable bits bince we fill from the top left downward
|
# 1) there can be no more unavailable bits bince we fill from the top left downward
|
||||||
# 2) all previous regions have been closed or joined so only this region can fail
|
# 2) all previous regions have been closed or joined so only this region can fail
|
||||||
# 3) this region must be good since there can never be only 1 region that is nuot
|
# 3) this region must be good since there can never be only 1 region that is nuot
|
||||||
|
@ -526,7 +526,7 @@ def save( board_string)
|
||||||
@boards_found += 1
|
@boards_found += 1
|
||||||
|
|
||||||
# the exit motif is a time saver. Ideally the function should return, but those tests
|
# the exit motif is a time saver. Ideally the function should return, but those tests
|
||||||
# take noticable time (performance).
|
# take noticeable time (performance).
|
||||||
if (@boards_found == @stop_count) then
|
if (@boards_found == @stop_count) then
|
||||||
print_results
|
print_results
|
||||||
exit(0)
|
exit(0)
|
||||||
|
|
|
@ -63,7 +63,7 @@ module Fiddle
|
||||||
extend Importer
|
extend Importer
|
||||||
|
|
||||||
# Creates an array of handlers for the given +libs+, can be an instance of
|
# Creates an array of handlers for the given +libs+, can be an instance of
|
||||||
# Fiddle::Handle, Fiddle::Importer, or will create a new istance of
|
# Fiddle::Handle, Fiddle::Importer, or will create a new instance of
|
||||||
# Fiddle::Handle using Fiddle.dlopen
|
# Fiddle::Handle using Fiddle.dlopen
|
||||||
#
|
#
|
||||||
# Raises a DLError if the library cannot be loaded.
|
# Raises a DLError if the library cannot be loaded.
|
||||||
|
|
|
@ -135,7 +135,7 @@ require 'psych/handlers/document_stream'
|
||||||
# ==== Exception handling
|
# ==== Exception handling
|
||||||
#
|
#
|
||||||
# begin
|
# begin
|
||||||
# # The second argument chnages only the exception contents
|
# # The second argument changes only the exception contents
|
||||||
# Psych.parse("--- `", "file.txt")
|
# Psych.parse("--- `", "file.txt")
|
||||||
# rescue Psych::SyntaxError => ex
|
# rescue Psych::SyntaxError => ex
|
||||||
# ex.file # => 'file.txt'
|
# ex.file # => 'file.txt'
|
||||||
|
|
|
@ -56,7 +56,7 @@ module Psych
|
||||||
# Is this sequence started implicitly?
|
# Is this sequence started implicitly?
|
||||||
attr_accessor :implicit
|
attr_accessor :implicit
|
||||||
|
|
||||||
# The sequece style used
|
# The sequence style used
|
||||||
attr_accessor :style
|
attr_accessor :style
|
||||||
|
|
||||||
###
|
###
|
||||||
|
|
|
@ -148,7 +148,7 @@ class MultiTkIp
|
||||||
end
|
end
|
||||||
|
|
||||||
def delete(idx, &blk)
|
def delete(idx, &blk)
|
||||||
# if gets an entry, is permited to delete
|
# if gets an entry, is permitted to delete
|
||||||
if self[idx]
|
if self[idx]
|
||||||
@tbl.delete(idx)
|
@tbl.delete(idx)
|
||||||
elsif blk
|
elsif blk
|
||||||
|
|
|
@ -325,7 +325,7 @@ class TclTkCallback < TclTkObject
|
||||||
TclTk._addcallback(self)
|
TclTk._addcallback(self)
|
||||||
end
|
end
|
||||||
|
|
||||||
# to_eval(): retuens string representation for @ip._eval_args
|
# to_eval(): returns string representation for @ip._eval_args
|
||||||
def to_eval()
|
def to_eval()
|
||||||
if @arg
|
if @arg
|
||||||
# bind replaces %s before calling ruby_fmt, so %%s is used
|
# bind replaces %s before calling ruby_fmt, so %%s is used
|
||||||
|
@ -349,7 +349,7 @@ class TclTkImage < TclTkCommand
|
||||||
|
|
||||||
# initialize(interp, t, *args):
|
# initialize(interp, t, *args):
|
||||||
# generating image is done by TclTkImage.new()
|
# generating image is done by TclTkImage.new()
|
||||||
# destrying is done by image delete (inconsistent, sigh)
|
# destroying is done by image delete (inconsistent, sigh)
|
||||||
# interp: interpreter(TclTkInterpreter)
|
# interp: interpreter(TclTkInterpreter)
|
||||||
# t: image type (photo, bitmap, etc.)
|
# t: image type (photo, bitmap, etc.)
|
||||||
# *args: command argument
|
# *args: command argument
|
||||||
|
|
Загрузка…
Ссылка в новой задаче