diff --git a/basictest/test.rb b/basictest/test.rb index 10ea28d320..25a4298234 100755 --- a/basictest/test.rb +++ b/basictest/test.rb @@ -1732,7 +1732,7 @@ a = nil test_ok(defined?(a)) test_ok(a == nil) -# multiple asignment +# multiple assignment a, b = 1, 2 test_ok(a == 1 && b == 2) diff --git a/compile.c b/compile.c index 1e6400448c..98ee34afd0 100644 --- a/compile.c +++ b/compile.c @@ -6827,7 +6827,7 @@ delegate_call_p(const rb_iseq_t *iseq, unsigned int argc, const LINK_ANCHOR *arg } } else { - goto fail; // level != 0 is unsupport + goto fail; // level != 0 is unsupported } } else { diff --git a/cont.c b/cont.c index 87f1fd0157..793bce018b 100644 --- a/cont.c +++ b/cont.c @@ -2367,7 +2367,7 @@ rb_fiber_pool_initialize(int argc, VALUE* argv, VALUE self) VALUE size = Qnil, count = Qnil, vm_stack_size = Qnil; struct fiber_pool * fiber_pool = NULL; - // Maybe these should be keyworkd arguments. + // Maybe these should be keyword arguments. rb_scan_args(argc, argv, "03", &size, &count, &vm_stack_size); if (NIL_P(size)) { diff --git a/defs/gmake.mk b/defs/gmake.mk index 8ff17d993f..226e1066a5 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -90,7 +90,7 @@ sudo-precheck: test yes-test-testframework no-test-testframework install-prereq: sudo-precheck yes-test-all no-test-all: install endif -# Cross referece needs to parse all files at once +# Cross reference needs to parse all files at once love install reinstall: RDOCFLAGS = --force-update $(srcdir)/missing/des_tables.c: $(srcdir)/missing/crypt.c diff --git a/defs/separated_version.mk b/defs/separated_version.mk index f086f4b24a..72ee093da7 100644 --- a/defs/separated_version.mk +++ b/defs/separated_version.mk @@ -1,6 +1,6 @@ # ******** FOR DEVELEPERS ONLY ******** # Separate version.o into a shared library which varies every -# revisions, in order to make the rest sharable. +# revisions, in order to make the rest shareable. include $(firstword $(wildcard GNUmakefile Makefile)) diff --git a/doc/NEWS-2.5.0 b/doc/NEWS-2.5.0 index 221c0328c1..c891317b61 100644 --- a/doc/NEWS-2.5.0 +++ b/doc/NEWS-2.5.0 @@ -68,7 +68,7 @@ with all sufficient information, see the ChangeLog file or Redmine * File.rename releases GVL. [Feature #13951] * File::Stat#atime, File::Stat#mtime and File::Stat#ctime support fractional second timestamps on Windows 8 and later. [Feature #13726] - * File::Stat#ino and File.indentical? support ReFS 128bit ino on Windows 8.1 + * File::Stat#ino and File.identical? support ReFS 128bit ino on Windows 8.1 and later. [Feature #13731] * File.readable?, File.readable_real?, File.writable?, File.writable_real?, File.executable?, File.executable_real?, File.mkfifo, File.readlink, diff --git a/doc/contributing.rdoc b/doc/contributing.rdoc index 95e5b6dd28..68dda66e46 100644 --- a/doc/contributing.rdoc +++ b/doc/contributing.rdoc @@ -389,7 +389,7 @@ When you're ready to commit: This will open your editor in which you write your commit message. Use the following style for commit messages: -* Use a succint subject line. +* Use a succinct subject line. * Include reasoning behind the change in the commit message, focusing on why the change is being made. * Refer to redmine issue (such as Fixes [Bug #1234] or Implements diff --git a/doc/extension.rdoc b/doc/extension.rdoc index 79d25e4249..79eb96d518 100644 --- a/doc/extension.rdoc +++ b/doc/extension.rdoc @@ -726,7 +726,7 @@ RUBY_TYPED_FREE_IMMEDIATELY :: You can specify this flag if the dfree never unlocks Ruby's internal lock (GVL). - If this flag is not set, Ruby defers invokation of dfree() + If this flag is not set, Ruby defers invocation of dfree() and invokes dfree() at the same time as finalizers. RUBY_TYPED_WB_PROTECTED :: diff --git a/doc/syntax/miscellaneous.rdoc b/doc/syntax/miscellaneous.rdoc index d5691f8d60..87ec059ae7 100644 --- a/doc/syntax/miscellaneous.rdoc +++ b/doc/syntax/miscellaneous.rdoc @@ -13,7 +13,7 @@ most frequently used with ruby -e. Ruby does not require any indentation. Typically, ruby programs are indented two spaces. -If you run ruby with warnings enabled and have an indentation mis-match, you +If you run ruby with warnings enabled and have an indentation mismatch, you will receive a warning. == +alias+ diff --git a/gc.c b/gc.c index 0f9361a03c..ab7662b534 100644 --- a/gc.c +++ b/gc.c @@ -86,7 +86,7 @@ #pragma intrinsic(_umul128) #endif -/* Expecting this struct to be elminated by function inlinings */ +/* Expecting this struct to be eliminated by function inlinings */ struct optional { bool left; size_t right; diff --git a/include/ruby/backward/cxxanyargs.hpp b/include/ruby/backward/cxxanyargs.hpp index a2e63f2943..3585f678b8 100644 --- a/include/ruby/backward/cxxanyargs.hpp +++ b/include/ruby/backward/cxxanyargs.hpp @@ -47,7 +47,7 @@ typedef int int_type(ANYARGS); /// @name Hooking global variables /// @{ -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Define a function-backended global variable. /// @param[in] q Name of the variable. /// @param[in] w Getter function. @@ -63,7 +63,7 @@ rb_define_virtual_variable(const char *q, type *w, void_type *e) ::rb_define_virtual_variable(q, r, t); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Define a function-backended global variable. /// @param[in] q Name of the variable. /// @param[in] w Getter function. @@ -78,7 +78,7 @@ rb_define_virtual_variable(const char *q, rb_gvar_getter_t *w, void_type *e) ::rb_define_virtual_variable(q, w, t); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Define a function-backended global variable. /// @param[in] q Name of the variable. /// @param[in] w Getter function. @@ -93,7 +93,7 @@ rb_define_virtual_variable(const char *q, type *w, rb_gvar_setter_t *e) ::rb_define_virtual_variable(q, r, e); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Define a function-backended global variable. /// @param[in] q Name of the variable. /// @param[in] w Variable storage. @@ -110,7 +110,7 @@ rb_define_hooked_variable(const char *q, VALUE *w, type *e, void_type *r) ::rb_define_hooked_variable(q, w, t, y); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Define a function-backended global variable. /// @param[in] q Name of the variable. /// @param[in] w Variable storage. @@ -126,7 +126,7 @@ rb_define_hooked_variable(const char *q, VALUE *w, rb_gvar_getter_t *e, void_typ ::rb_define_hooked_variable(q, w, e, y); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Define a function-backended global variable. /// @param[in] q Name of the variable. /// @param[in] w Variable storage. @@ -146,7 +146,7 @@ rb_define_hooked_variable(const char *q, VALUE *w, type *e, rb_gvar_setter_t *r) /// @name Exceptions and tag jumps /// @{ -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Old way to implement iterators. /// @param[in] q A function that can yield. /// @param[in] w Passed to `q`. @@ -163,7 +163,7 @@ rb_iterate(VALUE(*q)(VALUE), VALUE w, type *e, VALUE r) return ::rb_iterate(q, w, t, r); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Call a method with a block. /// @param[in] q The self. /// @param[in] w The method. @@ -181,7 +181,7 @@ rb_block_call(VALUE q, ID w, int e, const VALUE *r, type *t, VALUE y) return ::rb_block_call(q, w, e, r, u, y); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief An equivalent of `rescue` clause. /// @param[in] q A function that can raise. /// @param[in] w Passed to `q`. @@ -204,7 +204,7 @@ rb_rescue(type *q, VALUE w, type *e, VALUE r) return ::rb_rescue(t, w, y, r); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief An equivalent of `rescue` clause. /// @param[in] q A function that can raise. /// @param[in] w Passed to `q`. @@ -232,7 +232,7 @@ rb_rescue2(type *q, VALUE w, type *e, VALUE r, ...) return ret; } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief An equivalent of `ensure` clause. /// @param[in] q A function that can raise. /// @param[in] w Passed to `q`. @@ -253,7 +253,7 @@ rb_ensure(type *q, VALUE w, type *e, VALUE r) return ::rb_ensure(t, w, y, r); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief An equivalent of `Kernel#catch`. /// @param[in] q The "tag" string. /// @param[in] w A function that can throw. @@ -272,7 +272,7 @@ rb_catch(const char *q, type *w, VALUE e) return ::rb_catch(q, r, e); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief An equivalent of `Kernel#catch`. /// @param[in] q The "tag" object. /// @param[in] w A function that can throw. @@ -295,7 +295,7 @@ rb_catch_obj(VALUE q, type *w, VALUE e) /// @name Procs, Fibers and Threads /// @{ -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Creates a @ref rb_cFiber instance. /// @param[in] q The fiber body. /// @param[in] w Passed to `q`. @@ -311,7 +311,7 @@ rb_fiber_new(type *q, VALUE w) return ::rb_fiber_new(e, w); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Creates a @ref rb_cProc instance. /// @param[in] q The proc body. /// @param[in] w Passed to `q`. @@ -327,7 +327,7 @@ rb_proc_new(type *q, VALUE w) return ::rb_proc_new(e, w); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Creates a @ref rb_cThread instance. /// @param[in] q The thread body. /// @param[in] w Passed to `q`. @@ -348,7 +348,7 @@ rb_thread_create(type *q, void *w) /// @name Hash and st_table /// @{ -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Iteration over the given table. /// @param[in] q A table to scan. /// @param[in] w A function to iterate. @@ -366,7 +366,7 @@ st_foreach(st_table *q, int_type *w, st_data_t e) return ::st_foreach(q, r, e); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Iteration over the given table. /// @param[in] q A table to scan. /// @param[in] w A function to iterate. @@ -384,7 +384,7 @@ st_foreach_check(st_table *q, int_type *w, st_data_t e, st_data_t) return ::st_foreach_check(q, t, e, 0); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Iteration over the given table. /// @param[in] q A table to scan. /// @param[in] w A function to iterate. @@ -400,7 +400,7 @@ st_foreach_safe(st_table *q, int_type *w, st_data_t e) ::st_foreach_safe(q, r, e); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Iteration over the given hash. /// @param[in] q A hash to scan. /// @param[in] w A function to iterate. @@ -416,7 +416,7 @@ rb_hash_foreach(VALUE q, int_type *w, VALUE e) ::rb_hash_foreach(q, r, e); } -RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprected") +RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated") /// @brief Iteration over each instance variable of the object. /// @param[in] q An object. /// @param[in] w A function to iterate. diff --git a/iseq.c b/iseq.c index f5f8437882..cbf62176bd 100644 --- a/iseq.c +++ b/iseq.c @@ -932,7 +932,7 @@ iseq_load(VALUE data, const rb_iseq_t *parent, VALUE opt) iseq_type = iseq_type_from_sym(type); if (iseq_type == (enum iseq_type)-1) { - rb_raise(rb_eTypeError, "unsupport type: :%"PRIsVALUE, rb_sym2str(type)); + rb_raise(rb_eTypeError, "unsupported type: :%"PRIsVALUE, rb_sym2str(type)); } node_id = rb_hash_aref(misc, ID2SYM(rb_intern("node_id"))); @@ -3404,7 +3404,7 @@ iseqw_s_load_from_binary_extra_data(VALUE self, VALUE str) * To lookup the lineno of insn4, calculate rank("10100001", 8) = 3, so * the line (B) is the entry in question. * - * A naive implementatoin of succinct bit-vector works really well + * A naive implementation of succinct bit-vector works really well * not only for large size but also for small size. However, it has * tiny overhead for very small size. So, this implementation consist * of two parts: one part is the "immediate" table that keeps rank result diff --git a/man/ruby.1 b/man/ruby.1 index 4dd19054d3..1888312d26 100644 --- a/man/ruby.1 +++ b/man/ruby.1 @@ -419,7 +419,7 @@ Disables (or enables) all features. .El .Pp .It Fl -dump Ns = Ns Ar target -Dump some informations. +Dump some information. .Pp Prints the specified target. .Ar target diff --git a/misc/rb_optparse.zsh b/misc/rb_optparse.zsh index d53170c5f7..7407e87c03 100755 --- a/misc/rb_optparse.zsh +++ b/misc/rb_optparse.zsh @@ -13,7 +13,7 @@ # # (3) restart zsh. # -# (4) geneate completion files once. +# (4) generate completion files once. # generate-complete-function/ruby/optparse COMMAND1 # generate-complete-function/ruby/optparse COMMAND2 # diff --git a/process.c b/process.c index ad303203fd..60d1523fde 100644 --- a/process.c +++ b/process.c @@ -6472,7 +6472,7 @@ proc_setmaxgroups(VALUE obj, VALUE val) int ngroups_max = get_sc_ngroups_max(); if (ngroups <= 0) - rb_raise(rb_eArgError, "maxgroups %d shold be positive", ngroups); + rb_raise(rb_eArgError, "maxgroups %d should be positive", ngroups); if (ngroups > RB_MAX_GROUPS) ngroups = RB_MAX_GROUPS; diff --git a/range.c b/range.c index f701c16e6d..b4fab53eac 100644 --- a/range.c +++ b/range.c @@ -1610,12 +1610,12 @@ static VALUE range_count(int argc, VALUE *argv, VALUE range) { if (argc != 0) { - /* It is odd for instace (1...).count(0) to return Infinity. Just let + /* It is odd for instance (1...).count(0) to return Infinity. Just let * it loop. */ return rb_call_super(argc, argv); } else if (rb_block_given_p()) { - /* Likewise it is odd for instace (1...).count {|x| x == 0 } to return + /* Likewise it is odd for instance (1...).count {|x| x == 0 } to return * Infinity. Just let it loop. */ return rb_call_super(argc, argv); } diff --git a/regparse.c b/regparse.c index 5f118900de..a96c8c2fa7 100644 --- a/regparse.c +++ b/regparse.c @@ -4663,7 +4663,7 @@ parse_char_class(Node** np, Node** asc_np, OnigToken* tok, UChar** src, UChar* e p = psave; for (i = 1; i < len; i++) { (void)fetch_token_in_cc(tok, &p, end, env); - /* no need to check the retun value (already checked above) */ + /* no need to check the return value (already checked above) */ } fetched = 0; } diff --git a/sample/drb/old_tuplespace.rb b/sample/drb/old_tuplespace.rb index 8be1542c06..2d5310086e 100644 --- a/sample/drb/old_tuplespace.rb +++ b/sample/drb/old_tuplespace.rb @@ -31,7 +31,7 @@ class TupleSpace def initialize @que = {} @waiting = {} - @que.taint # enable tainted comunication + @que.taint # enable tainted communication @waiting.taint self.taint end diff --git a/sample/trick2013/kinaba/remarks.markdown b/sample/trick2013/kinaba/remarks.markdown index 73a4ea9875..dcdce7e9ae 100644 --- a/sample/trick2013/kinaba/remarks.markdown +++ b/sample/trick2013/kinaba/remarks.markdown @@ -20,7 +20,7 @@ The algorithm is the obvious loop "32.upto(126){|x| putc x}". It is not so hard to transform it to use each character *at most once*. The only slight difficulty comes from the constraint that we cannot "declare and then use" variables, because then the code will contain the variable name twice. This restriction is worked around by the $. global variable, the best friend of Ruby golfers. -The relatively interesting part is to use all the charcters *at least once*. Of course, this is easily accomplished by putting everything into a comment (i.e., #unused...) or to a string literal (%(unused...), note that normal string literals are forbidden since they use quotation marks twice). Hey, but that's not fun at all! I tried to minimize the escapeway. +The relatively interesting part is to use all the characters *at least once*. Of course, this is easily accomplished by putting everything into a comment (i.e., #unused...) or to a string literal (%(unused...), note that normal string literals are forbidden since they use quotation marks twice). Hey, but that's not fun at all! I tried to minimize the escapeway. * "@THEqQUICKbBROWNfFXjJMPSvVLAZYDGgkyz". Trash box of unused alphabet. I wish I could have used "gkyz" somewhere else. diff --git a/sample/trick2015/ksk_2/remarks.markdown b/sample/trick2015/ksk_2/remarks.markdown index bb9b705773..187a6804d2 100644 --- a/sample/trick2015/ksk_2/remarks.markdown +++ b/sample/trick2015/ksk_2/remarks.markdown @@ -199,6 +199,6 @@ succeed to return 0. The meaning of ``\1nn`` in regular expression seems to depend on the existence of capturing expressions. In spite of these Ruby's behaviors, we have a good news! The present -SAT sover does not suffer from the issues because the program cannot +SAT solver does not suffer from the issues because the program cannot return solutions in practical time for inputs with variables more than -40. \ No newline at end of file +40. diff --git a/spec/ruby/core/argf/binmode_spec.rb b/spec/ruby/core/argf/binmode_spec.rb index c2dd578d95..bdcc6aa30a 100644 --- a/spec/ruby/core/argf/binmode_spec.rb +++ b/spec/ruby/core/argf/binmode_spec.rb @@ -22,7 +22,7 @@ describe "ARGF.binmode" do end end - it "puts alls subsequent stream reading through ARGF into binmode" do + it "puts all subsequent streams reading through ARGF into binmode" do argf [@bin_file, @bin_file] do @argf.binmode @argf.gets.should == "test\r\n" diff --git a/spec/ruby/core/env/delete_spec.rb b/spec/ruby/core/env/delete_spec.rb index b7fe1ee675..f11860b21d 100644 --- a/spec/ruby/core/env/delete_spec.rb +++ b/spec/ruby/core/env/delete_spec.rb @@ -30,7 +30,7 @@ describe "ENV.delete" do ScratchPad.recorded.should == "foo" end - it "does not evaluate the block if the envirionment variable exists" do + it "does not evaluate the block if the environment variable exists" do ENV["foo"] = "bar" ENV.delete("foo") { |name| fail "Should not happen" } ENV["foo"].should == nil diff --git a/spec/ruby/core/file/chmod_spec.rb b/spec/ruby/core/file/chmod_spec.rb index 86171691f6..5ca15c9748 100644 --- a/spec/ruby/core/file/chmod_spec.rb +++ b/spec/ruby/core/file/chmod_spec.rb @@ -105,7 +105,7 @@ describe "File.chmod" do File.chmod(0, mock_to_path(@file)) end - it "throws a TypeError if the given path is not coercable into a string" do + it "throws a TypeError if the given path is not coercible into a string" do -> { File.chmod(0, []) }.should raise_error(TypeError) end diff --git a/spec/ruby/core/integer/comparison_spec.rb b/spec/ruby/core/integer/comparison_spec.rb index 762af51535..2ff557c7c6 100644 --- a/spec/ruby/core/integer/comparison_spec.rb +++ b/spec/ruby/core/integer/comparison_spec.rb @@ -174,7 +174,7 @@ describe "Integer#<=>" do (infinity_value <=> Float::MAX.to_i*2).should == 1 end - it "returns -1 when self is negative and other is Infinty" do + it "returns -1 when self is negative and other is Infinity" do (-Float::MAX.to_i*2 <=> infinity_value).should == -1 end diff --git a/spec/ruby/core/kernel/singleton_methods_spec.rb b/spec/ruby/core/kernel/singleton_methods_spec.rb index eb4cede110..a127a439de 100644 --- a/spec/ruby/core/kernel/singleton_methods_spec.rb +++ b/spec/ruby/core/kernel/singleton_methods_spec.rb @@ -52,7 +52,7 @@ describe :kernel_singleton_methods_modules, shared: true do end describe :kernel_singleton_methods_supers, shared: true do - it "returns the names of singleton methods for an object extented with a module" do + it "returns the names of singleton methods for an object extended with a module" do ReflectSpecs.oe.singleton_methods(*@object).should include(:m_pro, :m_pub) end @@ -62,11 +62,11 @@ describe :kernel_singleton_methods_supers, shared: true do r.should == [:pro, :pub] end - it "returns the names of singleton methods for an object extented with two modules" do + it "returns the names of singleton methods for an object extended with two modules" do ReflectSpecs.oee.singleton_methods(*@object).should include(:m_pro, :m_pub, :n_pro, :n_pub) end - it "returns the names of singleton methods for an object extented with a module including a module" do + it "returns the names of singleton methods for an object extended with a module including a module" do ReflectSpecs.oei.singleton_methods(*@object).should include(:n_pro, :n_pub, :m_pro, :m_pub) end @@ -112,7 +112,7 @@ describe :kernel_singleton_methods_private_supers, shared: true do ReflectSpecs.oee.singleton_methods(*@object).should_not include(:m_pri) end - it "does not return private singleton methods for an object extented with a module including a module" do + it "does not return private singleton methods for an object extended with a module including a module" do ReflectSpecs.oei.singleton_methods(*@object).should_not include(:n_pri, :m_pri) end @@ -165,11 +165,11 @@ describe "Kernel#singleton_methods" do it_behaves_like :kernel_singleton_methods_modules, nil, false it_behaves_like :kernel_singleton_methods_private_supers, nil, false - it "returns an empty Array for an object extented with a module" do + it "returns an empty Array for an object extended with a module" do ReflectSpecs.oe.singleton_methods(false).should == [] end - it "returns an empty Array for an object extented with two modules" do + it "returns an empty Array for an object extended with two modules" do ReflectSpecs.oee.singleton_methods(false).should == [] end diff --git a/spec/ruby/core/module/alias_method_spec.rb b/spec/ruby/core/module/alias_method_spec.rb index b14f5430a8..662e91011f 100644 --- a/spec/ruby/core/module/alias_method_spec.rb +++ b/spec/ruby/core/module/alias_method_spec.rb @@ -14,7 +14,7 @@ describe "Module#alias_method" do @object.double(12).should == @object.public_two(12) end - it "creates methods that are == to eachother" do + it "creates methods that are == to each other" do @class.make_alias :uno, :public_one @object.method(:uno).should == @object.method(:public_one) end diff --git a/spec/ruby/core/module/autoload_spec.rb b/spec/ruby/core/module/autoload_spec.rb index db95704cc7..9964602347 100644 --- a/spec/ruby/core/module/autoload_spec.rb +++ b/spec/ruby/core/module/autoload_spec.rb @@ -23,7 +23,7 @@ describe "Module#autoload?" do ModuleSpecs::Autoload::Child.autoload?(:InheritedAutoload, false).should be_nil end - it "returns the name of the file that will be loaded if recursion is disabled but the autoload is defined on the classs itself" do + it "returns the name of the file that will be loaded if recursion is disabled but the autoload is defined on the class itself" do ModuleSpecs::Autoload::Child.autoload :ChildAutoload, "child_autoload.rb" ModuleSpecs::Autoload::Child.autoload?(:ChildAutoload, false).should == "child_autoload.rb" end diff --git a/spec/ruby/core/string/undump_spec.rb b/spec/ruby/core/string/undump_spec.rb index e83c53ce89..d45c4bae1b 100644 --- a/spec/ruby/core/string/undump_spec.rb +++ b/spec/ruby/core/string/undump_spec.rb @@ -38,7 +38,7 @@ ruby_version_is '2.5' do ].should be_computed_by(:undump) end - it "returns a string with unescaped sequencies \" and \\" do + it "returns a string with unescaped sequences \" and \\" do [ ['"\\""' , "\""], ['"\\\\"', "\\"] ].should be_computed_by(:undump) diff --git a/spec/ruby/core/time/new_spec.rb b/spec/ruby/core/time/new_spec.rb index 01ee47faa1..a5cfa2a7df 100644 --- a/spec/ruby/core/time/new_spec.rb +++ b/spec/ruby/core/time/new_spec.rb @@ -298,7 +298,7 @@ ruby_version_is "2.6" do # At loading marshaled data, a timezone name will be converted to a timezone object # by find_timezone class method, if the method is defined. - # Similary, that class method will be called when a timezone argument does not have + # Similarly, that class method will be called when a timezone argument does not have # the necessary methods mentioned above. context "subject's class implements .find_timezone method" do it "calls .find_timezone to build a time object at loading marshaled data" do diff --git a/spec/ruby/language/regexp/modifiers_spec.rb b/spec/ruby/language/regexp/modifiers_spec.rb index 9f3cf8acf8..2f5522bc8a 100644 --- a/spec/ruby/language/regexp/modifiers_spec.rb +++ b/spec/ruby/language/regexp/modifiers_spec.rb @@ -104,7 +104,7 @@ describe "Regexps with modifiers" do /./m.match("\n").to_a.should == ["\n"] end - it "supports ASII/Unicode modifiers" do + it "supports ASCII/Unicode modifiers" do eval('/(?a)[[:alpha:]]+/').match("a\u3042").to_a.should == ["a"] eval('/(?d)[[:alpha:]]+/').match("a\u3042").to_a.should == ["a\u3042"] eval('/(?u)[[:alpha:]]+/').match("a\u3042").to_a.should == ["a\u3042"] diff --git a/spec/ruby/library/socket/ipsocket/recvfrom_spec.rb b/spec/ruby/library/socket/ipsocket/recvfrom_spec.rb index 3bcb7b8f02..2af86ea70d 100644 --- a/spec/ruby/library/socket/ipsocket/recvfrom_spec.rb +++ b/spec/ruby/library/socket/ipsocket/recvfrom_spec.rb @@ -64,7 +64,7 @@ describe "Socket::IPSocket#recvfrom" do data.size.should == 2 data.first.should == "hel" - # This does not apply to every platform, dependant on recvfrom(2) + # This does not apply to every platform, dependent on recvfrom(2) # data.last.should == nil end end diff --git a/spec/ruby/optional/capi/io_spec.rb b/spec/ruby/optional/capi/io_spec.rb index 7947a48eac..4d61fc8755 100644 --- a/spec/ruby/optional/capi/io_spec.rb +++ b/spec/ruby/optional/capi/io_spec.rb @@ -220,7 +220,7 @@ describe "C-API IO function" do end describe "rb_io_check_writable" do - it "does not raise an exeption if the IO is opened for writing" do + it "does not raise an exception if the IO is opened for writing" do # The MRI function is void, so we use should_not raise_error -> { @o.rb_io_check_writable(@w_io) }.should_not raise_error end diff --git a/st.c b/st.c index 5d0c00cc0a..2b973ea75d 100644 --- a/st.c +++ b/st.c @@ -714,7 +714,7 @@ st_free_table(st_table *tab) free(tab); } -/* Return byte size of memory allocted for table TAB. */ +/* Return byte size of memory allocated for table TAB. */ size_t st_memsize(const st_table *tab) { diff --git a/test/-ext-/popen_deadlock/test_popen_deadlock.rb b/test/-ext-/popen_deadlock/test_popen_deadlock.rb index 97892e5008..e6ba5e7c1a 100644 --- a/test/-ext-/popen_deadlock/test_popen_deadlock.rb +++ b/test/-ext-/popen_deadlock/test_popen_deadlock.rb @@ -26,7 +26,7 @@ class TestPopenDeadlock < Test::Unit::TestCase end private :assert_popen_without_deadlock - # 10 test methods are defined for showing progess reports + # 10 test methods are defined for showing progress reports 10.times do |i| define_method("test_popen_without_deadlock_#{i}") { assert_popen_without_deadlock diff --git a/test/ruby/sentence.rb b/test/ruby/sentence.rb index 28fb5d1cf8..9bfd7c7599 100644 --- a/test/ruby/sentence.rb +++ b/test/ruby/sentence.rb @@ -353,7 +353,7 @@ class Sentence # * No rule derives to empty sequence # * Underivable rule simplified # * No channel rule - # * Symbols which has zero or one choices are not appered in rhs. + # * Symbols which has zero or one choices are not appeared in rhs. # # Note that the rules which can derive empty and non-empty # sequences are modified to derive only non-empty sequences. diff --git a/test/ruby/test_assignment.rb b/test/ruby/test_assignment.rb index bf6602ab13..5a6ec97e67 100644 --- a/test/ruby/test_assignment.rb +++ b/test/ruby/test_assignment.rb @@ -456,7 +456,7 @@ class TestAssignment < Test::Unit::TestCase assert(defined?(a)) assert_nil(a) - # multiple asignment + # multiple assignment a, b = 1, 2 assert_equal 1, a assert_equal 2, b diff --git a/test/ruby/test_struct.rb b/test/ruby/test_struct.rb index 884fbe00ed..9438160a6f 100644 --- a/test/ruby/test_struct.rb +++ b/test/ruby/test_struct.rb @@ -113,7 +113,7 @@ module TestStruct assert_equal @Struct::KeywordInitTrue.new(a: 1, b: 2).values, @Struct::KeywordInitFalse.new(1, 2).values assert_equal "#{@Struct}::KeywordInitFalse", @Struct::KeywordInitFalse.inspect assert_equal "#{@Struct}::KeywordInitTrue(keyword_init: true)", @Struct::KeywordInitTrue.inspect - # eval is neede to prevent the warning duplication filter + # eval is needed to prevent the warning duplication filter k = eval("Class.new(@Struct::KeywordInitFalse) {def initialize(**) end}") assert_warn(/The last argument is used as the keyword parameter/) {k.new(a: 1, b: 2)} k = Class.new(@Struct::KeywordInitTrue) {def initialize(**) end} diff --git a/time.c b/time.c index 021421cdbf..1016537501 100644 --- a/time.c +++ b/time.c @@ -5801,7 +5801,7 @@ rb_time_zone_abbreviation(VALUE zone, VALUE time) * At loading marshaled data, a timezone name will be converted to a timezone * object by +find_timezone+ class method, if the method is defined. * - * Similary, that class method will be called when a timezone argument does + * Similarly, that class method will be called when a timezone argument does * not have the necessary methods mentioned above. */ diff --git a/tool/lib/tracepointchecker.rb b/tool/lib/tracepointchecker.rb index 47822ecef5..3254e59357 100644 --- a/tool/lib/tracepointchecker.rb +++ b/tool/lib/tracepointchecker.rb @@ -80,7 +80,7 @@ module TracePointChecker call_stack.push method STATE[:count] += 1 - verbose_out :psuh, method if verbose + verbose_out :push, method if verbose } TRACES << TracePoint.new(*return_events){|tp| diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index bcd5307841..038fbf6428 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -268,7 +268,7 @@ print < "Whats the big deal" + * thr.join #=> "What's the big deal" * * If we don't call +thr.join+ before the main thread terminates, then all * other threads including +thr+ will be killed. @@ -3028,7 +3028,7 @@ Init_VM(void) * once, like in the following example: * * threads = [] - * threads << Thread.new { puts "Whats the big deal" } + * threads << Thread.new { puts "What's the big deal" } * threads << Thread.new { 3.times { puts "Threads are fun!" } } * * After creating a few threads we wait for them all to finish diff --git a/vm_dump.c b/vm_dump.c index 9ada7a959f..c778e1b4dd 100644 --- a/vm_dump.c +++ b/vm_dump.c @@ -349,7 +349,7 @@ vm_stack_dump_each(const rb_execution_context_t *ec, const rb_control_frame_t *c } } else { - rb_bug("unsupport frame type: %08lx", VM_FRAME_TYPE(cfp)); + rb_bug("unsupported frame type: %08lx", VM_FRAME_TYPE(cfp)); } } #endif diff --git a/vm_insnhelper.c b/vm_insnhelper.c index e35000e758..2ac006a605 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -165,7 +165,7 @@ vm_check_frame_detail(VALUE type, int req_block, int req_me, int req_cref, VALUE if ((type & VM_FRAME_MAGIC_MASK) == VM_FRAME_MAGIC_DUMMY) { VM_ASSERT(iseq == NULL || - RUBY_VM_NORMAL_ISEQ_P(iseq) /* argument error. it shold be fixed */); + RUBY_VM_NORMAL_ISEQ_P(iseq) /* argument error. it should be fixed */); } else { VM_ASSERT(is_cframe == !RUBY_VM_NORMAL_ISEQ_P(iseq)); @@ -226,7 +226,7 @@ vm_check_canary(const rb_execution_context_t *ec, VALUE *sp) return; } else { - /* we are going to call metods below; squash the canary to + /* we are going to call methods below; squash the canary to * prevent infinite loop. */ sp[0] = Qundef; } @@ -1334,7 +1334,7 @@ vm_throw_start(const rb_execution_context_t *ec, rb_control_frame_t *const reg_c /* do nothing */ } else { - rb_bug("isns(throw): unsupport throw type"); + rb_bug("isns(throw): unsupported throw type"); } ec->tag->state = state; @@ -1536,7 +1536,7 @@ rb_vm_search_method_slowpath(struct rb_call_data *cd, VALUE klass) * - It scans the array from left to right, looking for the expected class * serial. If it finds that at `cc->class_serial[0]` (this branch * probability is 98% according to @shyouhei's experiment), just returns - * true. If it reaches the end of the array without finding anytihng, + * true. If it reaches the end of the array without finding anything, * returns false. This is done in the #1 loop below. * * - What needs to be complicated is when the class serial is found at either diff --git a/win32/file.c b/win32/file.c index 275520215a..9d21370019 100644 --- a/win32/file.c +++ b/win32/file.c @@ -552,7 +552,7 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na /* Determine require buffer size */ size = GetFullPathNameW(buffer, PATH_BUFFER_SIZE, wfullpath_buffer, NULL); if (size > PATH_BUFFER_SIZE) { - /* allocate more memory than alloted originally by PATH_BUFFER_SIZE */ + /* allocate more memory than allotted originally by PATH_BUFFER_SIZE */ wfullpath = ALLOC_N(wchar_t, size); size = GetFullPathNameW(buffer, size, wfullpath, NULL); }