Skip to content

Commit 87c4eb4

Browse files
author
devkadirselcuk
authored
Merge pull request ruby#39 from ruby/master
[pull] master from ruby:master
2 parents 61bb3ec + 907aa47 commit 87c4eb4

File tree

91 files changed

+805
-2147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+805
-2147
lines changed

‎configure.ac‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,6 +1204,7 @@ main()
12041204
RUBY_APPEND_OPTIONS(LDFLAGS, "-sALLOW_MEMORY_GROWTH=1")
12051205
RUBY_APPEND_OPTIONS(LDFLAGS, "-sASYNCIFY")
12061206
RUBY_APPEND_OPTIONS(LDFLAGS, "-sFORCE_FILESYSTEM=1")
1207+
ac_cv_func_shutdown=no
12071208
],
12081209
[ LIBS="-lm $LIBS"])
12091210
: ${ORIG_LIBS=$LIBS}

‎dir.rb‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
# - ::unlink (aliased as ::delete and ::rmdir):: Removes the given directory.
8282
# - #inspect:: Returns a string description of +self+.
8383
class Dir
84+
# call-seq:
8485
# Dir.open( string ) -> aDir
8586
# Dir.open( string, encoding: enc ) -> aDir
8687
# Dir.open( string ) {| aDir | block } -> anObject
@@ -106,6 +107,7 @@ def self.open(name, encoding: nil, &block)
106107
end
107108
end
108109

110+
# call-seq:
109111
# Dir.new( string ) -> aDir
110112
# Dir.new( string, encoding: enc ) -> aDir
111113
#
@@ -117,6 +119,7 @@ def initialize(name, encoding: nil)
117119
Primitive.dir_initialize(name, encoding)
118120
end
119121

122+
# call-seq:
120123
# Dir[ string [, string ...] [, base: path] [, sort: true] ] -> array
121124
#
122125
# Equivalent to calling
@@ -125,6 +128,7 @@ def self.[](*args, base: nil, sort: true)
125128
Primitive.dir_s_aref(args, base, sort)
126129
end
127130

131+
# call-seq:
128132
# Dir.glob( pattern, [flags], [base: path] [, sort: true] ) -> array
129133
# Dir.glob( pattern, [flags], [base: path] [, sort: true] ) { |filename| block } -> nil
130134
#
@@ -140,13 +144,13 @@ def self.[](*args, base: nil, sort: true)
140144
# paths.
141145
#
142146
# The results which matched single wildcard or character set are sorted in
143-
# binary ascending order, unless false is given as the optional +sort+
147+
# binary ascending order, unless +false+ is given as the optional +sort+
144148
# keyword argument. The order of an Array of pattern strings and braces
145149
# are preserved.
146150
#
147151
# Note that the pattern is not a regexp, it's closer to a shell glob.
148152
# See File::fnmatch for the meaning of the +flags+ parameter.
149-
# Case sensitivity depends on your system (File::FNM_CASEFOLD is ignored).
153+
# Case sensitivity depends on your system (+File::FNM_CASEFOLD+ is ignored).
150154
#
151155
# <code>*</code>::
152156
# Matches any file. Can be restricted by other values in the glob.

‎doc/ChangeLog-0.60_to_1.1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Fri Aug 8 11:16:50 1997 Yukihiro Matsumoto <[email protected]>
2828

2929
Thu Aug 7 11:40:01 1997 Yukihiro Matsumoto <[email protected]>
3030

31-
* variable.c (mod_constants): lists constants defiend in the
31+
* variable.c (mod_constants): lists constants defined in the
3232
modules/classes.
3333

3434
* variable.c (rb_const_set): no longer warns about constant
@@ -49,7 +49,7 @@ Mon Aug 4 11:50:28 1997 Yukihiro Matsumoto <[email protected]>
4949
classes (or modules) dynamically.
5050

5151
* variable.c (rb_class_path): scan class constants for anonymous
52-
classes/modules to make up pathes.
52+
classes/modules to make up paths.
5353

5454
Wed Jul 30 08:45:12 1997 Yukihiro Matsumoto <[email protected]>
5555

@@ -76,7 +76,7 @@ Wed Jul 23 09:56:55 1997 Yukihiro Matsumoto <[email protected]>
7676
specified object.
7777

7878
* class.c (mod_instance_methods): returns list of method names of
79-
the class instnace.
79+
the class instance.
8080

8181
Fri Jul 11 22:38:55 1997 Yukihiro Matsumoto <[email protected]>
8282

@@ -538,7 +538,7 @@ Wed Mar 12 10:20:30 1997 Yukihiro Matsumoto <[email protected]>
538538
Mon Mar 10 20:44:22 1997 Yukihiro Matsumoto <[email protected]>
539539

540540
* re.c (reg_regsub): \& for substitution. \`, \', and \+ are
541-
avaiable also.
541+
available also.
542542

543543
Thu Mar 6 01:47:03 1997 Yukihiro Matsumoto <[email protected]>
544544

‎doc/ChangeLog-1.9.3‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5746,7 +5746,7 @@ Wed Mar 2 14:06:01 2011 NARUSE, Yui <[email protected]>
57465746
Wed Mar 2 14:02:29 2011 Shota Fukumori <[email protected]>
57475747

57485748
* test/testunit/test_parallel.rb(TestParallel#spawn_runner):
5749-
Fix outputing empty line in running test.
5749+
Fix outputting empty line in running test.
57505750

57515751
* test/testunit/tests_for_parallel/test_third.rb: Remove `sleep`
57525752

@@ -5765,7 +5765,7 @@ Tue Mar 1 21:48:22 2011 Shota Fukumori <[email protected]>
57655765
* test/testunit/test_parallel.rb(TestParallelWorker#test_quit_in_test):
57665766
Fix for above specification change.
57675767
* test/testunit/test_parallel.rb(TestParallel#spawn_runner):
5768-
Fix outputing empty line in running test.
5768+
Fix outputting empty line in running test.
57695769

57705770
Tue Mar 1 20:51:57 2011 KOSAKI Motohiro <[email protected]>
57715771

@@ -7541,7 +7541,7 @@ Tue Jan 11 20:32:59 2011 Tanaka Akira <[email protected]>
75417541

75427542
Tue Jan 11 13:06:38 2011 NAKAMURA Usaku <[email protected]>
75437543

7544-
* array.c (rb_ary_resize): should care of embeded array when extending
7544+
* array.c (rb_ary_resize): should care of embedded array when extending
75457545
the array.
75467546

75477547
* array.c (rb_ary_resize): need to set capa when changing the real
@@ -9563,7 +9563,7 @@ Wed Nov 17 16:09:52 2010 Yuki Sonoda (Yugui) <[email protected]>
95639563

95649564
Wed Nov 17 16:04:23 2010 Yuki Sonoda (Yugui) <[email protected]>
95659565

9566-
* test/ruby/envutil.rb (Test::Unit::Assersions#assert_warn):
9566+
* test/ruby/envutil.rb (Test::Unit::Assertions#assert_warn):
95679567
new assertion to assert that a particular warning message is
95689568
displayed.
95699569
forward port from branches/ruby_1_9_2@29795.
@@ -9781,7 +9781,7 @@ Wed Nov 10 07:20:10 2010 Nobuyoshi Nakada <[email protected]>
97819781
Tue Nov 9 21:57:45 2010 Nobuyoshi Nakada <[email protected]>
97829782

97839783
* dln.c (init_funcname): allocate and build initialization
9784-
funciton name at once.
9784+
function name at once.
97859785

97869786
Tue Nov 9 21:14:54 2010 Nobuyoshi Nakada <[email protected]>
97879787

@@ -62969,7 +62969,7 @@ Thu Jul 12 12:24:29 2007 Nobuyoshi Nakada <[email protected]>
6296962969

6297062970
Thu Jul 12 10:30:46 2007 Nobuyoshi Nakada <[email protected]>
6297162971

62972-
* thread.c (thread_start_func_2): moved prototye from thread_*.ci.
62972+
* thread.c (thread_start_func_2): moved prototype from thread_*.ci.
6297362973

6297462974
* thread_pthread.ci (thread_start_func_2): not use a directive
6297562975
inside a macro argument. [ruby-talk:258763]
@@ -73273,7 +73273,7 @@ Fri Nov 18 17:35:09 2005 Hidetoshi NAGAI <[email protected]>
7327373273

7327473274
* ext/tk/lib/multi-tk.rb: add restriction to access the entried
7327573275
command table and manipulate other IPs (for reason of security).
73276-
Now, a IP object can be controlled by only its master IP or the
73276+
Now, an IP object can be controlled by only its master IP or the
7327773277
default IP.
7327873278

7327973279
* ext/tk/lib/remote-tk.rb: add restriction to manipulate.
@@ -76346,7 +76346,7 @@ Tue Jul 5 14:52:56 2005 Hidetoshi NAGAI <[email protected]>
7634676346

7634776347
* ext/tk/lib/tk/validation.rb: ditto.
7634876348

76349-
* ext/tk/lib/tk/namespace.rb: arguemnts for TclTkIp#_merge_tklist
76349+
* ext/tk/lib/tk/namespace.rb: arguments for TclTkIp#_merge_tklist
7635076350
should be UTF-8 strings.
7635176351

7635276352
Mon Jul 4 19:29:32 2005 Hirokazu Yamamoto <[email protected]>
@@ -77285,7 +77285,7 @@ Sun May 15 09:57:30 2005 Nobuyoshi Nakada <[email protected]>
7728577285
Sat May 14 23:59:11 2005 Nobuyoshi Nakada <[email protected]>
7728677286

7728777287
* error.c (exc_exception, {exit,name_err,syserr}_initialize): call
77288-
Execption#initialize. fixed: [ruby-talk:142593]
77288+
Exception#initialize. fixed: [ruby-talk:142593]
7728977289

7729077290
Sat May 14 23:56:41 2005 Erik Huelsmann <[email protected]>
7729177291

@@ -77435,7 +77435,7 @@ Sat Apr 30 06:57:39 2005 GOTOU Yuuzou <[email protected]>
7743577435
(suggested by Tatsuki Sugiura)
7743677436

7743777437
* lib/webrick/cgi.rb
77438-
(WEBrick::CGI#initalize): set a dummy to @config[:ServerSoftware]
77438+
(WEBrick::CGI#initialize): set a dummy to @config[:ServerSoftware]
7743977439
if SERVER_SOFTWARE environment variable is not given.
7744077440
(WEBrick::CGI#start): req.path_info must be a String.
7744177441
(WEBrick::CGI::Socket#request_line): treat REQUEST_METHOD, PATH_INFO
@@ -82696,7 +82696,7 @@ Tue Sep 14 20:24:49 2004 Minero Aoki <[email protected]>
8269682696
* ext/ripper/depend: Borland make does not accept pipes in
8269782697
Makefile rules. [ruby-dev:24589]
8269882698

82699-
* ext/ripper/depend: separate rules for developpers.
82699+
* ext/ripper/depend: separate rules for developers.
8270082700

8270182701
* ext/ripper/Makefile.dev: new file.
8270282702

@@ -82931,7 +82931,7 @@ Wed Sep 8 18:44:03 2004 Nobuyoshi Nakada <[email protected]>
8293182931

8293282932
Wed Sep 8 15:19:49 2004 Hidetoshi NAGAI <[email protected]>
8293382933

82934-
* ext/tcltklib/tcltklib.c (ip_init): cannot create a IP at level 4
82934+
* ext/tcltklib/tcltklib.c (ip_init): cannot create an IP at level 4
8293582935

8293682936
* ext/tk/lib/multi-tk.rb: improve 'exit' operation, security check,
8293782937
and error treatment
@@ -88452,7 +88452,7 @@ Tue Dec 16 03:17:29 2003 why the lucky stiff <[email protected]>
8845288452

8845388453
Tue Dec 16 01:14:44 2003 Nobuyoshi Nakada <[email protected]>
8845488454

88455-
* eval.c (catch_timer): check rb_thread_crtical in main native
88455+
* eval.c (catch_timer): check rb_thread_critical in main native
8845688456
thread.
8845788457

8845888458
* eval.c (thread_timer): just sends signals periodically, to
@@ -92616,7 +92616,7 @@ Fri Aug 8 03:22:28 2003 GOTOU Yuuzou <[email protected]>
9261692616

9261792617
Thu Aug 7 14:40:37 2003 WATANABE Hirofumi <[email protected]>
9261892618

92619-
* cygwin/GNUmakefile: better --disbale-shared option support.
92619+
* cygwin/GNUmakefile: better --disable-shared option support.
9262092620

9262192621
* cygwin/GNUmakefile: add forwarding DLL target for cygwin.
9262292622

‎doc/ChangeLog-2.4.0‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,7 @@ Wed Oct 5 12:57:21 2016 Richard Schneeman <[email protected]>
792792

793793
Wed Oct 5 11:47:19 2016 SHIBATA Hiroshi <[email protected]>
794794

795-
* io.c: Fixed equivalent ruby code with core implemention.
795+
* io.c: Fixed equivalent ruby code with core implementation.
796796
[fix GH-1429][ci skip] Patch by @sos4nt
797797

798798
Wed Oct 5 11:36:21 2016 SHIBATA Hiroshi <[email protected]>
@@ -888,7 +888,7 @@ Sun Oct 2 02:03:06 2016 NAKAMURA Usaku <[email protected]>
888888

889889
Sat Oct 1 23:08:47 2016 NAKAMURA Usaku <[email protected]>
890890

891-
* ext/date/date_parse.c (date_zone_to_diff): it's nonsence and really
891+
* ext/date/date_parse.c (date_zone_to_diff): it's nonsense and really
892892
harm that to use unary minus operator with unsigned value.
893893
get rid of test failures introduced at r56312.
894894

0 commit comments

Comments
 (0)