github · tenderlove · May 28, 2019 · Apr 26, 2019 · Jan 18, 2019 · Apr 21, 2019
diff --git a/.gitignore b/.gitignore
@@ -36,6 +36,7 @@
 .pc
 .ppack
 .svn
+.time
 Makefile
 cygruby*.def
 extconf.h
@@ -56,6 +57,7 @@ lcov*.info
 /*.rc
 /*_prelude.c
 /COPYING.LIB
+/ChangeLog
 /Doxyfile
 /GNUmakefile
 /README.atheos
@@ -145,19 +147,16 @@ lcov*.info
 
 # /coroutine/
 !/coroutine/**/*.s
-/coroutine/**/.time
 
 # /enc/trans/
 /enc/trans/*.c
 /enc/trans/*.def
 /enc/trans/*.exp
 /enc/trans/*.lib
-/enc/trans/.time
 
 # /exe/
 /exe/goruby
 /exe/ruby
-/exe/.time
 
 # /ext/
 /ext/extinit.c
@@ -205,7 +204,6 @@ lcov*.info
 
 # /win32/
 /win32/*.ico
-/win32/.time
 
 # MJIT
 /rb_mjit_header.h

diff --git a/.travis.yml b/.travis.yml
@@ -98,6 +98,31 @@ env:
     before_install:
       - /usr/local/opt/openssl@1.1/bin/openssl version
 
+  - &clang-8
+    compiler: clang-8
+    addons:
+      apt:
+        config:
+          retries: true
+        update: true
+        sources:
+          - llvm-toolchain-xenial-8
+        packages:
+          - clang-8
+          - llvm-8-tools
+          - libffi-dev
+          - libgdbm-dev
+          - libgmp-dev
+          - libjemalloc-dev
+          - libncurses5-dev
+          - libncursesw5-dev
+          - libreadline6-dev
+          - libssl-dev
+          - libyaml-dev
+          - openssl
+          - valgrind
+          - zlib1g-dev
+
   # --------
 
   - &x86_64-linux
@@ -111,12 +136,22 @@ env:
     env:
       - CONFIG_FLAG='--with-gmp --with-jemalloc --with-valgrind'
 
+  - &assertions
+    name: RUBY_DEBUG=1
+    <<: *linux
+    #<<: *cron-only
+    <<: *make-test-only
+    env:
+      - GEMS_FOR_TEST=
+      - cppflags='-DRUBY_DEBUG -DVM_CHECK_MODE=1 -DTRANSIENT_HEAP_CHECK_MODE -DRGENGC_CHECK_MODE -DENC_DEBUG'
+
   - &VM_CHECK_MODE
     name: VM_CHECK_MODE=3
     <<: *linux
     <<: *cron-only
     <<: *make-test-only
     env:
+      - GEMS_FOR_TEST=
       - cppflags=-DVM_CHECK_MODE=0x0003
 
   - &FIBER_USE_sjlj
@@ -132,6 +167,7 @@ env:
     <<: *cron-only
     <<: *make-test-only
     env:
+      - GEMS_FOR_TEST=
       - cppflags=-DOPT_THREADED_CODE=1
 
   - &CALL_THREADED_CODE
@@ -140,6 +176,7 @@ env:
     <<: *cron-only
     <<: *make-test-only
     env:
+      - GEMS_FOR_TEST=
       - cppflags=-DOPT_THREADED_CODE=2
 
   - &NO_THREADED_CODE
@@ -148,48 +185,53 @@ env:
     <<: *cron-only
     <<: *make-test-only
     env:
+      - GEMS_FOR_TEST=
       - cppflags=-DOPT_THREADED_CODE=3
 
   - &ASAN
     name: -fsanitize=address
     <<: *linux
     #<<: *cron-only
     <<: *make-test-only
-    compiler: clang
+    <<: *clang-8
     env:
+      - GEMS_FOR_TEST=
       - ASAN_OPTIONS=detect_leaks=0
-      - cflags='-march=native -fsanitize=address -fno-omit-frame-pointer'
+      - cflags='-march=native -fsanitize=address -fno-omit-frame-pointer -fPIC'
       - debugflags=-ggdb3
       - optflags=-O1
-      - LD=clang
-      - LDFLAGS=-fsanitize=address
+      - LD=clang-8
+      - LDFLAGS='-fsanitize=address -fPIC'
+      - CONFIG_FLAG='--with-out-ext=openssl --without-gmp --without-jemalloc --without-valgrind'
 
   - &MSAN
     name: -fsanitize=memory
     <<: *linux
     #<<: *cron-only
     <<: *make-test-only
-    compiler: clang
+    <<: *clang-8
     env:
-      - cflags='-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer'
+      - GEMS_FOR_TEST=
+      - cflags='-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer -fPIC'
       - optflags=-O1
-      - LD=clang
-      - LDFLAGS=-fsanitize=memory
-      - CONFIG_FLAG=--with-out-ext=openssl
+      - LD=clang-8
+      - LDFLAGS='-fsanitize=memory -fPIC'
+      - CONFIG_FLAG='--with-out-ext=openssl --without-gmp --without-jemalloc --without-valgrind'
 
   - &UBSAN
     name: -fsanitize=undefined
     <<: *linux
     #<<: *cron-only
     <<: *make-test-only
-    compiler: clang
+    <<: *clang-8
     env:
-      - cflags='-fsanitize=undefined,integer,nullability -fno-omit-frame-pointer'
+      - GEMS_FOR_TEST=
+      - cflags='-fsanitize=undefined,integer,nullability -fno-sanitize=implicit-integer-sign-change,unsigned-integer-overflow'
       - cppflags=-DUNALIGNED_WORD_ACCESS=0
       - debugflags=-ggdb3
       - optflags='-O1 -march=native'
-      - LD=clang
-      - LDFLAGS=-fsanitize=undefined,integer,nullability
+      - LD=clang-8
+      - LDFLAGS='-fsanitize=undefined,integer,nullability -fno-sanitize=implicit-integer-sign-change,unsigned-integer-overflow'
 
   - &i686-linux
     name: i686-linux
@@ -228,6 +270,7 @@ env:
     <<: *make-test-only
     compiler: clang
     env:
+      - GEMS_FOR_TEST=
       - GCC_FLAGS='-std=c99 -Werror=pedantic -pedantic-errors'
       - CONFIG_FLAG=
       - JOBS=
@@ -257,18 +300,18 @@ env:
       - LDFLAGS=-Wno-unused-command-line-argument
 
   - &rubyspec
-    name: ruby/spec on Ruby 2.3 # to ensure version guards are correctly added
+    name: ruby/spec on Ruby 2.4 # to ensure version guards are correctly added
     <<: *linux
     language: ruby
-    rvm: 2.3.8
+    rvm: 2.4.6
     addons:
       apt:
         packages:
     before_install:
     install:
     before_script: chmod -R u+w spec/ruby
-    # -j randomly hangs. Using -fs to make sure we can know problematic spec on failure.
-    script: ruby -C spec/ruby ../mspec/bin/mspec -fs .
+    # -j randomly hangs.
+    script: ruby -C spec/ruby ../mspec/bin/mspec .
 
   - &x86_64-darwin17
     name: x86_64-darwin17
@@ -286,6 +329,7 @@ env:
     <<: *cron-only
     <<: *make-test-only
     env:
+      - GEMS_FOR_TEST=
       - CONFIG_FLAG=--with-arch=x86_64h,x86_64,i386
       - TEST_ALL_OPTS="$JOBS -q --tty=no --excludes=\$(TESTSDIR)/excludes/_travis/osx"
 
@@ -300,6 +344,7 @@ matrix:
     - <<: *ASAN
     - <<: *MSAN
     - <<: *UBSAN
+    - <<: *assertions
     - <<: *VM_CHECK_MODE
     - <<: *FIBER_USE_sjlj
     - <<: *TOKEN_THREADED_CODE
@@ -314,6 +359,7 @@ matrix:
   fast_finish: true
 
 before_script:
+  - date # Debugging "Permission defined" failure on darwin like https://travis-ci.org/ruby/ruby/jobs/508683759
   - echo JOBS=${JOBS} SETARCH=${SETARCH}
   - $SETARCH uname -a
   - $SETARCH uname -r
@@ -360,20 +406,17 @@ before_script:
   - chmod u-w ..
   - $SETARCH make -s $JOBS
   - |-
+    date; : # Debugging "Permission defined" failure on darwin like https://travis-ci.org/ruby/ruby/jobs/508683759
     if ! make install; then
       if [ "$(uname)" = Darwin ]; then
         # Debugging "Permission defined" failure on darwin like https://travis-ci.org/ruby/ruby/jobs/508683759
         set -x
-        echo $USER
-        ls -la
-        ls -la .ext
-        ls -la .ext/common
-        ls -la .ext/common/bigdecimal
-        ls -la ext
-        ls -laR ext/bigdecimal
-        umask
+        date
+        ./miniruby -e 'ARGV.map{[@1,File.stat(@1)]}.sort_by{@2.mtime}.each{p mtime:@2.mtime.to_f, ctime:@2.ctime.to_f, path:@1}' .ext/.timestamp/.RUBYCOMMONDIR*time .ext/common/bigdecimal/*.rb ../ext/bigdecimal/lib/bigdecimal/*.rb . .. .ext .ext/common .ext/common/bigdecimal ext/bigdecimal ../ext ../ext/bigdecimal ../ext/bigdecimal/lib ../ext/bigdecimal/lib/bigdecimal
+        make COPY='cp -f' install
+      else
+        exit 1
       fi
-      exit 1
     fi
   - ccache --show-stats
   - |-

diff --git a/Makefile.in b/Makefile.in
@@ -1,3 +1,5 @@
+# -*- mode: makefile-gmake; indent-tabs-mode: t -*-
+
 SHELL = /bin/sh
 NULLCMD = @NULLCMD@
 n=$(NULLCMD)

diff --git a/NEWS b/NEWS
@@ -14,7 +14,7 @@ sufficient information, see the ChangeLog file or Redmine
 
 === Language changes
 
-* Introduce pattern matching [Feature #14912]
+* Pattern matching is introduced as an experimental feature. [Feature #14912]
 
 * Method reference operator, <code>.:</code> is introduced as an
   experimental feature.  [Feature #12125] [Feature #13581]
@@ -24,21 +24,30 @@ sufficient information, see the ChangeLog file or Redmine
 
 * lambda with no block in a method called with a block errs.
 
-* Non-Symbol keys in a keyword arguments hash was prohibited at 2.6.0, but
-  now allowed again.  [Bug #15658]
+* Non-Symbol keys in a keyword arguments hash were prohibited in 2.6.0,
+  but are now allowed again.  [Bug #15658]
 
 * Numbered parameter as the default block parameter is introduced as an
   experimental feature.  [Feature #4475]
 
 * A beginless range is experimentally introduced.  It might not be as useful
-  as an endless range, but would be good for DSL purpose.
+  as an endless range, but would be good for DSL purpose.  [Feature #14799]
 
      ary[..3]  # identical to ary[0..3]
      where(sales: ..100)
 
 * Setting <code>$;</code> to non-nil value is warned now.  Use of it in
   String#split is warned too.
 
+* Setting <code>$,</code> to non-nil value is warned now.  Use of it in
+  Array#join is warned too.
+
+* Quoted here-document identifier must end within the same line.
+
+     <<"EOS
+     " # This has been warned since 2.4
+     EOS
+
 === Core classes updates (outstanding ones only)
 
 Enumerable::
@@ -55,6 +64,17 @@ Enumerator::
       can be directly passed to another method as a block
       argument.  [Feature #15618]
 
+Integer::
+
+  Modified method::
+
+    * Integer#[] now supports range operation.  [Feature #8842]
+
+         0b01001101[2, 4]  #=> 0b0011
+         0b01001100[2..5]  #=> 0b0011
+         0b01001100[2...6] #=> 0b0011
+             ^^^^
+
 Regexp/String::
 
     * Update Unicode version and Emoji version from 11.0.0 to
@@ -85,6 +105,11 @@ ERB::
 
   * Prohibit marshaling ERB instance.
 
+IRB::
+
+  * Introduce syntax highlight inspired by pry.gem to inspect output for some
+    core-class objects and binding.irb source lines if $TERM is set and not dumb.
+
 Net::IMAP::
 
   * Add Server Name Indication (SNI) support.  [Feature #15594]

diff --git a/README.md b/README.md
@@ -5,9 +5,10 @@
 
 # What's Ruby
 
-Ruby is the interpreted scripting language for quick and easy object-oriented
-programming. It has many features to process text files and to manage system
-(as in Perl). It is simple, straight-forward, and extensible.
+Ruby is an interpreted object-oriented programming language often
+used for web development. It also offers many scripting features
+to process plain text and serialized files, or manage system tasks.
+It is simple, straightforward, and extensible.
 
 ## Features of Ruby
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -63,11 +63,12 @@ for:
     - if not "%GEMS_FOR_TEST%" == "" \usr\bin\gem install --no-document %GEMS_FOR_TEST%
   test_script:
     - set /a JOBS=%NUMBER_OF_PROCESSORS%
+    - set RELINE_TEST_ENCODING=Windows-31J
     - nmake -l "TESTOPTS=-v -q" btest
     - nmake -l "TESTOPTS=-v -q" test-basic
-    - nmake -l "TESTOPTS=-q --subprocess-timeout-scale=3.0 --excludes=../test/excludes/_appveyor -j%JOBS% --exclude win32ole --exclude test_bignum --exclude test_syntax --exclude test_open-uri --exclude test_bundled_ca" test-all
+    - nmake -l "TESTOPTS=-q --subprocess-timeout-scale=3.0 --excludes=../test/excludes/_appveyor -j%JOBS% --exclude readline --exclude win32ole --exclude test_bignum --exclude test_syntax --exclude test_open-uri --exclude test_bundled_ca --exclude test_gc_compact" test-all
     # separately execute tests without -j which may crash worker with -j.
-    - nmake -l "TESTOPTS=-v --subprocess-timeout-scale=3.0 --excludes=../test/excludes/_appveyor" test-all TESTS="../test/win32ole ../test/ruby/test_bignum.rb ../test/ruby/test_syntax.rb ../test/open-uri/test_open-uri.rb ../test/rubygems/test_bundled_ca.rb"
+    - nmake -l "TESTOPTS=-v --subprocess-timeout-scale=3.0 --excludes=../test/excludes/_appveyor" test-all TESTS="../test/win32ole ../test/ruby/test_bignum.rb ../test/ruby/test_syntax.rb ../test/open-uri/test_open-uri.rb ../test/rubygems/test_bundled_ca.rb ../test/ruby/test_gc_compact.rb"
     - nmake -l test-spec MSPECOPT=-fs # not using `-j` because sometimes `mspec -j` silently dies on Windows
 -
   matrix:
@@ -108,10 +109,11 @@ for:
     - mingw32-make DESTDIR=../install install-nodoc
     - if not "%GEMS_FOR_TEST%" == "" ..\install\bin\gem install --no-document %GEMS_FOR_TEST%
   test_script:
+    - set RELINE_TEST_ENCODING=Windows-31J
     - mingw32-make test
-    - mingw32-make test-all TESTOPTS="--retry --job-status=normal --show-skip --subprocess-timeout-scale=1.5 --excludes=../ruby/test/excludes/_appveyor -j %JOBS% --exclude win32ole --exclude test_open-uri"
+    - mingw32-make test-all TESTOPTS="--retry --job-status=normal --show-skip --subprocess-timeout-scale=1.5 --excludes=../ruby/test/excludes/_appveyor -j %JOBS% --exclude win32ole --exclude test_open-uri --exclude test_gc_compact"
     # separately execute tests without -j which may crash worker with -j.
-    - mingw32-make test-all TESTOPTS="--retry --job-status=normal --show-skip --subprocess-timeout-scale=1.5 --excludes=../ruby/test/excludes/_appveyor" TESTS="../ruby/test/win32ole ../ruby/test/open-uri/test_open-uri.rb"
+    - mingw32-make test-all TESTOPTS="--retry --job-status=normal --show-skip --subprocess-timeout-scale=1.5 --excludes=../ruby/test/excludes/_appveyor" TESTS="../ruby/test/win32ole ../ruby/test/open-uri/test_open-uri.rb ../ruby/test/ruby/test_gc_compact.rb"
     - mingw32-make test-spec MSPECOPT=-fs # not using `-j` because sometimes `mspec -j` silently dies on Windows
 notifications:
   # Using "Webhook" with templated body to skip notification on Pull Request

diff --git a/array.c b/array.c
@@ -879,8 +879,8 @@ rb_check_to_array(VALUE ary)
  *  call-seq:
  *     Array.try_convert(obj) -> array or nil
  *
- *  Tries to convert +obj+ into an array, using +to_ary+ method.  Returns the
- *  converted array or +nil+ if +obj+ cannot be converted for any reason.
+ *  Tries to convert +obj+ into an array, using the +to_ary+ method.  Returns
+ *  the converted array or +nil+ if +obj+ cannot be converted.
  *  This method can be used to check if an argument is an array.
  *
  *     Array.try_convert([1])   #=> [1]

diff --git a/benchmark/match_gt4.rb b/benchmark/match_gt4.rb
@@ -0,0 +1 @@
+1000000.times { /(.)(.)(\d+)(\d)/.match("THX1138.") }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		1000000.times { /(.)(.)(\d+)(\d)/.match("THX1138.") }