From 75f4731f900f3cee32c38da5d7c919ff5bb6d873 Mon Sep 17 00:00:00 2001 From: charliesome Date: Sat, 28 Dec 2013 08:25:28 +0000 Subject: * 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 --- ChangeLog | 9 +++++++++ benchmark/bm_so_meteor_contest.rb | 10 +++++----- ext/fiddle/lib/fiddle/import.rb | 2 +- ext/psych/lib/psych.rb | 2 +- ext/psych/lib/psych/nodes/sequence.rb | 2 +- ext/tk/lib/multi-tk.rb | 2 +- ext/tk/lib/tcltk.rb | 4 ++-- 7 files changed, 20 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index db6a83ced3..63d6275eae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Sat Dec 28 17:24:00 2013 DV Suresh + + * 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 * parse.y (local_push_gen, local_pop_gen): save cmdarg_stack to diff --git a/benchmark/bm_so_meteor_contest.rb b/benchmark/bm_so_meteor_contest.rb index e57f430db6..b8e93bd150 100644 --- a/benchmark/bm_so_meteor_contest.rb +++ b/benchmark/bm_so_meteor_contest.rb @@ -32,7 +32,7 @@ class Rotation @start_masks = Array.new(60) # 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 0.upto(59) do | offset | mask = is_even(offset) ? (@even_mask << offset) : (@odd_mask << offset) @@ -328,7 +328,7 @@ def prunable( board, location, slotting = false) collectors = [] # loop across the rows (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] converter = $converter[row_on] @@ -370,7 +370,7 @@ def prunable( board, location, slotting = false) end # 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. # 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. @@ -382,7 +382,7 @@ def prunable( board, location, slotting = false) collectors[collector_num] = nil else # 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 # 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 @@ -526,7 +526,7 @@ def save( board_string) @boards_found += 1 # 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 print_results exit(0) diff --git a/ext/fiddle/lib/fiddle/import.rb b/ext/fiddle/lib/fiddle/import.rb index 8b948e8f23..f1aa712f2e 100644 --- a/ext/fiddle/lib/fiddle/import.rb +++ b/ext/fiddle/lib/fiddle/import.rb @@ -63,7 +63,7 @@ module Fiddle extend Importer # 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 # # Raises a DLError if the library cannot be loaded. diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb index 2a87f43efe..b5050b15e6 100644 --- a/ext/psych/lib/psych.rb +++ b/ext/psych/lib/psych.rb @@ -135,7 +135,7 @@ require 'psych/handlers/document_stream' # ==== Exception handling # # begin -# # The second argument chnages only the exception contents +# # The second argument changes only the exception contents # Psych.parse("--- `", "file.txt") # rescue Psych::SyntaxError => ex # ex.file # => 'file.txt' diff --git a/ext/psych/lib/psych/nodes/sequence.rb b/ext/psych/lib/psych/nodes/sequence.rb index e4b833d330..7e907fe2c8 100644 --- a/ext/psych/lib/psych/nodes/sequence.rb +++ b/ext/psych/lib/psych/nodes/sequence.rb @@ -56,7 +56,7 @@ module Psych # Is this sequence started implicitly? attr_accessor :implicit - # The sequece style used + # The sequence style used attr_accessor :style ### diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb index 68bd849670..bb6e69aab6 100644 --- a/ext/tk/lib/multi-tk.rb +++ b/ext/tk/lib/multi-tk.rb @@ -148,7 +148,7 @@ class MultiTkIp end def delete(idx, &blk) - # if gets an entry, is permited to delete + # if gets an entry, is permitted to delete if self[idx] @tbl.delete(idx) elsif blk diff --git a/ext/tk/lib/tcltk.rb b/ext/tk/lib/tcltk.rb index 48ec1df09a..f8fbdfbe6d 100644 --- a/ext/tk/lib/tcltk.rb +++ b/ext/tk/lib/tcltk.rb @@ -325,7 +325,7 @@ class TclTkCallback < TclTkObject TclTk._addcallback(self) end - # to_eval(): retuens string representation for @ip._eval_args + # to_eval(): returns string representation for @ip._eval_args def to_eval() if @arg # bind replaces %s before calling ruby_fmt, so %%s is used @@ -349,7 +349,7 @@ class TclTkImage < TclTkCommand # initialize(interp, t, *args): # 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) # t: image type (photo, bitmap, etc.) # *args: command argument -- cgit v1.2.3